Merge branch 'Taper' of https://github.com/ericmueller/ninja-internal

Conflicts:
	js/lib/geom/circle.js
	js/lib/rdge/materials/linear-gradient-material.js

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

31 files changed, 1526 insertions, 876 deletions

diff --git a/assets/shaders/Flag.vert.glsl b/assets/shaders/Flag.vert.glsl
index fe3ff722..2d5c4494 100644
--- a/assets/shaders/Flag.vert.glsl
+++ b/assets/shaders/Flag.vert.glsl
@@ -59,7 +59,8 @@ void main()
         const float pi = 3.14159;
         float angle = time;
 
-    v_uv = texcoord;
+    v_uv.x = texcoord.x;
+    v_uv.y = texcoord.y;
 
         float x = 2.0*pi*texcoord.x/u_waveWidth;
         float y = 2.0*pi*texcoord.y;
diff --git a/assets/shaders/Pulse.frag.glsl b/assets/shaders/Pulse.frag.glsl
index 9aeb05c9..b717d359 100644
--- a/assets/shaders/Pulse.frag.glsl
+++ b/assets/shaders/Pulse.frag.glsl
@@ -22,6 +22,7 @@ void main(void)
     float cLength = length(cPos);
 
     vec2 uv = gl_FragCoord.xy/u_resolution.xy+(cPos/cLength)*sin(cLength/30.0-time*10.0)/25.0;
+        uv.y = 1.0 - uv.y;
     vec3 col = texture2D(u_tex0,uv).xyz*50.0/cLength;
 
     gl_FragColor = vec4(col,1.0);
diff --git a/assets/shaders/test_fshader_full.glsl b/assets/shaders/test_fshader_full.glsl
index ae7d45b2..345a93f2 100755
--- a/assets/shaders/test_fshader_full.glsl
+++ b/assets/shaders/test_fshader_full.glsl
@@ -62,7 +62,7 @@ varying vec3 vEyePos;
 
 void main()
 {
-  vec4 colMapTexel = vec4(texture2D(colMap, vec2(vNormal.w, vECPos.w)).rgb, 1.0);
+  vec4 colMapTexel = vec4(texture2D(colMap, vec2(vNormal.w, 1.0 - vECPos.w)).rgb, 1.0);
 
   // normal mapping
   vec3 normal = normalize(vNormal.xyz);
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 26f33a64..2b76161f 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -466,6 +466,7 @@ World.prototype.updateObject = function (obj) {
         if (prims.length != materialNodes.length)
                 throw new Error("inconsistent material and primitive counts");
         var nPrims = prims.length;
+        var iPrim = 0;
         var ctrTrNode;
         if (nPrims > 0)
         {
@@ -483,8 +484,12 @@ World.prototype.updateObject = function (obj) {
                 );
                 ctrTrNode.meshes = [];
 
-                ctrTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prims[0]);
                 ctrTrNode.attachMaterial(materialNodes[0]);
+                while ((iPrim < nPrims) && (materialNodes[iPrim] == materialNodes[0]))
+                {
+                        ctrTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prims[iPrim]);
+                        iPrim++;
+                }
         }
         
         // delete all of the child nodes
@@ -505,16 +510,18 @@ World.prototype.updateObject = function (obj) {
         }
         ctrTrNode.children = [];
 
