8 files changed, 236 insertions, 91 deletions

diff --git a/assets/shaders/Basic.vert.glsl b/assets/shaders/Basic.vert.glsl
index 0d5b8d63..f96f8322 100755
--- a/assets/shaders/Basic.vert.glsl
+++ b/assets/shaders/Basic.vert.glsl
@@ -14,6 +14,8 @@ precision highp float;
 attribute vec3 a_pos;
 attribute vec2 texcoord;
 
+// varying
+varying vec2    v_texCoord0;
 
 // matrix uniforms
 uniform mat4 u_mvMatrix;
@@ -22,5 +24,6 @@ uniform mat4 u_worldMatrix;
 
 void main(void)
 {
+        v_texCoord0 = texcoord;
         gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0) ;
 }
\ No newline at end of file
diff --git a/assets/shaders/BasicTex.frag.glsl b/assets/shaders/BasicTex.frag.glsl
new file mode 100644
index 00000000..a716e77d
--- /dev/null
+++ b/assets/shaders/BasicTex.frag.glsl
@@ -0,0 +1,19 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+
+#ifdef GL_ES
+precision highp float;
+#endif
+
+uniform sampler2D u_tex0;
+
+varying vec2    v_texCoord0;
+
+
+void main() {
+   gl_FragColor = texture2D(u_tex0, v_texCoord0);
+}
diff --git a/assets/shaders/Cloud.frag.glsl b/assets/shaders/Cloud.frag.glsl
index b07bb627..ba1ef39e 100644
--- a/assets/shaders/Cloud.frag.glsl
+++ b/assets/shaders/Cloud.frag.glsl
@@ -17,7 +17,7 @@ varying vec2	v_texCoord0;
 
 void main()
 {
-   // gl_FragColor = texture2D(u_tex0, v_texCoord0) * u_surfaceAlpha;
-   gl_FragColor = vec4(1,0,0,1);
+   gl_FragColor = texture2D(u_tex0, v_texCoord0) * u_surfaceAlpha;
+   //gl_FragColor = texture2D(u_tex0, v_texCoord0);
 }    
   
\ No newline at end of file
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 5eca26b8..4ca738f4 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -73,6 +73,7 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
         this._firstRender = true;
 
         this._worldCount = worldCounter;
+        console.log( "creating world " + this._worldCount );
         worldCounter++;
 
         // keep a counter for generating node names
@@ -514,6 +515,18 @@ World.prototype.restartRenderLoop = function() {
         }
 };
 
+World.prototype.stop = function()
+{
+        if (this._canvas && this._canvas.task)
+                this._canvas.task.stop();
+}
+
+World.prototype.start = function()
+{
+        if (this._canvas && this._canvas.task)
+                this._canvas.task.start();
+}
+
 //append to the list of objects if obj doesn't already exist
 //if obj exists, then don't add to list of objects
 World.prototype.addIfNewObject = function (obj) {
diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index d4dd8033..70f6b01b 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -1294,6 +1294,7 @@ RectangleGeometry.init = function()
 
 RectangleGeometry.addQuad = function( verts,  normals, uvs )
 {
+        var offset = this.vertices.length/3;
         for (var i=0;  i<4;  i++)
         {
                 RectangleGeometry.pushVertex( verts[i][0], verts[i][1], verts[i][2]);
@@ -1301,13 +1302,13 @@ RectangleGeometry.addQuad = function( verts,  normals, uvs )
                 RectangleGeometry.pushUV( uvs[i] );
         }
 
-        RectangleGeometry.pushIndices( 0, 1, 2 );
-        RectangleGeometry.pushIndices( 2, 3, 0 );
+        RectangleGeometry.pushIndices( 0+offset, 1+offset, 2+offset );
+        RectangleGeometry.pushIndices( 2+offset, 3+offset, 0+offset );
 }
 
 RectangleGeometry.buildPrimitive = function()
 {
-        var nVertices = this.vertices.length;
+        var nVertices = this.vertices.length/3;
         return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.TRIANGLES, nVertices);
 }
 
diff --git a/js/lib/math/matrix.js b/js/lib/math/matrix.js
index 77a0966d..3a5a8215 100755
--- a/js/lib/math/matrix.js
+++ b/js/lib/math/matrix.js
@@ -67,6 +67,15 @@ Matrix.Rotation = function(angle, axis) {
     return mat;
 };
 
+Matrix.Scale = function( scaleVec ) {
+    var mat = Matrix.I(4);
+    mat[ 0] = scaleVec[0];
+        mat[ 5] = scaleVec[1];
+        mat[10] = scaleVec[2];
+
+    return mat;
+};
+
 Matrix.flatten = function (mat) {
     var result = [];
     if (this.elements.length == 0) {
diff --git a/js/lib/rdge/materials/cloud-material.js b/js/lib/rdge/materials/cloud-material.js
index 126751c6..e2292c7a 100644
--- a/js/lib/rdge/materials/cloud-material.js
+++ b/js/lib/rdge/materials/cloud-material.js
@@ -8,6 +8,8 @@ var MaterialParser		= require("js/lib/rdge/materials/material-parser").MaterialP
 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
@@ -20,7 +22,9 @@ var CloudMaterial = function CloudMaterial() {
         this._name = "CloudMaterial";
         this._shaderName = "cloud";
 
-        this._texMap = 'assets/images/cloud10.png';
+        //this._texMap = 'assets/images/cloud10.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
@@ -31,7 +35,7 @@ var CloudMaterial = function CloudMaterial() {
 
         // parameter initial values
         this._time                      = 0.0;
-        this._surfaceAlpha      = 1.0;
+        this._surfaceAlpha      = 0.6;
         this._zmin                      = 0.1;
         this._zmax                      = 10.0;
 
@@ -111,80 +115,54 @@ var CloudMaterial = function CloudMaterial() {
 
                 // save the world
                 if (world)  this.setWorld( world );
-
-                // this variable declared above is inherited set to a smaller delta.
-                // the cloud material runs a little faster
-                this._dTime = 0.01;
+                var dstWorld = world;
 
                 // create a canvas to render into
-                var doc = world.getCanvas().ownerDocument;
+                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);
-                var dstCanvas = this.getWorld().getCanvas(),
-                        srcCanvas = this._srcCanvas;
+                srcCanvas = this._srcCanvas;
                 srcCanvas.width  = dstCanvas.width;
                 srcCanvas.height = dstCanvas.height;
 
-                // save the current RDGE context
-                var saveContext = g_Engine.getContext();        
-
-                // build a world to do the rendering
-                this._srcWorld = new GLWorld( this._srcCanvas, true, true );
-                var srcWorld = this._srcWorld;
-                this._srcCanvas.__GLWorld = srcWorld;
+                //////////////////////////////////////////////////////////////////////////////////
+                // 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 geometry
-                var prim = this.buildGeometry( srcWorld,  srcCanvas.width, srcCanvas.height );
+                // 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