1 files changed, 246 insertions, 57 deletions

diff --git a/js/helper-classes/RDGE/runtime/GLRuntime.js b/js/helper-classes/RDGE/runtime/GLRuntime.js
index 5c99be02..58cb4e33 100644
--- a/js/helper-classes/RDGE/runtime/GLRuntime.js
+++ b/js/helper-classes/RDGE/runtime/GLRuntime.js
@@ -16,6 +16,7 @@ function GLRuntime( canvas, importStr )
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
         this._canvas            = canvas;
+        this._context           = null;
         this._importStr         = importStr;
 
         this.renderer           = null;
@@ -25,15 +26,40 @@ function GLRuntime( canvas, importStr )
         this._rootNode          = null;
 
         this._firstRender       = true;
+        this._initialized       = false;
+
+        this._useWebGL          = false;
+
+        // view parameters
+        this._fov = 45.0;
+        this._zNear = 0.1;
+        this._zFar = 100.0;
+        this._viewDist = 5.0;
+
+        this._aspect = canvas.width/canvas.height;
+
+        this._geomRoot;
+
+        // all "live" materials
+        this._materials = [];
 
     ///////////////////////////////////////////////////////////////////////
-        // initialization code
+        // accessors
     ///////////////////////////////////////////////////////////////////////
-        var id = canvas.getAttribute( "data-RDGE-id" ); 
-        canvas.rdgeid = id;
-        g_Engine.registerCanvas(canvas, this);
-        RDGEStart( canvas );
+        this.getZNear                   = function()            {  return this._zNear;                  }
+        this.getZFar                    = function()            {  return this._zFar;                   }
+        this.getFOV                             = function()            {  return this._fov;                    }
+        this.getAspect                  = function()            {  return this._aspect;                 }
+        this.getViewDistance    = function()            {  return this._viewDist;               }
+
+        this.get2DContext               = function()            {  return this._context;                }
 
+        this.getViewportWidth   = function()            {  return this._canvas.width;   }
+        this.getViewportHeight  = function()            {  return this._canvas.height;  }
+
+    ///////////////////////////////////////////////////////////////////////
+        // accessors
+    ///////////////////////////////////////////////////////////////////////
         this.loadScene = function()
         {
                 // parse the data
@@ -41,6 +67,8 @@ function GLRuntime( canvas, importStr )
                 var index = importStr.indexOf( "scenedata: " );
                 if (index >= 0)
                 {
+                        this._useWebGL = true;
+
                         var rdgeStr = importStr.substr( index+11 );
                         var endIndex = rdgeStr.indexOf( "endscene\n" );
                         if (endIndex < 0)  throw new Error( "ill-formed WebGL data" );
@@ -48,6 +76,15 @@ function GLRuntime( canvas, importStr )
                         rdgeStr = rdgeStr.substr( 0, endIndex );
 
                         this.myScene.importJSON( rdgeStr );
+                        this.importObjects( importStr );
+                        this.linkMaterials( this._geomRoot );
+                        this.initMaterials();
+                }
+                else
+                {
+                        this._context = this._canvas.getContext( "2d" );
+                        this.importObjects( importStr );
+                        this.render();
                 }
         }
 
@@ -72,86 +109,238 @@ function GLRuntime( canvas, importStr )
         
                 // create an empty scene graph
                 this.myScene = new SceneGraph();
-                this.loadScene();
-       
-                /*
-                // create some lights
-                // light 1
-                this.light = createLightNode("myLight");
-                this.light.setPosition([0,0,1.2]);
-                this.light.setDiffuseColor([0.75,0.9,1.0,1.0]);
-        
-                // light 2
-                this.light2 = createLightNode("myLight2");
-                this.light2.setPosition([-0.5,0,1.2]);
-                this.light2.setDiffuseColor([1.0,0.9,0.75,1.0]);
-        
-                // create a light transform
-                var lightTr = createTransformNode("lightTr");
-        
-                // create and attach a material - materials hold the light data
-                lightTr.attachMaterial(createMaterialNode("lights"));
-        
-                // enable light channels 1, 2 - channel 0 is used by the default shader
-                lightTr.materialNode.enableLightChannel(1, this.light);
-                lightTr.materialNode.enableLightChannel(2, this.light2);
-     
-                // all added objects are parented to the light node
-                this._rootNode = lightTr;
-        
-                // add the light node to the scene
-                this.myScene.addNode(lightTr);
-                */
 
                 // load the scene graph data
