1 files changed, 102 insertions, 28 deletions

diff --git a/js/lib/rdge/materials/twist-vert-material.js b/js/lib/rdge/materials/twist-vert-material.js
index 54e5168f..7d9dd6d6 100644
--- a/js/lib/rdge/materials/twist-vert-material.js
+++ b/js/lib/rdge/materials/twist-vert-material.js
@@ -4,14 +4,17 @@ 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 Texture = require("js/lib/rdge/texture").Texture;
+
 ///////////////////////////////////////////////////////////////////////
 // Class GLMaterial
 //      RDGE representation of a material.
 ///////////////////////////////////////////////////////////////////////
-function TwistVertMaterial() {
+var TwistVertMaterial = function TwistVertMaterial()
+{
     // initialize the inherited members
-    this.inheritedFrom = GLMaterial;
+        this.inheritedFrom = Material;
     this.inheritedFrom();
 
     ///////////////////////////////////////////////////////////////////////
@@ -25,6 +28,9 @@ function TwistVertMaterial() {
     this._tex0 = 'assets/images/rocky-normal.jpg';
     this._tex1 = 'assets/images/metal.png';
 
+        this._glTex0;
+        this._glTex1;
+
     this._angle = 0.0;
     this._deltaTime = 0.01;
 
@@ -35,6 +41,7 @@ function TwistVertMaterial() {
     this.getShaderName = function () { return this._shaderName; };
 
     this.isAnimated = function () { return true; };
+        
     this.hasVertexDeformation = function () { return this._hasVertexDeformation; };
     this._hasVertexDeformation = true;
     this._vertexDeformationTolerance = 0.02; // should be a property
@@ -43,9 +50,24 @@ function TwistVertMaterial() {
     // Methods
     ///////////////////////////////////////////////////////////////////////
     // duplcate method requirde
-    this.dup = function () { return new TwistVertMaterial(); };
+        this.dup = function() {
+        // get the current values;
+        var propNames = [], propValues = [], propTypes = [], propLabels = [];
+        this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new TwistVertMaterial();
 
-    this.init = function (world) {
+                // copy over the current values;
+        var n = propNames.length;
+        for (var i = 0; i < n; i++)
+            newMat.setProperty(propNames[i], propValues[i]);
+
+        return newMat;
+        };
+
+    this.init = function (world)
+        {
         this.setWorld(world);
 
         // set up the shader
@@ -60,6 +82,9 @@ function TwistVertMaterial() {
         this._materialNode = RDGE.createMaterialNode("twistVertMaterial" + "_" + world.generateUniqueNodeID());
         this._materialNode.setShader(this._shader);
 
+                // set up the texture maps
+                this.updateTextures();
+
         // initialize the twist vert properties
         this.updateShaderValues();
     };
@@ -82,9 +107,11 @@ function TwistVertMaterial() {
     this._propValues[this._propNames[5]] = this._tex0.slice();
     this._propValues[this._propNames[6]] = this._tex1.slice();
 
-    this.setProperty = function (prop, value) {
+    this.setProperty = function (prop, value)
+        {
         // make sure we have legitimate input
-        if (this.validateProperty(prop, value)) {
+        if (this.validateProperty(prop, value))
+                {
             switch (prop) {
                 case "color":
                 case "u_tex1":
@@ -103,7 +130,7 @@ function TwistVertMaterial() {
                     'material': this.getShaderName(),
                     'name': this.getName(),
                     'color': this._propValues["color"]
-                };
+                }
 
         return jObj;
     };
@@ -121,56 +148,100 @@ function TwistVertMaterial() {
         }
     };
 
-    this.update = function (time) {
-        if (this._shader && this._shader.twistMe) {
-            var angle = this._angle;
+    this.update = function (time)
+        {
+        if (this._shader && this._shader.twistMe)
+                {
+                        var technique = this._shader.twistMe;
+           
+                    var angle = this._angle;
             angle += this._deltaTime;
-            if (angle > this._propValues["u_twistAmount"]) {
+            if (angle > this._propValues["u_twistAmount"])
+                        {
                 angle = this._propValues["u_twistAmount"];
                 this._deltaTime = -this._deltaTime;
             }
-            else if (angle < 0.0) {
+            else if (angle < 0.0)
+                        {
                 angle = 0;
                 this._deltaTime = -this._deltaTime;
             }
             this._angle = angle;
             this._shader.twistMe["u_twistAmount"].set([angle]);
+
+                        var tex;
+                        if (this._glTex0)
+            {
+                if (this._glTex0.isAnimated())
+                    this._glTex0.render();
+                tex = this._glTex0.getTexture();
+                                if (tex)
+                                        technique.u_tex0.set( tex );
+            }
+                        if (this._glTex1)
+            {
+                if (this._glTex1.isAnimated())
+                    this._glTex1.render();
+                tex = this._glTex1.getTexture();
+                                if (tex)
+                                        technique.u_tex1.set( tex );
+            }
+
         }
     };
 
-    this.updateShaderValues = function () {
-        if (this._shader && this._shader.twistMe) {
+    this.updateShaderValues = function ()
+        {
+        if (this._shader && this._shader.twistMe)
+                {
             var nProps = this._propNames.length;
-            for (var i = 0; i < nProps; i++) {
+            for (var i = 0; i < nProps; i++)
+                        {
                 var propName = this._propNames[i];
                 var propValue = this._propValues[propName];
-                switch (propName) {
+                switch (propName)
+                                {
                     case "u_tex0":
                     case "u_tex1":
-                    case "color": this._shader.twistMe[propName].set(propValue); break;
-                    default: this._shader.twistMe[propName].set([propValue]); break;
+                                                break;
+
+                    case "color":
+                                                this._shader.twistMe[propName].set(propValue);
+                                                break;
+
+                    default:
+                                                this._shader.twistMe[propName].set([propValue]);
+                                                break;
                 }
             }
         }
     };
 
-    this.updateTextures = function () {
+    this.updateTextures = function ()
+        {
         var material = this._materialNode;
-        if (material) {
-            var technique = material.shaderProgram['default'];
+        if (material)
+                {
+            var technique = material.shaderProgram['twistMe'];