Expand tabs

1 files changed, 156 insertions, 156 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 d8d6d4c5..b8058e65 100755
--- a/js/helper-classes/RDGE/src/core/script/init_state.js
+++ b/js/helper-classes/RDGE/src/core/script/init_state.js
@@ -32,126 +32,126 @@ var RDGE = RDGE || {};
 

 // init the view

 RDGE.LoadState = function(userRunState, context) {

-    this.name                                   = "LoadState";

+    this.name                   = "LoadState";

     this.userRunState           = userRunState !== undefined ? userRunState : new RDGE.core.RDGEState;

-        this.hasUserState                       = userRunState !== undefined ? true : false;

-        this.renderer                           = context.renderer;

-        this.loadingDone                        = false;

-        this.stateManager                       = context.ctxStateManager;

-        this.sceneLoadQueue                     = [];

-        this.textureLoadQueue           = [];

+    this.hasUserState           = userRunState !== undefined ? true : false;

+    this.renderer               = context.renderer;

+    this.loadingDone            = false;

+    this.stateManager           = context.ctxStateManager;

+    this.sceneLoadQueue         = [];

+    this.textureLoadQueue       = [];

 };

 

 RDGE.LoadState.prototype.loadScene = function (addr, sceneName) {

     var request = new RDGE.sceneRequestDef(addr, sceneName);

-        request.doSceneRequest = true;

-        this.sceneLoadQueue.push( request );

+    request.doSceneRequest = true;

+    this.sceneLoadQueue.push( request );

 };

 

 RDGE.LoadState.prototype.loadTexture = function (textureObject) {

     if (this.stateManager.currentState().name != "LoadState") {

-                this.stateManager.PushState( this.stateManager.RDGEInitState, "noInit" );

-        }

-        

-        this.textureLoadQueue.push(textureObject);

+        this.stateManager.PushState( this.stateManager.RDGEInitState, "noInit" );

+    }

+    

+    this.textureLoadQueue.push(textureObject);

 };

 

 RDGE.LoadState.prototype.Init = function () {

     if (this.sceneName) {

-                this.loadScene("assets_web/mesh/" + this.sceneName + ".json", this.sceneName);

-        }
+        this.loadScene("assets_web/mesh/" + this.sceneName + ".json", this.sceneName);

+    }
 
