Merge branch 'refs/heads/master' into montage-v11-integration

Conflicts:
	js/io/system/ninjalibrary.json

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 357 insertions, 82 deletions

diff --git a/js/lib/rdge/materials/cloud-material.js b/js/lib/rdge/materials/cloud-material.js
index bde42ac3..fc833565 100644
--- a/js/lib/rdge/materials/cloud-material.js
+++ b/js/lib/rdge/materials/cloud-material.js
@@ -4,25 +4,55 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
-var Material = require("js/lib/rdge/materials/material").Material;
+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
 //      RDGE representation of a material.
 ///////////////////////////////////////////////////////////////////////
-var CloudMaterial = function CloudMaterial() {
+var CloudMaterial = function CloudMaterial()
+{
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-    this._name = "CloudMaterial";
+    this._name = "Cloud";
     this._shaderName = "cloud";
 
+        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._diffuseColor = [0.5, 0.5, 0.5, 0.5];
 
+        // 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;
+
+        // 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;
+
+
+
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
@@ -34,7 +64,6 @@ var CloudMaterial = function CloudMaterial() {
 
     this.setDiffuseColor = function (c) { this._propValues[this._propNames[1]] = c.slice(0); this.updateColor(); };
     this.getDiffuseColor = function () { return this._propValues[this._propNames[1]] ? this._propValues[this._propNames[1]].slice() : null; };
-
     this.isAnimated = function () { return true; };
 
     ///////////////////////////////////////////////////////////////////////
@@ -65,7 +94,6 @@ var CloudMaterial = function CloudMaterial() {
             case "diffusecolor":
                 this.setDiffuseColor(value);
                 break;
-
             case "color":
                 break;
         }
@@ -77,97 +105,300 @@ var CloudMaterial = function CloudMaterial() {
     // Methods
     ///////////////////////////////////////////////////////////////////////
     // duplicate method required
-    this.dup = function (world) {
-        // save the world
-        if (world) this.setWorld(world);
-
-        // allocate a new uber material
-        var newMat = new CloudMaterial();
-
-        // copy over the current values;
-        var propNames = [], propValues = [], propTypes = [], propLabels = [];
-        this.getAllProperties(propNames, propValues, propTypes, propLabels);
-        var n = propNames.length;
-        for (var i = 0; i < n; i++) {
-            newMat.setProperty(propNames[i], propValues[i]);
-        }
-
-        return newMat;
-    };
+    /**************************************************************/
 
     this.init = function (world) {
-        // 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;
-
-        // set up the shader
-        this._shader = new RDGE.jshader();
-        this._shader.def = cloudMaterialDef;
-        this._shader.init();
-
-        // set up the material node
-        this._materialNode = RDGE.createMaterialNode("cloudMaterial" + "_" + world.generateUniqueNodeID());
-        this._materialNode.setShader(this._shader);
-
-        this._time = 0;
-        if (this._shader && this._shader['default']) {
-            this._shader['default'].u_time.set([this._time]);
-            this._shader['default'].u_DiffuseColor.set(this._diffuseColor);
-        }
-
-        // set the shader values in the shader
-        this.updateTexture();
-        this.update(0);
-    };
-
-    this.updateColor = function () {
-        var material = this._materialNode;
-        if (material) {
-            var technique = material.shaderProgram['default'];
-            var renderer = RDGE.globals.engine.getContext().renderer;
-            if (renderer && technique) {
-                var color = this._propValues[this._propNames[1]];
-                technique.u_DiffuseColor.set(this._diffuseColor);
-            }
-        }
+                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();
+
+                // 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);
+
+                // 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 );
+
+                // set the shader values in the shader
+                this.updateTexture();
+                this.update( 0 );
     };
+        /**************************************************************/
 
-    this.updateTexture = function () {
+    this.updateTexture = function ()
+        {
         var material = this._materialNode;
-        if (material) {
+        if (material)
+                {
             var technique = material.shaderProgram['default'];
-            var renderer = RDGE.globals.engine.getContext().renderer;
-            if (renderer && technique) {
+            var saveContext = RDGE.globals.engine.getContext();
+                        var renderer = RDGE.globals.engine.getContext().renderer;
+            if (renderer && technique)
+                        {
                 var texMapName = this._propValues[this._propNames[0]];
                 var wrap = 'REPEAT', mips = true;
-                var tex = this.loadTexture(texMapName, wrap, mips);
+                if (this._glTex)
+                {
+                    this._glTex.render();