6 files changed, 187 insertions, 198 deletions

diff --git a/assets/shaders/Cloud.frag.glsl b/assets/shaders/Cloud.frag.glsl
index 2447fd79..cd70d1a0 100644
--- a/assets/shaders/Cloud.frag.glsl
+++ b/assets/shaders/Cloud.frag.glsl
@@ -18,8 +18,6 @@ varying vec2	v_texCoord0;
 void main()
 {
         vec4 c = texture2D(u_tex0, v_texCoord0);
-        //c.a *= u_surfaceAlpha;
-        //if ((c.r == 0.0) && (c.b == 0.0) && (c.g == 0.0) && (c.a == 1.0))  c = vec4( 0.0, 0.0, 1.0, 1.0 );
         gl_FragColor = c;
 }    
   
\ No newline at end of file
diff --git a/assets/shaders/TwistVert.frag.glsl b/assets/shaders/TwistVert.frag.glsl
index f8490615..01c32c42 100644
--- a/assets/shaders/TwistVert.frag.glsl
+++ b/assets/shaders/TwistVert.frag.glsl
@@ -28,5 +28,4 @@ void main()
                 col = texture2D(u_tex1, v_texcoord).xyz;
 
     gl_FragColor = vec4(col, 1.0);
-    //gl_FragColor = v_color;
 }
diff --git a/assets/shaders/TwistVert.vert.glsl b/assets/shaders/TwistVert.vert.glsl
index 29cb30ea..9734063d 100644
--- a/assets/shaders/TwistVert.vert.glsl
+++ b/assets/shaders/TwistVert.vert.glsl
@@ -19,7 +19,7 @@ attribute vec2 texcoord;
 uniform float u_limit1;
 uniform float u_limit2;
 uniform float u_twistAmount;
-uniform float u_center;
+//uniform float u_center;
 
 // texture sampler uniforms
 uniform sampler2D u_tex0;
@@ -63,17 +63,14 @@ void main(void)
         vec2 uv = texcoord;
         v_texcoord = texcoord;
 
-        //v_color = vec4(texcoord.x, texcoord.y, 0, 1);
-
         v_zNormal = 1.0;
         if (uv.x < u_limit2)
         {
                 float angle = GetAngle( uv.x );
                 float cs = cos(angle),  sn = sin(angle);
 
-                pos.y -= u_center;
                 vec3 ctrPt = pos;
-                float y = pos.y*cs - pos.z*sn + u_center;
+                float y = pos.y*cs - pos.z*sn;  // + u_center;
                 pos.z   = pos.y*sn + pos.z*cs;
                 pos.y = y;
 
@@ -85,11 +82,7 @@ void main(void)
                 cs = cos(angle); sn = sin(angle);
                 rotMat = mat3( vec3( 1.0,  0.0,  0.0 ),  vec3( 0.0,   cs,   sn ),  vec3( 0.0,  -sn,   cs ) );
                 pt2 = rotMat * pt2;
-                pt0.y += u_center;  pt1.y += u_center;  pt2.y += u_center;
-                //vec4 nrm = u_projMatrix * u_mvMatrix * vec4( cross(pt1-pt0, pt2-pt0), 1.0 );
                 vec4 nrm = vec4( cross(pt1-pt0, pt2-pt0), 1.0 );
-                
-                //v_zNormal   = normal.y*sn + normal.z*cs;
                 v_zNormal   = -nrm.z;
         }
 
diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index 9f0ae6f1..b9de9988 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -192,6 +192,7 @@ var Material = function GLMaterial( world ) {
                                                         rtnVal = ((valType == "object") && (value.length >= 3));
                                                         break;
 
+                                                case "angle":
                                                 case "float":
                                                         rtnVal = (valType == "number");
                                                         break;
diff --git a/js/lib/rdge/materials/twist-vert-material.js b/js/lib/rdge/materials/twist-vert-material.js
index 7d9dd6d6..4d5ab88d 100644
--- a/js/lib/rdge/materials/twist-vert-material.js
+++ b/js/lib/rdge/materials/twist-vert-material.js
@@ -13,235 +13,227 @@ var Texture = require("js/lib/rdge/texture").Texture;
 ///////////////////////////////////////////////////////////////////////
 var TwistVertMaterial = function TwistVertMaterial()
 {
-    // initialize the inherited members
+        // initialize the inherited members
         this.inheritedFrom = Material;
-    this.inheritedFrom();
+        this.inheritedFrom();
 
-    ///////////////////////////////////////////////////////////////////////
-    // Instance variables
-    ///////////////////////////////////////////////////////////////////////
-    this._name = "TwistVertMaterial";
-    this._shaderName = "twistVert";
+        ///////////////////////////////////////////////////////////////////////
+        // Instance variables
+        ///////////////////////////////////////////////////////////////////////
+        this._name = "TwistVertMaterial";
+        this._shaderName = "twistVert";
 
-    this._color = [1, 0, 0, 1];
-
-    this._tex0 = 'assets/images/rocky-normal.jpg';
-    this._tex1 = 'assets/images/metal.png';
+        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;
+        this._angle = 0.0;
+        this._deltaTime = 0.01;
+        this._speed = 1.0;
 
-    ///////////////////////////////////////////////////////////////////////
-    // Property Accessors
-    ///////////////////////////////////////////////////////////////////////
-    this.getColor = function () { return this._color; };
-    this.getShaderName = function () { return this._shaderName; };
+        ///////////////////////////////////////////////////////////////////////
+        // Property Accessors
+        ///////////////////////////////////////////////////////////////////////
+        this.getShaderName = function () { return this._shaderName; };
 
-    this.isAnimated = function () { return true; };
+        this.isAnimated = function () { return true; };
         
-    this.hasVertexDeformation = function () { return this._hasVertexDeformation; };
-    this._hasVertexDeformation = true;
-    this._vertexDeformationTolerance = 0.02; // should be a property
-
-    ///////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////
-    // duplcate method requirde
+        this.hasVertexDeformation = function () { return this._hasVertexDeformation; };
+        this._hasVertexDeformation = true;
+        this._vertexDeformationTolerance = 0.02; // should be a property
+
+        ///////////////////////////////////////////////////////////////////////
+        // Methods
+        ///////////////////////////////////////////////////////////////////////
+        // duplcate method requirde
         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();
+                // get the current values;
+                var propNames = [], propValues = [], propTypes = [], propLabels = [];
+                this.getAllProperties(propNames, propValues, propTypes, propLabels);
+                
+                // allocate a new material
+                var newMat = new TwistVertMaterial();
 
                 // copy over the current values;
-        var n = propNames.length;
-        for (var i = 0; i < n; i++)
-            newMat.setProperty(propNames[i], propValues[i]);
+                var n = propNames.length;
+                for (var i = 0; i < n; i++)
+                        newMat.setProperty(propNames[i], propValues[i]);
 
-        return newMat;
+                return newMat;
         };
 
-    this.init = function (world)
+        this.init = function (world)
         {
-        this.setWorld(world);
-
-        // set up the shader
-        this._shader = new RDGE.jshader();
-        this._shader.def = twistVertShaderDef;
-        this._shader.init();
+                this.setWorld(world);
 
-        // set the defaults
-        this._shader.twistMe.color.set(this.getColor());
+                // set up the shader
+                this._shader = new RDGE.jshader();
+                this._shader.def = twistVertShaderDef;
+                this._shader.init();
 
-        // set up the material node
-        this._materialNode = RDGE.createMaterialNode("twistVertMaterial" + "_" + world.generateUniqueNodeID());
-        this._materialNode.setShader(this._shader);
+                // set up the material node
+                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();
-    };
-
-
-    ///////////////////////////////////////////////////////////////////////
-    // Material Property Accessors
+                // initialize the twist vert properties
+                this.updateShaderValues();
+        };
+
+
+        ///////////////////////////////////////////////////////////////////////
+        // Material Property Accessors