22 files changed, 118 insertions, 102 deletions

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 2ef83227..d764de66 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -107,16 +107,18 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
         this.init = function( world )
         {
                 // save the world
-                if (world)  this.setWorld( world );
+                if (world) {
+                     this.setWorld( world );
+                }
 
                 // set up the shader
-                this._shader = new jshader();
+                this._shader = new RDGE.jshader();
                 this._shader.def = bumpMetalMaterialDef;
                 this._shader.init();
                 this._shader['default'].u_light0Diff.set( this.getLightDiff() );
 
                 // set up the material node
-                this._materialNode = createMaterialNode( this.getShaderName() + "_" + world.generateUniqueNodeID() );
+                this._materialNode = RDGE.createMaterialNode( this.getShaderName() + "_" + world.generateUniqueNodeID() );
                 this._materialNode.setShader(this._shader);
 
                 // set some image maps
@@ -131,7 +133,7 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
                 if (material)
                 {
                         var technique = material.shaderProgram['default'];
-                        var renderer = g_Engine.getContext().renderer;
+                        var renderer = RDGE.globals.engine.getContext().renderer;
                         if (renderer && technique)
                         {
                                 var texMapName = this._propValues[this._propNames[index]];
@@ -205,7 +207,7 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
                 exportStr += "lightDiff: "                      + this.getLightDiff()           + "\n";
                 exportStr += "diffuseTexture: "         + this.getDiffuseTexture()      + "\n";
                 exportStr += "specularTexture: "        + this.getSpecularTexture()     + "\n";
-                exportStr += "normalMap: "                      + this.getNormalTexture()       + "\n";
+                exportStr += "normalMap: "              + this.getNormalTexture()       + "\n";
 
                 // every material needs to terminate like this
                 exportStr += "endMaterial\n";
diff --git a/js/lib/rdge/materials/deform-material.js b/js/lib/rdge/materials/deform-material.js
index dfd89d12..8746bb47 100644
--- a/js/lib/rdge/materials/deform-material.js
+++ b/js/lib/rdge/materials/deform-material.js
@@ -55,12 +55,12 @@ var DeformMaterial = function DeformMaterial() {
                 if (world)  this.setWorld( world );
 
                 // set up the shader
-                this._shader = new jshader();
+                this._shader = new RDGE.jshader();
                 this._shader.def = deformMaterialDef;
                 this._shader.init();
 
                 // set up the material node
-                this._materialNode = createMaterialNode("deformMaterial" + "_" + world.generateUniqueNodeID());
+                this._materialNode = RDGE.createMaterialNode("deformMaterial" + "_" + world.generateUniqueNodeID());
                 this._materialNode.setShader(this._shader);
 
                 this._time = 0;
diff --git a/js/lib/rdge/materials/flat-material.js b/js/lib/rdge/materials/flat-material.js
index 5030cc88..e1363c06 100755
--- a/js/lib/rdge/materials/flat-material.js
+++ b/js/lib/rdge/materials/flat-material.js
@@ -43,17 +43,17 @@ var FlatMaterial = function FlatMaterial() {
                 {
                         this.setWorld( world );
 
-                        // set up the shader
-                        this._shader = new jshader();
-                        this._shader.def = flatShaderDef;
-                        this._shader.init();
+                // set up the shader
+            this._shader = new RDGE.jshader();
+                this._shader.def = flatShaderDef;
+                this._shader.init();
 
-                        // set the defaults
-                        this._shader.colorMe.color.set( this.getColor() );
+        // set the defaults
+                this._shader.colorMe.color.set( this.getColor() );
 
-                        // set up the material node
-                        this._materialNode = createMaterialNode("flatMaterial_" + world.generateUniqueNodeID() );
-                        this._materialNode.setShader(this._shader);
+                // set up the material node
+                this._materialNode = RDGE.createMaterialNode("flatMaterial_" + world.generateUniqueNodeID() );
+                this._materialNode.setShader(this._shader);
                 }
                 else
                         throw new Error( "GLWorld not supplied to material initialization" );
diff --git a/js/lib/rdge/materials/fly-material.js b/js/lib/rdge/materials/fly-material.js
index bd92ecd8..a28fcaee 100644
--- a/js/lib/rdge/materials/fly-material.js
+++ b/js/lib/rdge/materials/fly-material.js
@@ -48,12 +48,12 @@ var FlyMaterial = function FlyMaterial() {
                 if (world)  this.setWorld( world );
 
                 // set up the shader
-                this._shader = new jshader();
+                this._shader = new RDGE.jshader();
                 this._shader.def = flyMaterialDef;
                 this._shader.init();
 
                 // set up the material node
-                this._materialNode = createMaterialNode("flyMaterial" + "_" + world.generateUniqueNodeID());
+                this._materialNode = RDGE.createMaterialNode("flyMaterial" + "_" + world.generateUniqueNodeID());
                 this._materialNode.setShader(this._shader);
 
                 this._time = 0;
diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js
index a85bd6f7..67d08b1a 100644
--- a/js/lib/rdge/materials/julia-material.js
+++ b/js/lib/rdge/materials/julia-material.js
@@ -46,12 +46,12 @@ var JuliaMaterial = function JuliaMaterial() {
                 if (world)  this.setWorld( world );
 
                 // set up the shader
-                this._shader = new jshader();
+                this._shader = new RDGE.jshader();
                 this._shader.def = JuliaMaterialDef;
                 this._shader.init();
 
                 // set up the material node
-                this._materialNode = createMaterialNode("juliaMaterial" + "_" + world.generateUniqueNodeID());
+                this._materialNode = RDGE.createMaterialNode("juliaMaterial" + "_" + world.generateUniqueNodeID());
                 this._materialNode.setShader(this._shader);
 
                 this._time = 0;
@@ -68,7 +68,7 @@ var JuliaMaterial = function JuliaMaterial() {
                 var material = this._materialNode;
                 if (material) {
                         var technique = material.shaderProgram['default'];
-                        var renderer = g_Engine.getContext().renderer;
+                        var renderer = RDGE.globals.engine.getContext().renderer;
                         if (renderer && technique) {
                                 if (this._shader && this._shader['default']) {
                                         this._shader['default'].u_time.set( [this._time] );
diff --git a/js/lib/rdge/materials/keleidoscope-material.js b/js/lib/rdge/materials/keleidoscope-material.js
index 16d1ccfa..cbdd018c 100644
--- a/js/lib/rdge/materials/keleidoscope-material.js
+++ b/js/lib/rdge/materials/keleidoscope-material.js
@@ -55,12 +55,12 @@ var KeleidoscopeMaterial = function KeleidoscopeMaterial() {
                 if (world)  this.setWorld( world );
 
                 // set up the shader
-                this._shader = new jshader();
+                this._shader = new RDGE.jshader();
                 this._shader.def = keleidoscopeMaterialDef;
                 this._shader.init();
 
                 // set up the material node
-                this._materialNode = createMaterialNode("keleidoscopeMaterial" + "_" + world.generateUniqueNodeID());
+                this._materialNode = RDGE.createMaterialNode("keleidoscopeMaterial" + "_" + world.generateUniqueNodeID());