From 5a1965bf2ed9a54601ca16fd67555335c510ce08 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 26 Apr 2012 16:40:05 -0700
Subject: Update materials to the new texture model.

Create local world for deleted source canvases
---
 js/lib/rdge/materials/bump-metal-material.js       |  1 -
 js/lib/rdge/materials/deform-material.js           | 13 ++--
 js/lib/rdge/materials/flag-material.js             | 27 +++----
 js/lib/rdge/materials/fly-material.js              | 21 +++---
 js/lib/rdge/materials/julia-material.js            | 18 ++---
 js/lib/rdge/materials/keleidoscope-material.js     | 18 ++---
 js/lib/rdge/materials/linear-gradient-material.js  | 18 ++++-
 js/lib/rdge/materials/mandel-material.js           | 19 ++---
 js/lib/rdge/materials/pulse-material.js            | 19 ++---
 js/lib/rdge/materials/radial-blur-material.js      | 10 +--
 js/lib/rdge/materials/relief-tunnel-material.js    | 13 ++--
 js/lib/rdge/materials/square-tunnel-material.js    | 13 ++--
 js/lib/rdge/materials/star-material.js             | 13 ++--
 js/lib/rdge/materials/tunnel-material.js           | 13 ++--
 js/lib/rdge/materials/twist-material.js            | 13 ++--
 js/lib/rdge/materials/uber-material.js             | 16 +++--
 js/lib/rdge/materials/water-material.js            | 10 +--
 js/lib/rdge/materials/z-invert-material.js         | 13 ++--
 js/lib/rdge/texture.js                             |  9 ++-
 js/mediators/element-mediator.js                   | 26 ++++---
 js/models/materials-model.js                       | 62 ++++++++--------
 js/panels/Materials/materials-data.json            | 84 ++++++++++++++++++++--
 .../materials-popup.reel/materials-popup.js        | 56 ++++++++++-----
 23 files changed, 325 insertions(+), 180 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;
-		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/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js
index 51a7430c..2d8e6ca7 100755
--- a/js/lib/rdge/materials/linear-gradient-material.js
+++ b/js/lib/rdge/materials/linear-gradient-material.js
@@ -200,7 +200,23 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
     // Methods
     ///////////////////////////////////////////////////////////////////////
     // duplcate method requirde
