1 files changed, 208 insertions, 208 deletions

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 7f08bd6c..d2f05fad 100755
--- a/js/helper-classes/RDGE/src/core/script/run_state.js
+++ b/js/helper-classes/RDGE/src/core/script/run_state.js
@@ -7,47 +7,47 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var RDGE = RDGE || {};

 

 RDGE.RunState = function (userRunState, context) {

-    this.name = "RunState";

+        this.name = "RunState";

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

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

-    this.renderer = context.renderer;

-    this.initialized = false;

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

+        this.renderer = context.renderer;

+        this.initialized = false;

 };

 

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

-    this.initialized = true;

-    var width = this.renderer.vpWidth;

-    var height = this.renderer.vpHeight;

+        this.initialized = true;

+        var width = this.renderer.vpWidth;

+        var height = this.renderer.vpHeight;

     var cam = new RDGE.camera();

-    cam.setPerspective(45.0, width / height, 1.0, 100.0);

+        cam.setPerspective(45.0, width / height, 1.0, 100.0);

     cam.setLookAt([0, 0, 20], [0, 0, 0], RDGE.vec3.up());

 

-    this.renderer.cameraManager().setActiveCamera(cam);

+        this.renderer.cameraManager().setActiveCamera( cam );

 

     if (this.hasUserState && this.userRunState.init != undefined) {

-        this.userRunState.init();

-    }

+                this.userRunState.init();

+        }

 

-    if (this.hasUserState && this.userRunState && this.userRunState.onRunState)

-        this.userRunState.onRunState();

+        if (this.hasUserState && this.userRunState && this.userRunState.onRunState)
+                this.userRunState.onRunState();
+
 

+        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

 

-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

-

-    //  if(theScene=="Robots_rt") {

-    //          g_enableShadowMapping=false;

-    //          g_showSSAO=false;

+//      if(theScene=="Robots_rt") {

+//              g_enableShadowMapping=false;

+//              g_showSSAO=false;

     //          RDGE.globals.engine.defaultContext.uniforms[1]={ 'name': "u_lightAmb",'value': [0.5,0.5,0.5,1.0] };

     //          RDGE.globals.engine.defaultContext.uniforms[7]={ 'name': "u_matAmbient",'value': [0.8,0.8,0.8,1] };

-    //  }

+//      }

 

 

-    //  g_hrDepthMapGenShader=createShader(this.renderer.ctx,'depthMap_vshader','depthMap_fshader',["vert","normal"]);

-    //  g_depthMapGenShader=createShader(this.renderer.ctx,'norm_depth_vshader','norm_depth_fshader',["vert","normal"]);

+//      g_hrDepthMapGenShader=createShader(this.renderer.ctx,'depthMap_vshader','depthMap_fshader',["vert","normal"]);

+//      g_depthMapGenShader=createShader(this.renderer.ctx,'norm_depth_vshader','norm_depth_fshader',["vert","normal"]);

 

-    //  // shadow light

+//      // shadow light

     //  g_mainLight=new RDGE.camera();        // camera to represent our light's point of view

-    //  g_mainLight.setPerspective(45.0,width/height,1.0,200.0);

+//      g_mainLight.setPerspective(45.0,width/height,1.0,200.0);

     //  g_mainLight.setLookAt([-60,17,-15],[-5,-5,15],RDGE.vec3.up());       // lights position and point of view

     //  g_mainLight.mvMatrix=RDGE.mat4.copy(g_mainLight.view);   // hold model view transform

     //  g_mainLight.invViewMatrix=RDGE.mat4.inverse(g_mainLight.view);

