aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/src/core
diff options
context:
space:
mode:
authorhwc4872012-01-27 15:52:36 -0800
committerhwc4872012-01-27 15:52:36 -0800
commit86a801c057fc3b0580d6130be5740c2ee503444f (patch)
tree8b014e981273464afde4e0603cdf70c6e90eee48 /js/helper-classes/RDGE/src/core
parent302e3eb01037ff550bc93547cb8d5d0a0780b312 (diff)
downloadninja-86a801c057fc3b0580d6130be5740c2ee503444f.tar.gz
updated from old repo
Diffstat (limited to 'js/helper-classes/RDGE/src/core')
-rw-r--r--js/helper-classes/RDGE/src/core/script/init_state.js7
-rw-r--r--js/helper-classes/RDGE/src/core/script/renderer.js14
-rw-r--r--js/helper-classes/RDGE/src/core/script/run_state.js10
-rw-r--r--js/helper-classes/RDGE/src/core/script/runtime.js2
4 files changed, 27 insertions, 6 deletions
diff --git a/js/helper-classes/RDGE/src/core/script/init_state.js b/js/helper-classes/RDGE/src/core/script/init_state.js
index 8c69d218..4b97a4f4 100644
--- a/js/helper-classes/RDGE/src/core/script/init_state.js
+++ b/js/helper-classes/RDGE/src/core/script/init_state.js
@@ -42,11 +42,16 @@ LoadState.prototype.Init = function()
42 if(this.sceneName) 42 if(this.sceneName)
43 { 43 {
44 this.loadScene("assets_web/mesh/" + this.sceneName + ".json", this.sceneName); 44 this.loadScene("assets_web/mesh/" + this.sceneName + ".json", this.sceneName);
45 } 45 }
46
47 if (this.hasUserState && this.userRunState && this.userRunState.onLoadState)
48 this.userRunState.onLoadState();
46} 49}
47 50
48LoadState.prototype.ReInit = function() 51LoadState.prototype.ReInit = function()
49{ 52{
53 if (this.hasUserState && this.userRunState && this.userRunState.onLoadState)
54 this.userRunState.onLoadState();
50} 55}
51 56
52LoadState.prototype.Resize = function() 57LoadState.prototype.Resize = function()
diff --git a/js/helper-classes/RDGE/src/core/script/renderer.js b/js/helper-classes/RDGE/src/core/script/renderer.js
index 0c51d2cb..517947df 100644
--- a/js/helper-classes/RDGE/src/core/script/renderer.js
+++ b/js/helper-classes/RDGE/src/core/script/renderer.js
@@ -335,14 +335,19 @@ _renderer = function(canvas) {
335 335
336 var tex = this.textureMap[name]; 336 var tex = this.textureMap[name];
337 337
338 if (tex === undefined) { 338 if (tex === undefined)
339 339 {
340
341 // load the texture 340 // load the texture
342 tex = this.createTexture(name + ext, wrap, mips); 341 tex = this.createTexture(name + ext, wrap, mips);
343 this.textureMap[name] = tex; 342 this.textureMap[name] = tex;
344 tex.lookUpName = name; 343 tex.lookUpName = name;
344 tex.previouslyReferenced = false;
345 } 345 }
346 else
347 {
348 //console.log( "texture already loaded: " + name );
349 tex.previouslyReferenced = true;
350 }
346 351
347 return tex; 352 return tex;
348 353
@@ -364,6 +369,7 @@ _renderer = function(canvas) {
364 mips = true; 369 mips = true;
365 370
366 if (texture) { 371 if (texture) {
372 //console.log( "createTexture: " + url );
367 texture.image = new Image(); 373 texture.image = new Image();
368 texture.image.src = url; 374 texture.image.src = url;
369 texture.image.context = g_Engine.getContext(); 375 texture.image.context = g_Engine.getContext();
@@ -371,6 +377,8 @@ _renderer = function(canvas) {
371 texture.image.onload = function() { 377 texture.image.onload = function() {
372 var stateMan = this.context.ctxStateManager; 378 var stateMan = this.context.ctxStateManager;
373 stateMan.RDGEInitState.loadTexture(texture); 379 stateMan.RDGEInitState.loadTexture(texture);
380 //console.log( "loaded texture: " + texture.lookUpName );
381 if (texture.callback) texture.callback( texture );
374 }; 382 };
375 } 383 }
376 return texture; 384 return texture;
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 ad56d9ea..acdb6797 100644
--- a/js/helper-classes/RDGE/src/core/script/run_state.js
+++ b/js/helper-classes/RDGE/src/core/script/run_state.js
@@ -30,6 +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)
34 this.userRunState.onRunState();
35
33 36
34 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 37 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
35 38
@@ -94,6 +97,11 @@ RunState.prototype.ReInit = function()
94 if(!this.initialized) 97 if(!this.initialized)
95 { 98 {
96 this.Init(); 99 this.Init();
100 }
101 else
102 {
103 if (this.hasUserState && this.userRunState && this.userRunState.onRunState)
104 this.userRunState.onRunState();
97 } 105 }
98} 106}
99 107
@@ -117,7 +125,7 @@ RunState.prototype.Draw = function ()
117 var width = this.renderer.vpWidth; 125 var width = this.renderer.vpWidth;
118 var height = this.renderer.vpHeight; 126 var height = this.renderer.vpHeight;
119 127
120 this.renderer._clear(); 128// this.renderer._clear();
121 129
122 this.userRunState.draw(); 130 this.userRunState.draw();
123 131
diff --git a/js/helper-classes/RDGE/src/core/script/runtime.js b/js/helper-classes/RDGE/src/core/script/runtime.js
index 8d8fdf38..e950fce0 100644
--- a/js/helper-classes/RDGE/src/core/script/runtime.js
+++ b/js/helper-classes/RDGE/src/core/script/runtime.js
@@ -121,7 +121,7 @@ function RDGEStart(canvasOrID)
121 121
122 g_Engine.registerCanvas(canvas); 122 g_Engine.registerCanvas(canvas);
123 123
124 canvas.task = new RDGETask(canvas, true); 124 //canvas.task = new RDGETask(canvas, true);
125 125
126 if (!g_shaderMan) 126 if (!g_shaderMan)
127 g_shaderMan = new ShaderManager(); 127 g_shaderMan = new ShaderManager();