+                this.loadScene();
         
                 // Add the scene to the engine - necessary if you want the engine to draw for you
                 var name = "myScene" + this._canvas.getAttribute( "data-RDGE-id" ); 
                 g_Engine.AddScene(name, this.myScene);
+
+                this._initialized = true;
         }
     
         // main code for handling user interaction and updating the scene   
         this.update = function(dt)
     {
-                if (!dt)  dt = 0.2;
+                if (this._initialized)
+                {
+                        if (!dt)  dt = 0.2;
         
-                dt = 0.01;      // use our own internal throttle
-                this.elapsed += dt;
+                        dt = 0.01;      // use our own internal throttle
+                        this.elapsed += dt;
         
-                // changed the global position uniform of light 0, another way to change behavior of a light
-                rdgeGlobalParameters.u_light0Pos.set( [5*Math.cos(this.elapsed), 5*Math.sin(this.elapsed), 20]);
+                        // changed the global position uniform of light 0, another way to change behavior of a light
+                        rdgeGlobalParameters.u_light0Pos.set( [5*Math.cos(this.elapsed), 5*Math.sin(this.elapsed), 20]);
         
-                // orbit the light nodes around the boxes
-                this.light.setPosition([1.2*Math.cos(this.elapsed*2.0), 1.2*Math.sin(this.elapsed*2.0), 1.2*Math.cos(this.elapsed*2.0)]);
-                this.light2.setPosition([-1.2*Math.cos(this.elapsed*2.0), 1.2*Math.sin(this.elapsed*2.0), -1.2*Math.cos(this.elapsed)]);
+                        // orbit the light nodes around the boxes
+                        //this.light.setPosition([1.2*Math.cos(this.elapsed*2.0), 1.2*Math.sin(this.elapsed*2.0), 1.2*Math.cos(this.elapsed*2.0)]);
+                        //this.light2.setPosition([-1.2*Math.cos(this.elapsed*2.0), 1.2*Math.sin(this.elapsed*2.0), -1.2*Math.cos(this.elapsed)]);
+
+                        this.updateMaterials();
 
-                // now update all the nodes in the scene
-                this.myScene.update(dt);
+                        // now update all the nodes in the scene
+                        this.myScene.update(dt);
+                }
     }
 
+        this.updateMaterials = function()
+        {
+                var nMats = this._materials.length;
+                for (var i=0;  i<nMats;  i++)
+                {
+                        var mat = this._materials[i];
+                        mat.update();
+                }
+        }
+
     // defining the draw function to control how the scene is rendered      
         this.draw = function()
     {
-                g_Engine.setContext( this._canvas.rdgeid );
-
-                var ctx = g_Engine.getContext();
-                var renderer = ctx.renderer;
-                if (renderer.unloadedTextureCount <= 0)
+                if (this._initialized)
                 {
-                        renderer.disableCulling();
-                        renderer._clear();
-                        this.myScene.render();
+                        g_Engine.setContext( this._canvas.rdgeid );
 
-                        if (this._firstRender)
+                        var ctx = g_Engine.getContext();
+                        var renderer = ctx.renderer;
+                        if (renderer.unloadedTextureCount <= 0)
                         {
-                                if (this._canvas.task)
+                                renderer.disableCulling();
+                                renderer._clear();
+                                this.myScene.render();
+
+                                if (this._firstRender)
                                 {