1 files changed, 352 insertions, 352 deletions

diff --git a/js/lib/rdge/materials/cloud-material.js b/js/lib/rdge/materials/cloud-material.js
index 4e2a1a7c..873059bc 100644
--- a/js/lib/rdge/materials/cloud-material.js
+++ b/js/lib/rdge/materials/cloud-material.js
@@ -28,12 +28,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 
-var MaterialParser              = require("js/lib/rdge/materials/material-parser").MaterialParser;
-var Material                    = require("js/lib/rdge/materials/material").Material;
-var GLWorld                             = require("js/lib/drawing/world").World;
-var Texture                             = require("js/lib/rdge/texture").Texture;
-var ElementMediator             = require("js/mediators/element-mediator").ElementMediator;
-var TagTool                             = require("js/tools/TagTool").TagTool;
+var MaterialParser      = require("js/lib/rdge/materials/material-parser").MaterialParser;
+var Material            = require("js/lib/rdge/materials/material").Material;
+var GLWorld             = require("js/lib/drawing/world").World;
+var Texture             = require("js/lib/rdge/texture").Texture;
+var ElementMediator     = require("js/mediators/element-mediator").ElementMediator;
+var TagTool             = require("js/tools/TagTool").TagTool;
 
 ///////////////////////////////////////////////////////////////////////
 // Class GLMaterial
@@ -47,33 +47,33 @@ var CloudMaterial = function CloudMaterial()
     this._name = "Cloud";
     this._shaderName = "cloud";
 
-        this._texMap = 'assets/images/cloud10.png';
+    this._texMap = 'assets/images/cloud10.png';
     this._texMap = 'assets/images/cloud2.jpg';
-        //this._texMap = 'assets/images/CL13.png';
-        //this._texMap = 'assets/images/material_paint.png';
-        //this._texMap = 'assets/images/us_flag.png';
-        //this._texMap = 'assets/images/cubelight.png';
+    //this._texMap = 'assets/images/CL13.png';
+    //this._texMap = 'assets/images/material_paint.png';
+    //this._texMap = 'assets/images/us_flag.png';
+    //this._texMap = 'assets/images/cubelight.png';
     this._diffuseColor = [0.5, 0.5, 0.5, 0.5];
 
-        // base size of cloud polygons.  Random adjustments made to each quad
-        this._cloudSize = 40;
+    // base size of cloud polygons.  Random adjustments made to each quad
+    this._cloudSize = 40;
 
     this._time = 0.0;
     this._dTime = 0.01;
 
-        // parameter initial values
-        this._time                      = 0.0;
-        this._surfaceAlpha      = 0.5;
-//      this._zmin                      = 2.0;
-//      this._zmax                      = 5.0;
-        this._zmin                      = 5.0;
-        this._zmax                      = 10.0;
+    // parameter initial values
+    this._time          = 0.0;
+    this._surfaceAlpha  = 0.5;
+//  this._zmin          = 2.0;
+//  this._zmax          = 5.0;
+    this._zmin          = 5.0;
+    this._zmax          = 10.0;
 
-        // the adjusted zMin and zMax values are
-        // what get sent to the shader.  They are initialized
-        // in buildGeometry
-        this._adjustedZMin = this._zmin;
-        this._adjustedZMax = this._zmax;
+    // the adjusted zMin and zMax values are
+    // what get sent to the shader.  They are initialized
+    // in buildGeometry
+    this._adjustedZMin = this._zmin;
+    this._adjustedZMax = this._zmax;
 
 
 
