From 86a801c057fc3b0580d6130be5740c2ee503444f Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 27 Jan 2012 15:52:36 -0800
Subject: updated from old repo

---
 js/helper-classes/RDGE/src/core/script/init_state.js |  7 ++++++-
 js/helper-classes/RDGE/src/core/script/renderer.js   | 14 +++++++++++---
 js/helper-classes/RDGE/src/core/script/run_state.js  | 10 +++++++++-
 js/helper-classes/RDGE/src/core/script/runtime.js    |  2 +-
 4 files changed, 27 insertions(+), 6 deletions(-)

(limited to 'js/helper-classes/RDGE/src')

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()
 	if(this.sceneName)
 	{
 		this.loadScene("assets_web/mesh/" + this.sceneName + ".json", this.sceneName);
-	}
+	}
+
+	if (this.hasUserState && this.userRunState && this.userRunState.onLoadState)
+		this.userRunState.onLoadState();
 }
 
 LoadState.prototype.ReInit = function() 
 {
+	if (this.hasUserState && this.userRunState && this.userRunState.onLoadState)
+		this.userRunState.onLoadState();
 }
 
 LoadState.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) {
 
         var tex = this.textureMap[name];
 
-        if (tex === undefined) {
-
-
+        if (tex === undefined)
+		{
             // load the texture
             tex = this.createTexture(name + ext, wrap, mips);
             this.textureMap[name] = tex;
             tex.lookUpName = name;
+			tex.previouslyReferenced = false;
         }
+		else
+		{
+			//console.log( "texture already loaded: " + name );
+			tex.previouslyReferenced = true;
+		}
 
         return tex;
 
@@ -364,6 +369,7 @@ _renderer = function(canvas) {
             mips = true;
 
         if (texture) {
+			//console.log( "createTexture: " + url );
             texture.image = new Image();
             texture.image.src = url;
             texture.image.context = g_Engine.getContext();
@@ -371,6 +377,8 @@ _renderer = function(canvas) {
             texture.image.onload = function() {
                 var stateMan = this.context.ctxStateManager;
                 stateMan.RDGEInitState.loadTexture(texture);
+				//console.log( "loaded texture: " + texture.lookUpName );
+				if (texture.callback)  texture.callback( texture );
             };
         }
         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()
 		this.userRunState.init();
 	}
 
+	if (this.hasUserState && this.userRunState && this.userRunState.onRunState)
+		this.userRunState.onRunState();
+
 
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -94,6 +97,11 @@ RunState.prototype.ReInit = function()
 	if(!this.initialized)
 	{
 		this.Init();
+	}
+	else
+	{
+		if (this.hasUserState && this.userRunState && this.userRunState.onRunState)
+			this.userRunState.onRunState();
 	}
 }
 
@@ -117,7 +125,7 @@ RunState.prototype.Draw = function ()
 	var width = this.renderer.vpWidth;
 	var height = this.renderer.vpHeight;
 	
-	this.renderer._clear();
+//	this.renderer._clear();
 	
 	this.userRunState.draw();
 	
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)
 
 	g_Engine.registerCanvas(canvas);
 
-	canvas.task = new RDGETask(canvas, true);
+	//canvas.task = new RDGETask(canvas, true);
 
 	if (!g_shaderMan)
 		g_shaderMan = new ShaderManager();
-- 
cgit v1.2.3