diff options
author | Jose Antonio Marquez Russo | 2012-03-15 06:28:14 -0700 |
---|---|---|
committer | Jose Antonio Marquez Russo | 2012-03-15 06:28:14 -0700 |
commit | 67748b4fb19cd5fd210ca711c98d992371c4d2d3 (patch) | |
tree | ab86675822de48f16be1000e8c137ec7189fc3e4 /js/helper-classes/RDGE | |
parent | 089534a80c64226bf7d124ab9147afce386fdb5c (diff) | |
parent | 57d4a82977a1f0e809511fe894886f88581d9615 (diff) | |
download | ninja-67748b4fb19cd5fd210ca711c98d992371c4d2d3.tar.gz |
Merge pull request #34 from ericmueller/integration
Integration
Diffstat (limited to 'js/helper-classes/RDGE')
-rwxr-xr-x | js/helper-classes/RDGE/src/core/script/MeshManager.js | 2 | ||||
-rwxr-xr-x | js/helper-classes/RDGE/src/core/script/run_state.js | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/js/helper-classes/RDGE/src/core/script/MeshManager.js b/js/helper-classes/RDGE/src/core/script/MeshManager.js index 43813078..7dfc79d4 100755 --- a/js/helper-classes/RDGE/src/core/script/MeshManager.js +++ b/js/helper-classes/RDGE/src/core/script/MeshManager.js | |||
@@ -69,7 +69,7 @@ MeshManager.prototype.deleteMesh = function (name) | |||
69 | if (model) | 69 | if (model) |
70 | { | 70 | { |
71 | g_Engine.ctxMan.forEach(function(context) | 71 | g_Engine.ctxMan.forEach(function(context) |
72 | { | 72 | { |
73 | context.renderer.deletePrimitive(model.primitive); | 73 | context.renderer.deletePrimitive(model.primitive); |
74 | }); | 74 | }); |
75 | 75 | ||
diff --git a/js/helper-classes/RDGE/src/core/script/run_state.js b/js/helper-classes/RDGE/src/core/script/run_state.js index acdb6797..a5981caa 100755 --- a/js/helper-classes/RDGE/src/core/script/run_state.js +++ b/js/helper-classes/RDGE/src/core/script/run_state.js | |||
@@ -30,9 +30,9 @@ RunState.prototype.Init = function() | |||
30 | this.userRunState.init(); | 30 | this.userRunState.init(); |
31 | } | 31 | } |
32 | 32 | ||
33 | if (this.hasUserState && this.userRunState && this.userRunState.onRunState) | 33 | if (this.hasUserState && this.userRunState && this.userRunState.onRunState) |
34 | this.userRunState.onRunState(); | 34 | this.userRunState.onRunState(); |
35 | 35 | ||
36 | 36 | ||
37 | //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// | 37 | //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// |
38 | 38 | ||
@@ -97,11 +97,11 @@ RunState.prototype.ReInit = function() | |||
97 | if(!this.initialized) | 97 | if(!this.initialized) |
98 | { | 98 | { |
99 | this.Init(); | 99 | this.Init(); |
100 | } | 100 | } |
101 | else | 101 | else |
102 | { | 102 | { |
103 | if (this.hasUserState && this.userRunState && this.userRunState.onRunState) | 103 | if (this.hasUserState && this.userRunState && this.userRunState.onRunState) |
104 | this.userRunState.onRunState(); | 104 | this.userRunState.onRunState(); |
105 | } | 105 | } |
106 | } | 106 | } |
107 | 107 | ||