19 files changed, 162 insertions, 115 deletions

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 981edbfd..4bc5dfe8 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -22,7 +22,6 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
         this._lightDiff = [0.3, 0.3, 0.3, 1.0];
         
     this._diffuseTexture = "assets/images/metal.png";
-    //this._diffuseTexture = "texture";
     this._specularTexture = "assets/images/silver.png";
         this._normalTexture = "assets/images/normalMap.png";
 
diff --git a/js/lib/rdge/materials/deform-material.js b/js/lib/rdge/materials/deform-material.js
index a7a0c178..c7f9cadc 100644
--- a/js/lib/rdge/materials/deform-material.js
+++ b/js/lib/rdge/materials/deform-material.js
@@ -37,13 +37,16 @@ var DeformMaterial = function DeformMaterial() {
     // Methods
     ///////////////////////////////////////////////////////////////////////
     // duplcate method requirde
-    this.dup = function (world) {
-        // allocate a new uber material
-        var newMat = new DeformMaterial();
-
-        // copy over the current values;
+    this.dup = function (world)
+        {
+        // get the current values;
         var propNames = [], propValues = [], propTypes = [], propLabels = [];
         this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new DeformMaterial();
+
+                // copy over the current values;
         var n = propNames.length;
         for (var i = 0; i < n; i++)
             newMat.setProperty(propNames[i], propValues[i]);
diff --git a/js/lib/rdge/materials/flag-material.js b/js/lib/rdge/materials/flag-material.js
index 8d4d1ee3..312ca1c1 100644
--- a/js/lib/rdge/materials/flag-material.js
+++ b/js/lib/rdge/materials/flag-material.js
@@ -5,6 +5,7 @@
  </copyright> */
 
 
+var Material = require("js/lib/rdge/materials/material").Material;
 var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
 var Texture = require("js/lib/rdge/texture").Texture;
 
@@ -47,19 +48,21 @@ var FlagMaterial = function FlagMaterial() {
     // Methods
     ///////////////////////////////////////////////////////////////////////
         // duplcate method requirde
-        this.dup = function( world ) {
-                // allocate a new uber material
-                var newMat = new FlagMaterial();
+        this.dup = function( world )
+        {
+                // get the current values;
+        var propNames = [], propValues = [], propTypes = [], propLabels = [];
+        this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new uber material
+        var newMat = new FlagMaterial();
 
                 // 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] );
-        }
+        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 )
@@ -68,12 +71,12 @@ var FlagMaterial = function FlagMaterial() {
                 if (world)  this.setWorld( world );
 
                 // set up the shader
-                this._shader = new jshader();
+                this._shader = new RDGE.jshader();
                 this._shader.def = flagMaterialDef;
                 this._shader.init();
 
                 // set up the material node
-                this._materialNode = createMaterialNode("flagMaterial" + "_" + world.generateUniqueNodeID());
+                this._materialNode = RDGE.createMaterialNode("flagMaterial" + "_" + world.generateUniqueNodeID());
                 this._materialNode.setShader(this._shader);
 
                 this._time = 0;
diff --git a/js/lib/rdge/materials/fly-material.js b/js/lib/rdge/materials/fly-material.js
index 712a38ac..ca38cc83 100644
--- a/js/lib/rdge/materials/fly-material.js
+++ b/js/lib/rdge/materials/fly-material.js
@@ -30,18 +30,21 @@ var FlyMaterial = function FlyMaterial() {
     // Methods
     ///////////////////////////////////////////////////////////////////////
         // duplcate method requirde
-        this.dup = function( world ) {
-                // allocate a new uber material
-                var newMat = new FlyMaterial();
+        this.dup = function( world )
+        {
+        // get the current values;
+        var propNames = [], propValues = [], propTypes = [], propLabels = [];
+        this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new FlyMaterial();
 
                 // 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] );
+        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 ) {
diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js
index e35062a0..a06b1771 100644
--- a/js/lib/rdge/materials/julia-material.js
+++ b/js/lib/rdge/materials/julia-material.js
@@ -29,17 +29,19 @@ var JuliaMaterial = function JuliaMaterial() {
     ///////////////////////////////////////////////////////////////////////
         // duplcate method requirde
         this.dup = function( world ) {
-                // allocate a new uber material
-                var newMat = new JuliaMaterial();
+        // get the current values;
+        var propNames = [], propValues = [], propTypes = [], propLabels = [];
+        this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new JuliaMaterial();
 
                 // 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] );
+        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 ) {
diff --git a/js/lib/rdge/materials/keleidoscope-material.js b/js/lib/rdge/materials/keleidoscope-material.js
index db325eaa..e9f1b10e 100644
--- a/js/lib/rdge/materials/keleidoscope-material.js
+++ b/js/lib/rdge/materials/keleidoscope-material.js
@@ -38,17 +38,19 @@ var KeleidoscopeMaterial = function KeleidoscopeMaterial() {
     ///////////////////////////////////////////////////////////////////////
         // duplcate method requirde
         this.dup = function( world ) {
-                // allocate a new uber material
-                var newMat = new KeleidoscopeMaterial();
+        // get the current values;
+        var propNames = [], propValues = [], propTypes = [], propLabels = [];
+        this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new KeleidoscopeMaterial();
 
                 // copy over the current values;