@@ -55,49 +55,49 @@ RDGE.RunState.prototype.Init = function () {
     //  g_mainLight.shadowMatrix=RDGE.mat4.identity();           // shadow matrix creates shadow bias

     //  g_mainLight.shadowMatrix=RDGE.mat4.scale(g_mainLight.shadowMatrix,[0.5,0.5,0.5]);

     //  g_mainLight.shadowMatrix=RDGE.mat4.translate(g_mainLight.shadowMatrix,[0.5,0.5,0.5]);

-    //  //g_cameraManager.setActiveCamera( g_mainLight );

-    //  

+//      //g_cameraManager.setActiveCamera( g_mainLight );

+//      

     //  uniformEnableGlow = this.renderer.ctx.getUniformLocation(RDGE.globals.engine.defaultContext.shaderProg, "u_renderGlow");

-    //  

-    //  depthRTT=createRenderTargetTexture(1024,1024);

-    //  glowRTT=createRenderTargetTexture(512,512);

+//      

+//      depthRTT=createRenderTargetTexture(1024,1024);

+//      glowRTT=createRenderTargetTexture(512,512);

     //  blurFX=new RDGE.fx.fxBlur([256,128,64],true);

-    //  mainRTT=createRenderTargetTexture(1024,1024);

+//      mainRTT=createRenderTargetTexture(1024,1024);

     //  ssaoFX=new RDGE.fx.fxSSAO(true);

-    //  ssaoRTT=createRenderTargetTexture(1024,1024);

-    //  depthRTT=createRenderTargetTexture(1024,1024);

-    //  hrDepthRTT=createRenderTargetTexture(1024,1024);

-    //  hrDepthRTTSSAO=createRenderTargetTexture(1024,1024);

+//      ssaoRTT=createRenderTargetTexture(1024,1024);

+//      depthRTT=createRenderTargetTexture(1024,1024);

+//      hrDepthRTT=createRenderTargetTexture(1024,1024);

+//      hrDepthRTTSSAO=createRenderTargetTexture(1024,1024);

     //  mainSceneQuad=new RDGE.ScreenQuad(mainRTT);

     //  mainSceneQuad.initialize(RDGE.renderInitScreenQuad);

 

-    //  cubelight_Glow  = this.renderer.createTexture("assets/images/cubelight_Glow.png");

-    //  lightRack_Glow  = this.renderer.createTexture("assets/images/lightRack_Glow.png");

-    //  black                   = this.renderer.createTexture("assets/images/black.png");

+//      cubelight_Glow  = this.renderer.createTexture("assets/images/cubelight_Glow.png");

+//      lightRack_Glow  = this.renderer.createTexture("assets/images/lightRack_Glow.png");

+//      black                   = this.renderer.createTexture("assets/images/black.png");

 

-    //  renderGlow=false;

+//      renderGlow=false;

 

-    //  // depth map and normal proc

-    //  renderProcDepth=new GenerateDepthMap();

-    //  renderProcGlow=new GenerateGlowMap();

+//      // depth map and normal proc

+//      renderProcDepth=new GenerateDepthMap();

+//      renderProcGlow=new GenerateGlowMap();

     //  renderProc=new RDGE.SceneRender();

-    //  renderProcCreateShadowMap=new SceneCreateShadowMap();

-    //  renderProcHighResDepth=new GenerateHighResDepthMap();

+//      renderProcCreateShadowMap=new SceneCreateShadowMap();

+//      renderProcHighResDepth=new GenerateHighResDepthMap();

 

     //  RDGE.globals.engine.defaultContext.textureList.push({ 'handle': hrDepthRTT,'unit': 7,'type': RDGE.UNIFORMTYPE.TEXTURE2D });

     //  RDGE.globals.engine.defaultContext.uniforms.push({ 'name': "depthMap",'value': [hrDepthRTT] });

-

+                

     ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

 };

 

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

     if (!this.initialized) {

-        this.Init();

-    }

+                this.Init();

+        }
     else {

-        if (this.hasUserState && this.userRunState && this.userRunState.onRunState)

-            this.userRunState.onRunState();

-    }

+                if (this.hasUserState && this.userRunState && this.userRunState.onRunState)
+                        this.userRunState.onRunState();
+        }

 };

 

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

@@ -106,105 +106,105 @@ RDGE.RunState.prototype.Update = function (dt) {
 

 RDGE.RunState.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.RunState.prototype.Draw = function () {

-    var width = this.renderer.vpWidth;

-    var height = this.renderer.vpHeight;

-

-    //  this.renderer._clear();

-

-    this.userRunState.draw();

-

-    // ~~~~ removing post process till multi-context and post process system is in place

-    //          if(this.currentScene==null)

-    //                  return;

-

-    //          this.renderer.setClearColor([1.0,1.0,1.0,1.0]);

-

-    //          // post process will eventually be wrapped in

-    //          this.renderer.ctx.bindFramebuffer(renderer.ctx.FRAMEBUFFER, depthRTT.frameBuffer);

-    //          this.renderer.setViewPort(0,0,1024,1024);

-    //          this.renderer.clear(this.renderer.colorBuffer | this.renderer.depthBuffer);

+        var width = this.renderer.vpWidth;

+        var height = this.renderer.vpHeight;

+        

+//      this.renderer._clear();

+        

+        this.userRunState.draw();

+        

+// ~~~~ removing post process till multi-context and post process system is in place

+//              if(this.currentScene==null)

+//                      return;

+

+//              this.renderer.setClearColor([1.0,1.0,1.0,1.0]);

+

+//              // post process will eventually be wrapped in

+//              this.renderer.ctx.bindFramebuffer(renderer.ctx.FRAMEBUFFER, depthRTT.frameBuffer);

+//              this.renderer.setViewPort(0,0,1024,1024);

+//              this.renderer.clear(this.renderer.colorBuffer | this.renderer.depthBuffer);