-    this.dup = function () { return new LinearGradientMaterial(); };
+    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 LinearGradientMaterial();
+
+		// 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);
diff --git a/js/lib/rdge/materials/mandel-material.js b/js/lib/rdge/materials/mandel-material.js
index 35ac8ec4..e75d74ba 100644
--- a/js/lib/rdge/materials/mandel-material.js
+++ b/js/lib/rdge/materials/mandel-material.js
@@ -39,18 +39,19 @@ var MandelMaterial = function MandelMaterial() {
     ///////////////////////////////////////////////////////////////////////
 	// duplcate method requirde
 	this.dup = function( world ) {
-		// allocate a new uber material
-		var newMat = new MandelMaterial();
+        // get the current values;
+        var propNames = [], propValues = [], propTypes = [], propLabels = [];
+        this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new MandelMaterial();
 
 		// 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/pulse-material.js b/js/lib/rdge/materials/pulse-material.js
index eedccf71..bb8833b4 100644
--- a/js/lib/rdge/materials/pulse-material.js
+++ b/js/lib/rdge/materials/pulse-material.js
@@ -81,18 +81,19 @@ var PulseMaterial = function PulseMaterial()
 		// save the world
 		if (world)  this.setWorld( world );
 
-		// allocate a new uber material
-		var newMat = new PulseMaterial();
+        // get the current values;
+        var propNames = [], propValues = [], propTypes = [], propLabels = [];
+        this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new PulseMaterial();
 
 		// 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/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index 6e1c024b..61ae0017 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -70,12 +70,14 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // duplicate method required
     this.dup = function () {
-        // allocate a new uber material
-        var newMat = new RadialBlurMaterial();
-
-        // copy over the current values;
+        // get the current values;
         var propNames = [], propValues = [], propTypes = [], propLabels = [];
         this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new RadialBlurMaterial();
+
+		// 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/relief-tunnel-material.js b/js/lib/rdge/materials/relief-tunnel-material.js
index cb433562..4587b3fd 100644
--- a/js/lib/rdge/materials/relief-tunnel-material.js
+++ b/js/lib/rdge/materials/relief-tunnel-material.js
@@ -32,16 +32,17 @@ var ReliefTunnelMaterial = function ReliefTunnelMaterial()
     ///////////////////////////////////////////////////////////////////////
     // duplcate method requirde
     this.dup = function (world) {
-        // allocate a new uber material
-        var newMat = new ReliefTunnelMaterial();
-
-        // copy over the current values;
+        // get the current values;
         var propNames = [], propValues = [], propTypes = [], propLabels = [];
         this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new ReliefTunnelMaterial();
+
+		// copy over the current values;
         var n = propNames.length;
-        for (var i = 0; i < n; i++) {
+        for (var i = 0; i < n; i++)
             newMat.setProperty(propNames[i], propValues[i]);
-        }
 
         return newMat;
     };
diff --git a/js/lib/rdge/materials/square-tunnel-material.js b/js/lib/rdge/materials/square-tunnel-material.js
index f81602f0..78cd45d4 100644
--- a/js/lib/rdge/materials/square-tunnel-material.js
+++ b/js/lib/rdge/materials/square-tunnel-material.js
@@ -31,16 +31,17 @@ var SquareTunnelMaterial = function SquareTunnelMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // duplcate method requirde
     this.dup = function (world) {
-        // allocate a new uber material
-        var newMat = new SquareTunnelMaterial();
-
-        // copy over the current values;
+        // get the current values;
         var propNames = [], propValues = [], propTypes = [], propLabels = [];
         this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new SquareTunnelMaterial();
+
+		// copy over the current values;
         var n = propNames.length;
-        for (var i = 0; i < n; i++) {
+        for (var i = 0; i < n; i++)
             newMat.setProperty(propNames[i], propValues[i]);
-        }
 
         return newMat;
     };
diff --git a/js/lib/rdge/materials/star-material.js b/js/lib/rdge/materials/star-material.js
index c4ff08c8..000d44b0 100644
--- a/js/lib/rdge/materials/star-material.js
+++ b/js/lib/rdge/materials/star-material.js
@@ -31,16 +31,17 @@ var StarMaterial = function StarMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // duplcate method requirde
     this.dup = function () {
-        // allocate a new uber material
-        var newMat = new StarMaterial();
-
-        // copy over the current values;
+        // get the current values;
         var propNames = [], propValues = [], propTypes = [], propLabels = [];
         this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new StarMaterial();
+
+		// copy over the current values;
         var n = propNames.length;
-        for (var i = 0; i < n; i++) {
+        for (var i = 0; i < n; i++)
             newMat.setProperty(propNames[i], propValues[i]);
-        }
 
         return newMat;
     };
diff --git a/js/lib/rdge/materials/tunnel-material.js b/js/lib/rdge/materials/tunnel-material.js
index 25bfe0c4..9e70a6f8 100644
--- a/js/lib/rdge/materials/tunnel-material.js
+++ b/js/lib/rdge/materials/tunnel-material.js
@@ -32,16 +32,17 @@ var TunnelMaterial = function TunnelMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // duplcate method requirde
     this.dup = function (world) {
-        // allocate a new uber material
-        var newMat = new TunnelMaterial();
-
-        // copy over the current values;
+        // get the current values;
         var propNames = [], propValues = [], propTypes = [], propLabels = [];
         this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new TunnelMaterial();
+
+		// copy over the current values;
         var n = propNames.length;
-        for (var i = 0; i < n; i++) {
+        for (var i = 0; i < n; i++)
             newMat.setProperty(propNames[i], propValues[i]);
-        }
 
         return newMat;
     };
diff --git a/js/lib/rdge/materials/twist-material.js b/js/lib/rdge/materials/twist-material.js
index db179289..9e2c124a 100644
--- a/js/lib/rdge/materials/twist-material.js
+++ b/js/lib/rdge/materials/twist-material.js
@@ -33,16 +33,17 @@ var TwistMaterial = function TwistMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // duplcate method requirde
     this.dup = function (world) {
-        // allocate a new uber material
-        var newMat = new TwistMaterial();
-
-        // copy over the current values;
+        // get the current values;
         var propNames = [], propValues = [], propTypes = [], propLabels = [];
         this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new TwistMaterial();
+
+		// copy over the current values;
         var n = propNames.length;
-        for (var i = 0; i < n; i++) {
+        for (var i = 0; i < n; i++)
             newMat.setProperty(propNames[i], propValues[i]);
-        }
 
         return newMat;
     };
diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index a2c782d8..bc2ba340 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -24,8 +24,8 @@ var UberMaterial = function UberMaterial() {
     this._environmentAmount = 0.2; 	// 0 .. 1
 
     // set the default maps
-	//this._diffuseMapOb = { 'texture' : 'assets/images/rocky-diffuse.jpg', 'wrap' : 'REPEAT' };
-	this._diffuseMapOb = { 'texture' : 'texture', 'wrap' : 'REPEAT' };
+	this._diffuseMapOb = { 'texture' : 'assets/images/rocky-diffuse.jpg', 'wrap' : 'REPEAT' };
+	//this._diffuseMapOb = { 'texture' : 'texture', 'wrap' : 'REPEAT' };
     this._normalMapOb = { 'texture': 'assets/images/rocky-normal.jpg', 'wrap': 'REPEAT' };
     this._specularMapOb = { 'texture': 'assets/images/rocky-spec.jpg', 'wrap': 'REPEAT' };
     this._environmentMapOb = { 'texture': 'assets/images/silver.png', 'wrap': 'CLAMP', 'envReflection': this._environmentAmount };
@@ -366,9 +366,13 @@ var UberMaterial = function UberMaterial() {
 
     // duplcate method requirde
     this.dup = function () {
-        // allocate a new uber material
-        var newMat = new UberMaterial();
 
+        // get the current values;
+        var propNames = [], propValues = [], propTypes = [], propLabels = [];
+        this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new UberMaterial();
         newMat._useDiffuseMap = this._useDiffuseMap;
         newMat._useEnvironmentMap = this._useEnvironmentMap;
         newMat._useLights = this._useLights;
@@ -376,9 +380,7 @@ var UberMaterial = function UberMaterial() {
         newMat._useSpecularMap = this._useSpecularMap;
         newMat.rebuildShader();
 
-        // copy over the current values;
-        var propNames = [], propValues = [], propTypes = [], propLabels = [];
-        this.getAllProperties(propNames, propValues, propTypes, propLabels);
+		// 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/water-material.js b/js/lib/rdge/materials/water-material.js
index 2c3669c0..18a73915 100644
--- a/js/lib/rdge/materials/water-material.js
+++ b/js/lib/rdge/materials/water-material.js
@@ -37,12 +37,14 @@ var WaterMaterial = function WaterMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // duplcate method requirde
     this.dup = function (world) {
-        // allocate a new uber material
-        var newMat = new WaterMaterial();
-
-        // copy over the current values;
+        // get the current values;
         var propNames = [], propValues = [], propTypes = [], propLabels = [];
         this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new WaterMaterial();
+
+		// 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/z-invert-material.js b/js/lib/rdge/materials/z-invert-material.js
index c35b7d7f..e1149f8b 100644
--- a/js/lib/rdge/materials/z-invert-material.js
+++ b/js/lib/rdge/materials/z-invert-material.js
@@ -32,16 +32,17 @@ var ZInvertMaterial = function ZInvertMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // duplicate method required
     this.dup = function (world) {
-        // allocate a new uber material
-        var newMat = new ZInvertMaterial();
-
-        // copy over the current values;
+        // get the current values;
         var propNames = [], propValues = [], propTypes = [], propLabels = [];
         this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new ZInvertMaterial();
+
+		// copy over the current values;
         var n = propNames.length;
-        for (var i = 0; i < n; i++) {
+        for (var i = 0; i < n; i++)
             newMat.setProperty(propNames[i], propValues[i]);
-        }
 
         return newMat;
     };
diff --git a/js/lib/rdge/texture.js b/js/lib/rdge/texture.js
index bcbcb4bc..0a7070d3 100644
--- a/js/lib/rdge/texture.js
+++ b/js/lib/rdge/texture.js
@@ -142,18 +142,23 @@ function Texture( dstWorld, texMapName,  wrap, mips )
 		{
 			// get the data from the old world
 			var jStr = srcWorld.exportJSON();
+			var index = jStr.indexOf( ';' );
+			if ((jStr[0] === 'v') && (index < 24))
+				jStr = jStr.substr( index+1 );
 			var jObj = JSON.parse( jStr );
 			var oldCanvas = srcWorld.getCanvas();
 
 			// create a new canvas
-			this._srcCanvas = NJUtils.makeNJElement("canvas", canvasID, "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
+			var NJUtils = require("js/lib/NJUtils").NJUtils;
+			this._srcCanvas = NJUtils.makeNJElement("canvas", "texture_internal_canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
 			srcCanvas = this._srcCanvas;
 			srcCanvas.width  = oldCanvas.width;
 			srcCanvas.height = oldCanvas.height;
 
 			// rebuild the world
+			var GLWorld = require("js/lib/drawing/world").World;
 			this._srcWorld = new GLWorld( this._srcCanvas, true, true );
-			this._srcWorld.importSJON( jObj );
+			this._srcWorld.importJSON( jObj );
 
 			this._isLocal = true;
 		}
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 919aaec1..2a85aea8 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -12,7 +12,13 @@ var ElementController = require("js/controllers/elements/element-controller").El
     NJUtils = require("js/lib/NJUtils").NJUtils;
 
 exports.ElementMediator = Montage.create(Component, {
-
+	
+    _NJUtils: {
+    	get: function() {
+			if (!NJUtils)  NJUtils = require("js/lib/NJUtils").NJUtils;
+			return NJUtils;
+		}
+	},
 
     addDelegate: {
         enumerable: false,
@@ -104,7 +110,7 @@ exports.ElementMediator = Montage.create(Component, {
         value: function(el, prop, valueMutator) {
             if(!el.elementModel) {
                 console.log("Element has no Model -> One should have been created");
-                NJUtils.makeElementModel(el, "Div", "block");
+                this._NJUtils.makeElementModel(el, "Div", "block");
             }
 
             if(valueMutator && typeof valueMutator === "function") {
@@ -119,7 +125,7 @@ exports.ElementMediator = Montage.create(Component, {
         value: function(el, prop) {
             if(!el.elementModel) {
                 console.log("Element has no Model -> One should have been created");
-                NJUtils.makeElementModel(el, "Canvas", "block", true);
+                this._NJUtils.makeElementModel(el, "Canvas", "block", true);
             }
 
             return el.elementModel.controller["getShapeProperty"](el, prop);
@@ -130,7 +136,7 @@ exports.ElementMediator = Montage.create(Component, {
         value: function(el, prop, value) {
             if(!el.elementModel) {
                 console.log("Element has no Model -> One should have been created");
-                NJUtils.makeElementModel(el, "Canvas", "block", true);
+                this._NJUtils.makeElementModel(el, "Canvas", "block", true);
             }
 
             return el.elementModel.controller["setShapeProperty"](el, prop, value);
@@ -298,7 +304,7 @@ exports.ElementMediator = Montage.create(Component, {
     getColor: {
         value: function(el, isFill, borderSide) {
             if(!el.elementModel) {
-                NJUtils.makeModelFromElement(el);
+                this._NJUtils.makeModelFromElement(el);
             }
             return el.elementModel.controller["getColor"](el, isFill, borderSide);
         }
@@ -375,7 +381,7 @@ exports.ElementMediator = Montage.create(Component, {
     getStroke: {
         value: function(el) {
             if(!el.elementModel) {
-                NJUtils.makeElementModel(el, "Div", "block");
+                this._NJUtils.makeElementModel(el, "Div", "block");
             }
             return el.elementModel.controller["getStroke"](el);
         }
@@ -453,7 +459,7 @@ exports.ElementMediator = Montage.create(Component, {
     get3DProperty: {
         value: function(el, prop) {
             if(!el.elementModel) {
-                NJUtils.makeModelFromElement(el);
+                this._NJUtils.makeModelFromElement(el);
             }
             return el.elementModel.controller["get3DProperty"](el, prop);
         }
@@ -462,7 +468,7 @@ exports.ElementMediator = Montage.create(Component, {
     get3DProperties: {
         value: function(el) {
             if(!el.elementModel) {
-                NJUtils.makeModelFromElement(el);
+                this._NJUtils.makeModelFromElement(el);
             }
 //            var mat = this.getMatrix(el);
 //            var dist = this.getPerspectiveDist(el);
@@ -475,7 +481,7 @@ exports.ElementMediator = Montage.create(Component, {
     getMatrix: {
         value: function(el) {
             if(!el.elementModel) {
-                NJUtils.makeModelFromElement(el);
+                this._NJUtils.makeModelFromElement(el);
             }
             return el.elementModel.controller["getMatrix"](el);
         }
@@ -484,7 +490,7 @@ exports.ElementMediator = Montage.create(Component, {
     getPerspectiveDist: {
         value: function(el) {
             if(!el.elementModel) {
-                NJUtils.makeModelFromElement(el);
+                this._NJUtils.makeModelFromElement(el);
             }
             return el.elementModel.controller["getPerspectiveDist"](el);
         }
diff --git a/js/models/materials-model.js b/js/models/materials-model.js
index a083dc54..20ef317a 100755
--- a/js/models/materials-model.js
+++ b/js/models/materials-model.js
@@ -45,37 +45,37 @@ exports.MaterialsModel = Montage.create(Component, {
         value: false
     },
 
-    deserializedFromTemplate: {
-        value: function() {
-            // Load all the materials
-            this.addMaterial(new FlatMaterial());
-            this.addMaterial(new LinearGradientMaterial());
-            this.addMaterial(new RadialGradientMaterial());
-            this.addMaterial(new BumpMetalMaterial());
-            this.addMaterial(new UberMaterial());
-            this.addMaterial(new CloudMaterial());
-            this.addMaterial(new RadialBlurMaterial());
-            this.addMaterial(new RaidersMaterial());
-            this.addMaterial(new PlasmaMaterial());
-            this.addMaterial(new PulseMaterial());
-            this.addMaterial(new TunnelMaterial());
-            this.addMaterial(new ReliefTunnelMaterial());
-            this.addMaterial(new FlagMaterial());
-            this.addMaterial(new SquareTunnelMaterial());
-            this.addMaterial(new FlyMaterial());
-            this.addMaterial(new WaterMaterial());
-            this.addMaterial(new ParisMaterial());
-            this.addMaterial(new ZInvertMaterial());
-            this.addMaterial(new DeformMaterial());
-            this.addMaterial(new StarMaterial());
-            this.addMaterial(new TwistMaterial());
-            this.addMaterial(new TwistVertMaterial());
-            this.addMaterial(new TaperMaterial());
-            this.addMaterial(new JuliaMaterial());
-            this.addMaterial(new KeleidoscopeMaterial());
-            this.addMaterial(new MandelMaterial());
-        }
-    },
+	deserializedFromTemplate: {
+		value: function() {
+			// Load all the materials
+			this.addMaterial(new BumpMetalMaterial());
+			this.addMaterial(new CloudMaterial());
+			this.addMaterial(new DeformMaterial());
+			this.addMaterial(new FlagMaterial());
+			this.addMaterial(new FlatMaterial());
+			this.addMaterial(new FlyMaterial());
+			this.addMaterial(new JuliaMaterial());
+			this.addMaterial(new KeleidoscopeMaterial());
+			this.addMaterial(new LinearGradientMaterial());
+			this.addMaterial(new MandelMaterial());
+			this.addMaterial(new PlasmaMaterial());
+			this.addMaterial(new PulseMaterial());
+			this.addMaterial(new ParisMaterial());
+			this.addMaterial(new RadialGradientMaterial());
+			this.addMaterial(new RadialBlurMaterial());
+			this.addMaterial(new RaidersMaterial());
+			this.addMaterial(new ReliefTunnelMaterial());
+			this.addMaterial(new SquareTunnelMaterial());
+			this.addMaterial(new StarMaterial());
+			this.addMaterial(new TaperMaterial());
+			this.addMaterial(new TunnelMaterial());
+			this.addMaterial(new TwistMaterial());
+			this.addMaterial(new TwistVertMaterial());
+			this.addMaterial(new WaterMaterial());
+			this.addMaterial(new ZInvertMaterial());
+			this.addMaterial(new UberMaterial());
+		}
+	},
 
     _materials : {
         value: AppModel.materials
diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json
index f06ab6c8..5e86793e 100644
--- a/js/panels/Materials/materials-data.json
+++ b/js/panels/Materials/materials-data.json
@@ -4,25 +4,97 @@
         {
             "label": "Ninja Materials",
             "children": [
-                {
-                    "label": "Uber",
-                    "id" : "UberMaterial"
-                },
                 {
                     "label": "Bump Metal",
                     "id" : "BumpMetalMaterial"
                 },
+                {
+                    "label": "Deform",
+                    "id" : "DeformMaterial"
+                },
+                {
+                    "label": "Flat",
+                    "id" : "FlatMaterial"
+                },
+                {
+                    "label": "Flag",
+                    "id" : "FlagMaterial"
+                },
+                {
+                    "label": "Fly",
+                    "id" : "FlyMaterial"
+                },
+                {
+                    "label": "Julia",
+                    "id" : "JuliaMaterial"
+                },
+                {
+                    "label": "Keleidoscope",
+                    "id" : "KeleidoscopeMaterial"
+                },
                 {
                     "label": "Linear Gradient",
                     "id" : "LinearGradientMaterial"
                 },
+                {
+                    "label": "Mandel",
+                    "id" : "MandelMaterial"
+                },
+                {
+                    "label": "Plasma",
+                    "id" : "PlasmaMaterial"
+                },
+                {
+                    "label": "Pulse",
+                    "id" : "PulseMaterial"
+                },
+                {
+                    "label": "Radial Blur",
+                    "id" : "RadialBlurMaterial"
+                },
                 {
                     "label": "Radial Gradient",
                     "id" : "RadialGradientMaterial"
                 },
                 {
-                    "label": "Flat",
-                    "id" : "FlatMaterial"
+                    "label": "Relief Tunnel",
+                    "id" : "ReliefTunnelMaterial"
+                },
+                {
+                    "label": "Square Tunnel",
+                    "id" : "SquareTunnelMaterial"
+                },
+                {
+                    "label": "Star",
+                    "id" : "StarMaterial"
+                },
+                {
+                    "label": "Taper",
+                    "id" : "TaperMaterial"
+                },
+                {
+                    "label": "Tunnel",
+                    "id" : "TunnelMaterial"
+                },
+                {
+                    "label": "Twist",
+                    "id" : "TwistMaterial"
+                },
+                {
+                    "label": "Twist Vertex",
+                    "id" : "TwistVertMaterial"
+                },
+                {
+                    "label": "Uber",
+                    "id" : "UberMaterial"
+                },
+                {
+                    "label": "Water",
+                    "id" : "WaterMaterial"
+                },
+                {
+                    "label": "Z-Invert",
+                    "id" : "ZInvertMaterial"
                 }
             ]
         },
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index bd10f7a5..9220659e 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -164,8 +164,10 @@ exports.MaterialsPopup = Montage.create(Component, {
 						var index = value.lastIndexOf( "/" );
 						if (index < 0)  index = value.lastIndexOf( "\\" );
 						if (index >= 0)
+						{
 							value = value.substr( index+1 );
-						value = "assets\\images\\" + value;
+							value = "assets\\images\\" + value;
+						}
 						rtnValue = value.slice(0);
 					}
 					break;
@@ -214,30 +216,48 @@ exports.MaterialsPopup = Montage.create(Component, {
 		enumerable: true,
 		value: function(materialID)
 		{
-            //TODO - Hack to force repetition to draw. Setting .length = 0 did not work.
-            this.materialsData = [];
-
-            this._materialName = materialID;
-            if(
-					(materialID ===  "UberMaterial")				||
-					(materialID ===  "FlatMaterial")				||
-					(materialID ===  "BumpMetalMaterial")			||
-					(materialID ===  "LinearGradientMaterial")		||
-					(materialID ===  "RadialGradientMaterial")
+			//TODO - Hack to force repetition to draw. Setting .length = 0 did not work.
+			this.materialsData = [];
+
+			this._materialName = materialID;
+			if(
+					(materialID ===  "BumpMetalMaterial")		||
+					(materialID ===  "DeformMaterial")			||
+					(materialID ===  "FlatMaterial")			||
+					(materialID ===  "FlagMaterial")			||
+					(materialID ===  "FlyMaterial")				||
+					(materialID ===  "JuliaMaterial")			||
+					(materialID ===  "KeleidoscopeMaterial")	||
+					(materialID ===  "LinearGradientMaterial")	||
+					(materialID ===  "MandelMaterial")			||
+					(materialID ===  "PlasmaMaterial")			||
+					(materialID ===  "PulseMaterial")			||
+					(materialID ===  "RadialBlurMaterial")		||
+					(materialID ===  "RadialGradientMaterial")	||
+					(materialID ===  "ReliefTunnelMaterial")	||
+					(materialID ===  "SquareTunnelMaterial")	||
+					(materialID ===  "StarMaterial")			||
+					(materialID ===  "TaperMaterial")			||
+					(materialID ===  "TunnelMaterial")			||
+					(materialID ===  "TwistMaterial")			||
+					(materialID ===  "TwistVertMaterial")		||
+					(materialID ===  "UberMaterial")			||
+					(materialID ===  "WaterMaterial")			||
+					(materialID ===  "ZInvertMaterial")
 				)
 			{
 				var material = MaterialsModel.getMaterial( materialID );
 				if (material)
 				{
 					this._material = material;
-                    this.materialsData = this.getMaterialData( material );
+					this.materialsData = this.getMaterialData( material );
 				}
-            }
-            else
-            {
-                this.materialsData = this[materialID];
-            }
-            this.needsDraw = true;
+			}
+			else
+			{
+				this.materialsData = this[materialID];
+			}
+			this.needsDraw = true;
 		}
 	},
 
-- 
cgit v1.2.3