diff options
author | Jonathan Duran | 2012-03-14 08:59:17 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-03-14 08:59:17 -0700 |
commit | e065244ac75d1d0f25fd5c75cb58e714a13fe16b (patch) | |
tree | 6b49a85a45fdd41b81be5603fbbc2e0d197eb187 /js/helper-classes/RDGE/src/core/script/init_state.js | |
parent | e8f207dc50ad942ee8c1c1db6b146c0110ce3216 (diff) | |
download | ninja-e065244ac75d1d0f25fd5c75cb58e714a13fe16b.tar.gz |
Squashed commit of the following:
merge master into timeline
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/init_state.js')
-rwxr-xr-x | js/helper-classes/RDGE/src/core/script/init_state.js | 12 |
1 files changed, 6 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 4b97a4f4..5ffbbd13 100755 --- a/js/helper-classes/RDGE/src/core/script/init_state.js +++ b/js/helper-classes/RDGE/src/core/script/init_state.js | |||
@@ -42,16 +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 | 46 | ||
47 | if (this.hasUserState && this.userRunState && this.userRunState.onLoadState) | 47 | if (this.hasUserState && this.userRunState && this.userRunState.onLoadState) |
48 | this.userRunState.onLoadState(); | 48 | this.userRunState.onLoadState(); |
49 | } | 49 | } |
50 | 50 | ||
51 | LoadState.prototype.ReInit = function() | 51 | LoadState.prototype.ReInit = function() |
52 | { | 52 | { |
53 | if (this.hasUserState && this.userRunState && this.userRunState.onLoadState) | 53 | if (this.hasUserState && this.userRunState && this.userRunState.onLoadState) |
54 | this.userRunState.onLoadState(); | 54 | this.userRunState.onLoadState(); |
55 | } | 55 | } |
56 | 56 | ||
57 | LoadState.prototype.Resize = function() | 57 | LoadState.prototype.Resize = function() |