@@ -132,68 +132,68 @@ var CloudMaterial = function CloudMaterial()
     /**************************************************************/
 
     this.init = function (world) {
-                var GLWorld = require("js/lib/drawing/world").World,
-                    NJUtils = require("js/lib/NJUtils").NJUtils;
-
-                // save the world
-                if (world)  this.setWorld( world );
-                var dstWorld = world;
-
-                // create a canvas to render into
-                var dstCanvas = this.getWorld().getCanvas();
-                var doc = this.getWorld().getCanvas().ownerDocument;
-                var canvasID = "__canvas__";
-                //this._srcCanvas = doc.createElement(canvasID);
-                this._srcCanvas = NJUtils.makeNJElement("canvas", canvasID, "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
-                srcCanvas = this._srcCanvas;
-                srcCanvas.width  = dstCanvas.width;
-                srcCanvas.height = dstCanvas.height;
-
-                //////////////////////////////////////////////////////////////////////////////////
-                // IS THIS NECESSARY??
+        var GLWorld = require("js/lib/drawing/world").World,
+            NJUtils = require("js/lib/NJUtils").NJUtils;
+
+        // save the world
+        if (world)  this.setWorld( world );
+        var dstWorld = world;
+
+        // create a canvas to render into
+        var dstCanvas = this.getWorld().getCanvas();
+        var doc = this.getWorld().getCanvas().ownerDocument;
+        var canvasID = "__canvas__";
+        //this._srcCanvas = doc.createElement(canvasID);
+        this._srcCanvas = NJUtils.makeNJElement("canvas", canvasID, "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
+        srcCanvas = this._srcCanvas;
+        srcCanvas.width  = dstCanvas.width;
+        srcCanvas.height = dstCanvas.height;
+
+        //////////////////////////////////////////////////////////////////////////////////
+        // IS THIS NECESSARY??
 //        var elementModel = TagTool.makeElement(~~srcCanvas.width, ~~srcCanvas.height,
 //                                                                        Matrix.I(4), [0,0,0], srcCanvas);
 //        ElementMediator.addElement(srcCanvas, elementModel.data, true);
-                //////////////////////////////////////////////////////////////////////////////////
+        //////////////////////////////////////////////////////////////////////////////////
 
-                // build the source.
-                // the source being the world/canvas/geometry of the clouds.
-                // the source is used to create a texture map that is then used by
-                // the destimation.
-                this.buildSource();
+        // build the source.
+        // the source being the world/canvas/geometry of the clouds.
+        // the source is used to create a texture map that is then used by
+        // the destimation.
+        this.buildSource();
 
-                // set up the shader
-                this._shader = new RDGE.jshader();
-                this._shader.def = cloudMapMaterialDef;
-                this._shader.init();
+        // set up the shader
+        this._shader = new RDGE.jshader();
+        this._shader.def = cloudMapMaterialDef;
+        this._shader.init();
 
-                // set up the material node
-                this._materialNode = RDGE.createMaterialNode("cloudMapMaterial" + "_" + world.generateUniqueNodeID());
-                this._materialNode.setShader(this._shader);
+        // set up the material node
+        this._materialNode = RDGE.createMaterialNode("cloudMapMaterial" + "_" + world.generateUniqueNodeID());
+        this._materialNode.setShader(this._shader);
 
-                // initialize the time
-                this._time = 0;
+        // initialize the time
+        this._time = 0;
 
-                // create the texture to map the source cloud generation world/canvas to the destination
-                var wrap = 'REPEAT',  mips = true;
-                this._glTex = new Texture( world, this._srcCanvas,  wrap, mips );
+        // create the texture to map the source cloud generation world/canvas to the destination
+        var wrap = 'REPEAT',  mips = true;
+        this._glTex = new Texture( world, this._srcCanvas,  wrap, mips );
 
-                // set the shader values in the shader
-                this.updateTexture();
-                this.update( 0 );
+        // set the shader values in the shader
+        this.updateTexture();
+        this.update( 0 );
     };
-        /**************************************************************/
+    /**************************************************************/
 
     this.updateTexture = function ()
-        {
+    {
         var material = this._materialNode;
         if (material)
-                {
+        {
             var technique = material.shaderProgram['default'];
             var saveContext = RDGE.globals.engine.getContext();
-                        var renderer = RDGE.globals.engine.getContext().renderer;
+            var renderer = RDGE.globals.engine.getContext().renderer;
             if (renderer && technique)
-                        {
+            {
                 var texMapName = this._propValues[this._propNames[0]];
                 var wrap = 'REPEAT', mips = true;
                 if (this._glTex)
@@ -201,236 +201,236 @@ var CloudMaterial = function CloudMaterial()
                     this._glTex.render();
 
                     var tex = this._glTex.getTexture();
-                                        if (tex)
-                                                technique.u_tex0.set( tex );
+                    if (tex)
+                        technique.u_tex0.set( tex );
+                }
+            }
+
+            // restore the context
+            RDGE.globals.engine.setContext( saveContext.id );
+        }
+    };
+
+    this.updateColor = function()
+    {
+    }
+
+    this.update = function( time )
+    {
+        if (this._srcWorld)
+        {
+            //this._srcWorld.update();
+            this._srcWorld.draw();
+            RDGE.globals.engine.setContext( this.getWorld()._canvas.rdgeid );
+        }
+
+        var technique, renderer, tex;
+        
+        // update the cloud map material
+        var material = this._materialNode;
+        if (material)
+        {
+            technique = material.shaderProgram['default'];
+            renderer = RDGE.globals.engine.getContext().renderer;