material cleanup and rearchitecture

19 files changed, 484 insertions, 397 deletions

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index ef1d01a9..2f728c06 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -87,6 +87,10 @@ NinjaCvsRt.CanvasDataManager = Object.create(Object.prototype, {
                                                         var glRt = Object.create(NinjaCvsRt.GLRuntime, {});
                                                         glRt.renderWorld(canvas, jObj, this._assetPath);
                                                 }
+                                                else
+                                                {
+                                                        console.log( "***** COULD NOT FIND CANVAS WITH ID " + id + " *****" );
+                                                }
                                         }
                                 }
                         }
@@ -1491,6 +1495,79 @@ NinjaCvsRt.RuntimeTwistVertMaterial = Object.create(NinjaCvsRt.RuntimeMaterial,
         }
 });
 
+//////////////////////////////////////////////////////
+
+NinjaCvsRt.RuntimeTaperMaterial = Object.create(NinjaCvsRt.RuntimeMaterial, {
+        _name: { value: "TaperMaterial", writable: true },
+        _shaderName: { value: "taper", writable: true },
+
+        _dTime: { value: 0.01, writable: true },
+        _twistAmount: { value: 0.0, writable: true },
+        _angle: { value: 0.0, writable: true },
+
+
+        isAnimated: { value: function() { return true; }},
+
+        importJSON: {
+                value: function(jObj) {
+                        this._tex0 = jObj.tex0;
+                        this._tex1 = jObj.tex1;
+
+                        this._speed = jObj.speed;
+
+                        this._limit1 = jObj.limit1;
+                        this._limit2 = jObj.limit2;
+                        this._twistAmount = jObj.angle;
+           }
+        },
+
+        init: {
+                value: function(world) {
+                        var material = this._materialNode;
+                        if (material)
+                        {
+                                var technique = material.shaderProgram["colorMe"];
+                                var renderer = RDGE.globals.engine.getContext().renderer;
+                                if (renderer && technique)
+                                {
+                                        var wrap = 'REPEAT',  mips = true;
+                                        var tex = renderer.getTextureByName(this._tex0, wrap, mips );
+                                        if (tex)  technique.u_tex0.set( tex );
+                                        tex = renderer.getTextureByName(this._tex1, wrap, mips );
+                                        if (tex)  technique.u_tex1.set( tex );
+
+                                        technique.u_twistAmount.set( [this._angle] );
+                                        technique.u_limit1.set( [this._limit1] );
+                                        technique.u_limit2.set( [this._limit2] );
+                                }
+                        }
+           }
+        },
+
+        // several materials inherit from pulse.
+        // they may share this update method
+        update: {
+                value: function(time) {
+                   
+                        var angle = this._angle;
+                        angle += this._dTime * this._speed;
+                        if (angle > this._twistAmount)
+                        {
+                                angle = this._twistAmount;
+                                this._dTime = -this._dTime;
+                        }
+                        else if (angle < 0.0)
+                        {
+                                angle = 0;
+                                this._dTime = -this._dTime;
+                        }
+                        this._angle = angle;
+                        this._shader.twistMe["u_twistAmount"].set([angle]);
+           }
+        }
+});
+
+
 NinjaCvsRt.RuntimePulseMaterial = Object.create(NinjaCvsRt.RuntimeMaterial, {
         _name: { value: "PulseMaterial", writable: true },
         _shaderName: { value: "pulse", writable: true },
@@ -1501,7 +1578,7 @@ NinjaCvsRt.RuntimePulseMaterial = Object.create(NinjaCvsRt.RuntimeMaterial, {
 
         importJSON: {
                 value: function(jObj) {
-                        this._texMap = jObj.texture;
+                        this._texMap = jObj.u_tex0;
                         if (jObj.dTime)  this._dTime = jObj.dTime;
                 }
         },
diff --git a/assets/shaders/Taper.vert.glsl b/assets/shaders/Taper.vert.glsl
index 30b73456..eb562c2f 100644
--- a/assets/shaders/Taper.vert.glsl
+++ b/assets/shaders/Taper.vert.glsl
@@ -24,8 +24,6 @@ uniform float u_minVal;
 uniform float u_maxVal;
 uniform float u_center;
 
-uniform vec4 color;
-
 
 // matrix uniforms
 uniform mat4 u_mvMatrix;
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index 5c1eb875..5038bd21 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
 {
         "libraries": [
                 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.10.0.0"},
-                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.7.0"}
+                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.8.2"}
         ]
 }
\ No newline at end of file
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 228c0d94..8068284e 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -484,11 +484,11 @@ World.prototype.updateObject = function (obj) {
         for (var i = 1; i < nPrims; i++)
         {
                 // get the next primitive
-                var prim = prims[i];
                 childTrNode = RDGE.createTransformNode("objNode_" + this._nodeCounter++);
                 ctrTrNode.insertAsChild(childTrNode);
 
                 // attach the instanced box goe
+                var prim = prims[i];
                 childTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prim);
                 childTrNode.attachMaterial(materialNodes[i]);
         }
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index b2709ce4..6627b4b7 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -57,16 +57,18 @@ exports.Circle = Object.create(GeomObj, {
             this.m_world = world;
 
             if(strokeMaterial) {
-                this._strokeMaterial = strokeMaterial;
+                this._strokeMaterial = strokeMaterial.dup();
             } else {
-                this._strokeMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() );
+                this._strokeMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ).dup();
             }
+                        if (strokeColor && this._strokeMaterial.hasProperty( "color" ))  this._strokeMaterial.setProperty( "color",  this._strokeColor );
 
             if(fillMaterial) {
-                this._fillMaterial = fillMaterial;
+                this._fillMaterial = fillMaterial.dup();
             } else {
-                this._fillMaterial = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
+                this._fillMaterial = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() ).dup();
             }
+                        if (fillColor && this._fillMaterial.hasProperty( "color" ))  this._fillMaterial.setProperty( "color",  this._fillColor );
         }
     },
 
@@ -702,19 +704,23 @@ exports.Circle = Object.create(GeomObj, {
             var strokeMaterialName      = jObj.strokeMat;
             var fillMaterialName        = jObj.fillMat;
 
-            var strokeMat = MaterialsModel.getMaterial( strokeMaterialName );
+            var strokeMat = MaterialsModel.getMaterial( strokeMaterialName ).dup();
             if (!strokeMat) {
                 console.log( "object material not found in library: " + strokeMaterialName );
-                strokeMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
+                strokeMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() ).dup();
             }
             this._strokeMaterial = strokeMat;
+                        if (this._strokeMaterial.hasProperty( 'color' ))
+                                this._strokeMaterial.setProperty( 'color', this._strokeColor );
 
-            var fillMat = MaterialsModel.getMaterial( fillMaterialName );
+            var fillMat = MaterialsModel.getMaterial( fillMaterialName ).dup();
             if (!fillMat) {