Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 336 vs 337 for /trunk/Source Code/Platform/Video/Headers/IMPrimitive.h

Diff revisions: vs.
  @@ -30,11 +30,11 @@
30 30
31 31 class Texture;
32 32 class ShaderProgram;
33 - enum PrimitiveType;
33 + enum PrimitiveType : I32;
34 34 ///IMPrimitive replaces immediate mode calls to VB based rendering
35 35 class IMPrimitive : public GUIDWrapper, private NonCopyable {
36 36 public:
37 - inline void setRenderStates(const DELEGATE_CBK<>& setupStatesCallback, const DELEGATE_CBK<>& releaseStatesCallback){
37 + inline void setRenderStates(const DELEGATE_CBK<>& setupStatesCallback, const DELEGATE_CBK<>& releaseStatesCallback){
38 38 _setupStates = setupStatesCallback;
39 39 _resetStates = releaseStatesCallback;
40 40 }
  @@ -45,15 +45,15 @@
45 45 }
46 46
47 47 inline void setupStates() {
48 - if (_setupStates) {
49 - _setupStates();
50 - }
48 + if (_setupStates) {
49 + _setupStates();
50 + }
51 51 }
52 52
53 53 inline void resetStates() {
54 - if (_resetStates) {
55 - _resetStates();
56 - }
54 + if (_resetStates) {
55 + _resetStates();
56 + }
57 57 }
58 58
59 59 inline void drawShader(ShaderProgram* const shaderProgram) {
  @@ -135,8 +135,8 @@
135 135 ///If _pause is true, rendering for the current primitive is skipped and nothing is modified (e.g. zombie counters)
136 136 bool _paused;
137 137 ///2 functions used to setup or reset states
138 - DELEGATE_CBK<> _setupStates;
139 - DELEGATE_CBK<> _resetStates;
138 + DELEGATE_CBK<> _setupStates;
139 + DELEGATE_CBK<> _resetStates;
140 140 ///The state hash associated with this render instance
141 141 size_t _stateHash;
142 142 ///The transform matrix for this element