-        if (this.hasUserState && this.userRunState && this.userRunState.onLoadState)
-                this.userRunState.onLoadState();
+    if (this.hasUserState && this.userRunState && this.userRunState.onLoadState)
+        this.userRunState.onLoadState();
 };

 

 RDGE.LoadState.prototype.ReInit = function () {

-        if (this.hasUserState && this.userRunState && this.userRunState.onLoadState)
-                this.userRunState.onLoadState();
+    if (this.hasUserState && this.userRunState && this.userRunState.onLoadState)
+        this.userRunState.onLoadState();
 };

 

 RDGE.LoadState.prototype.Resize = function () {

     if (RDGE.globals.engine.lastWindowWidth == window.innerWidth && RDGE.globals.engine.lastWindowHeight == window.innerHeight) {

-                this.userRunState.resize();

+        this.userRunState.resize();

         RDGE.globals.engine.lastWindowWidth = window.innerWidth;

         RDGE.globals.engine.lastWindowHeight = window.innerHeight;

 }

 };

 

 RDGE.LoadState.prototype.Update = function (dt) {

-        // for the current scene go through processing steps

-        var sceneLoadTop = this.sceneLoadQueue.length - 1;

-        var texLoadTop  = this.textureLoadQueue.length - 1;

-        

+    // for the current scene go through processing steps

+    var sceneLoadTop = this.sceneLoadQueue.length - 1;

+    var texLoadTop  = this.textureLoadQueue.length - 1;

+    

     if (sceneLoadTop > -1) {

-                var curSceneReq = this.sceneLoadQueue[sceneLoadTop];

-                

-                // check for completed mesh requests and load the data

+        var curSceneReq = this.sceneLoadQueue[sceneLoadTop];

+        

+        // check for completed mesh requests and load the data

         RDGE.globals.meshMan.processMeshData();

 

         if (curSceneReq.doSceneRequest) {

-                        curSceneReq.requestScene();

-                }

+            curSceneReq.requestScene();

+        }

         else if (curSceneReq.requestComplete) {

             if (curSceneReq.sceneBeginProcessing) {

-                                // Load meshes attached to the scene

+                // Load meshes attached to the scene

                 curSceneReq.scene = new RDGE.SceneGraph(curSceneReq.rawData);

-                                curSceneReq.scene.enableShadows( true );

+                curSceneReq.scene.enableShadows( true );

                 RDGE.globals.engine.AddScene(curSceneReq.name, curSceneReq.scene);

 

-                                // setup the scene and save a map of mesh names

-                                // that will be check off as the meshes load

-                                curSceneReq.scene.Traverse(curSceneReq.sceneProcessor, false);

-                                

-                                // processing is complete

-                                curSceneReq.sceneBeginProcessing = false;

-                        }

-                        // if we are here than the scene is processed but meshes are still loading/processing asynchronously

+                // setup the scene and save a map of mesh names

+                // that will be check off as the meshes load

+                curSceneReq.scene.Traverse(curSceneReq.sceneProcessor, false);

+                

+                // processing is complete

+                curSceneReq.sceneBeginProcessing = false;

+            }

+            // if we are here than the scene is processed but meshes are still loading/processing asynchronously

             else if (curSceneReq.processingComplete()) {

-                                // pop the head node

-                                var sceneReq = this.sceneLoadQueue.shift();

-                                this.userRunState.onComplete(sceneReq.name, sceneReq.scene);    

-                        }

-                }

-                

-        }

-        

-        // load any waiting textures

+                // pop the head node

+                var sceneReq = this.sceneLoadQueue.shift();

+                this.userRunState.onComplete(sceneReq.name, sceneReq.scene);    

+            }

+        }

+        

+    }

+    

+    // load any waiting textures

     while (this.textureLoadQueue.length > 0) {

-                this.renderer.commitTexture( this.textureLoadQueue.shift() );

-        }

-        

-        // if there is nothing left to load move back to the run state

+        this.renderer.commitTexture( this.textureLoadQueue.shift() );

+    }

+    

+    // if there is nothing left to load move back to the run state

     if (this.sceneLoadQueue.length == 0 && this.textureLoadQueue.length == 0) {

-                // loaded... remove the state

+        // loaded... remove the state

         var stateMan = RDGE.globals.engine.getContext().ctxStateManager;

-                stateMan.PopState();

-        }

-        

+        stateMan.PopState();

+    }

+    

     if (RDGE.globals.engine.getContext().getScene() && RDGE.globals.engine.getContext().getScene() != "not-ready" && this.stateManager.RDGERunState.initialized)

-                this.userRunState.update(dt);   

+        this.userRunState.update(dt);   

 };

 

 RDGE.LoadState.prototype.Draw = function () {

-        this.renderer._clear();

-        

+    this.renderer._clear();

+    

     if (RDGE.globals.engine.getContext().getScene() && RDGE.globals.engine.getContext().getScene() != "not-ready" && this.stateManager.RDGERunState.initialized)

-                this.userRunState.draw();       

+        this.userRunState.draw();   

 };

-        

+    

 RDGE.LoadState.prototype.Shutdown = function () {

 };

 

 RDGE.LoadState.prototype.LeaveState = function () {

     if (this.userRunState.onComplete != undefined) {

-                this.userRunState.onComplete(); 

-        }

+        this.userRunState.onComplete(); 

+    }

 };

 

 RDGE.LoadState.prototype.MakeSceneRequest = function (addr, name) {

 

-        this.hasScene = true;

-        this.lastSceneName = name;

+    this.hasScene = true;

+    this.lastSceneName = name;

     var request = new XMLHttpRequest();