aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes
diff options
context:
space:
mode:
Diffstat (limited to 'js/helper-classes')
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js4
-rwxr-xr-xjs/helper-classes/3D/vec-utils.js71
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/MeshManager.js2
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/run_state.js16
4 files changed, 81 insertions, 12 deletions
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 1c00f7ea..d6334e6c 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -139,8 +139,8 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
139 handleCloseDocument:{ 139 handleCloseDocument:{
140 value: function() { 140 value: function() {
141 if(this.application.ninja.documentController._documents.length === 0){ 141 if(this.application.ninja.documentController._documents.length === 0){
142 this._eltArray = null; 142 this._eltArray.length = 0;
143 this._planesArray = null; 143 this._planesArray.length = 0;
144 } 144 }
145 } 145 }
146 }, 146 },
diff --git a/js/helper-classes/3D/vec-utils.js b/js/helper-classes/3D/vec-utils.js
index 3db95ab7..e6db4a8d 100755
--- a/js/helper-classes/3D/vec-utils.js
+++ b/js/helper-classes/3D/vec-utils.js
@@ -191,5 +191,74 @@ var VecUtils = exports.VecUtils = Object.create(Object.prototype,
191 191
192 return vec; 192 return vec;
193 } 193 }
194 } 194 },
195
196 matI :
197 {
198 value: function(dimen)
199 {
200 var mat = [];
201 for (var i=0; i<dimen*dimen; i++) mat.push(0);
202
203 var index = 0;
204 for (var i=0; i<dimen; i++)
205 {
206 mat[index] = 1.0;
207 index += dimen + 1;
208 }
209
210 return mat;
211 }
212 },
213
214 matTranslation:
215 {
216 value: function (vec)
217 {
218 var mat = Matrix.I(4);
219 glmat4.translate(mat, vec);
220 return mat;
221 }
222 },
223
224 matRotationX:
225 {
226 value: function( angle )
227 {
228 var mat = Matrix.I(4);
229 glmat4.rotateX(mat, angle);
230 return mat;
231 }
232 },
233
234 matRotationY:
235 {
236 value: function( angle )
237 {
238 var mat = Matrix.I(4);
239 glmat4.rotateY(mat, angle);
240 return mat;
241 }
242 },
243
244 matRotationZ:
245 {
246 value: function( angle )
247 {
248 var mat = Matrix.I(4);
249 glmat4.rotateZ(mat, angle);
250 return mat;
251 }
252 },
253
254 matRotation:
255 {
256 value: function(angle, axis)
257 {
258 var mat = Matrix.I(4);
259 glmat4.rotate(mat, angle, axis);
260 return mat;
261 }
262 },
263
195}); \ No newline at end of file 264}); \ No newline at end of file
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