aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/src/core/script/init_state.js
diff options
context:
space:
mode:
authorEric Guzman2012-02-13 10:29:49 -0800
committerEric Guzman2012-02-13 10:29:49 -0800
commite4893f7d3c3b9bd7967973197c3ffb5d3a075c91 (patch)
treef3d4fd9d96ba0dcf846fbf66153fb443bd60f767 /js/helper-classes/RDGE/src/core/script/init_state.js
parentef032412216d437ce1c7dfc9050ab41adf0594c0 (diff)
parente142611e22718b1f1d1696902ad9161ec5f33f98 (diff)
downloadninja-e4893f7d3c3b9bd7967973197c3ffb5d3a075c91.tar.gz
Merge branch 'refs/heads/master' into TreeComponents
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/init_state.js')
-rw-r--r--js/helper-classes/RDGE/src/core/script/init_state.js7
1 files changed, 6 insertions, 1 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()