-        for (var i = 1; i < nPrims; i++)
+        while (iPrim < nPrims)
         {
-                // get the next primitive
                 childTrNode = RDGE.createTransformNode("objNode_" + this._nodeCounter++);
                 ctrTrNode.insertAsChild(childTrNode);
+                var matNode = materialNodes[iPrim];
+                childTrNode.attachMaterial(matNode);
 
-                // attach the instanced box goe
-                var prim = prims[i];
-                childTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prim);
-                childTrNode.attachMaterial(materialNodes[i]);
+                while ((iPrim < nPrims) && (materialNodes[iPrim] == matNode))
+                {
+                        childTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prims[iPrim]);
+                        iPrim++;
+                }
         }
 
         // send a notification that the tree has changed
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index 12781ab8..2cd5a21f 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -42,49 +42,49 @@ var vecUtils		= require("js/helper-classes/3D/vec-utils").VecUtils;
 ///////////////////////////////////////////////////////////////////////
 exports.Circle = Object.create(GeomObj, {
 
-    ///////////////////////////////////////////////////////////////////////
-    // Instance variables
-    ///////////////////////////////////////////////////////////////////////
-    _width: { value : 2.0, writable: true },
-    _height: { value : 2.0, writable: true },
-    _xOffset: { value : 0, writable: true },
-    _yOffset: { value : 0, writable: true },
-
-    _radius: { value : 2.0, writable: true },
-    _strokeWidth: { value : 0.25, writable: true },
-    _innerRadius: { value : 0, writable: true },
-    _ovalHeight: { value : 4.0, writable: true },
-    _strokeStyle: { value : "Solid", writable: true },
-    _aspectRatio: { value : 1.0, writable: true },
+        ///////////////////////////////////////////////////////////////////////
+        // Instance variables
+        ///////////////////////////////////////////////////////////////////////
+        _width: { value : 2.0, writable: true },
+        _height: { value : 2.0, writable: true },
+        _xOffset: { value : 0, writable: true },
+        _yOffset: { value : 0, writable: true },
+
+        _radius: { value : 2.0, writable: true },
+        _strokeWidth: { value : 0.25, writable: true },
+        _innerRadius: { value : 0, writable: true },
+        _ovalHeight: { value : 4.0, writable: true },
+        _strokeStyle: { value : "Solid", writable: true },
+        _aspectRatio: { value : 1.0, writable: true },
 
         init: {
-        value: function(world, xOffset, yOffset, width, height, strokeSize, strokeColor, fillColor, innerRadius, strokeMaterial, fillMaterial, strokeStyle) {
-            if(arguments.length > 0) {
-                this._width = width;
-                this._height = height;
-                this._xOffset = xOffset;
-                this._yOffset = yOffset;
-                this._ovalHeight = 2.0 * this._radius;
-
-                this._strokeWidth = strokeSize;
-                this._innerRadius = innerRadius;
-                this._strokeColor = strokeColor;
-                this._fillColor = fillColor;
-
-                this._strokeStyle = strokeStyle;
-
-                this._matrix = Matrix.I(4);
-                //this._matrix[12] = xOffset;
-                //this._matrix[13] = yOffset;
-            }
+                value: function(world, xOffset, yOffset, width, height, strokeSize, strokeColor, fillColor, innerRadius, strokeMaterial, fillMaterial, strokeStyle) {
+                        if(arguments.length > 0) {
+                                this._width = width;
+                                this._height = height;
+                                this._xOffset = xOffset;
+                                this._yOffset = yOffset;
+                                this._ovalHeight = 2.0 * this._radius;
+
+                                this._strokeWidth = strokeSize;
+                                this._innerRadius = innerRadius;
+                                this._strokeColor = strokeColor;
+                                this._fillColor = fillColor;
+
+                                this._strokeStyle = strokeStyle;
+
+                                this._matrix = Matrix.I(4);
+                                //this._matrix[12] = xOffset;
+                                //this._matrix[13] = yOffset;
+                        }
 
-            this.m_world = world;
+                        this.m_world = world;
 
-            if(strokeMaterial) {
-                this._strokeMaterial = strokeMaterial.dup();
-            } else {
-                this._strokeMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ).dup();
-            }
+                        if(strokeMaterial) {
+                                this._strokeMaterial = strokeMaterial.dup();
+                        } else {
+                                this._strokeMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ).dup();
+                        }
 
             if(strokeColor) {
                 if(this._strokeMaterial.hasProperty("color")) {
@@ -94,135 +94,135 @@ exports.Circle = Object.create(GeomObj, {
                 }