1 files changed, 40 insertions, 26 deletions

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index c1d1913c..4ff3676a 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -240,7 +240,7 @@ var UberMaterial = function UberMaterial() {
                                 var material = this._materialNode;
                                 if (material) {
                                         var technique = material.shaderProgram.defaultTechnique;
-                                        var renderer = g_Engine.getContext().renderer;
+                                        var renderer = RDGE.globals.engine.getContext().renderer;
                                         if (renderer && technique) {
                                                 var tex = renderer.getTextureByName(value, caps.environmentMap.wrap);
                                                 this.registerTexture( tex );
@@ -268,7 +268,7 @@ var UberMaterial = function UberMaterial() {
                                 var material = this._materialNode;
                                 if (material) {
                                         var technique = material.shaderProgram.defaultTechnique;
-                                        var renderer = g_Engine.getContext().renderer;
+                                        var renderer = RDGE.globals.engine.getContext().renderer;
                                         if (renderer && technique) {
                                                 var tex = renderer.getTextureByName(value, caps.diffuseMap.wrap);
                                                 this.registerTexture( tex );
@@ -296,7 +296,7 @@ var UberMaterial = function UberMaterial() {
                                 var material = this._materialNode;
                                 if (material) {
                                         var technique = material.shaderProgram.defaultTechnique;
-                                        var renderer = g_Engine.getContext().renderer;
+                                        var renderer = RDGE.globals.engine.getContext().renderer;
                                         if (renderer && technique) {
                                                 var tex = renderer.getTextureByName(value, caps.specularMap.wrap);
                                                 this.registerTexture( tex );
@@ -324,7 +324,7 @@ var UberMaterial = function UberMaterial() {
                                 var material = this._materialNode;
                                 if (material) {
                                         var technique = material.shaderProgram.defaultTechnique;
-                                        var renderer = g_Engine.getContext().renderer;
+                                        var renderer = RDGE.globals.engine.getContext().renderer;
                                         if (renderer && technique) {
                                                 var tex = renderer.getTextureByName(value, caps.normalMap.wrap);
                                                 this.registerTexture( tex );
@@ -366,7 +366,7 @@ var UberMaterial = function UberMaterial() {
                 this._shader = this.buildUberShader( this._ubershaderCaps );
 
                 // set up the material node
-                this._materialNode = createMaterialNode("uberMaterial" + "_" + world.generateUniqueNodeID());
+                this._materialNode = RDGE.createMaterialNode("uberMaterial" + "_" + world.generateUniqueNodeID());
                 this._materialNode.setShader(this._shader);
         };
 
@@ -437,8 +437,9 @@ var UberMaterial = function UberMaterial() {
                                                 // push the light
                                                 this._lights.push( light );
                                 }
-                                else
+                                else {
                                         this._lights[i] = 'undefined';
+}
 
                                 // advance to the next light
                                 var endLightKey = "endMaterial\n";
@@ -462,16 +463,19 @@ var UberMaterial = function UberMaterial() {
                 }
 
                 var diffuseMap = pu.nextValue( "diffuseMap: "  )
-                if(diffuseMap)
+                if(diffuseMap) {
                         this.setProperty( "diffuseMap", diffuseMap );
+}
 
                 var normalMap = pu.nextValue( "normalMap: "  );
-                if(normalMap)
+                if(normalMap) {
                         this.setProperty( "normalMap", normalMap );
+}
 
                 var specularMap = pu.nextValue( "specularMap: "  );
-                if(specularMap)
+                if(specularMap) {
                         this.setProperty( "specularMap", specularMap );
+}
 
                 var environmentMap = pu.nextValue( "environmentMap: "  );
                 if(environmentMap)
@@ -481,7 +485,7 @@ var UberMaterial = function UberMaterial() {
                 }
 
                 this.rebuildShader();
-        }
+        };
 
         this.importJSON = function( jObj )
         {
@@ -556,16 +560,19 @@ var UberMaterial = function UberMaterial() {
                 }
 
                 var diffuseMap = jObj['diffuseMap'];
-                if(diffuseMap)
+                if(diffuseMap) {
                         this.setProperty( "diffuseMap", diffuseMap );
+}
 
                 var normalMap = jObj['normalMap'];
-                if(normalMap)
+                if(normalMap) {
                         this.setProperty( "normalMap", normalMap );
+}
 
                 var specularMap = jObj['specularMap'];
-                if(specularMap)
+                if(specularMap) {
                         this.setProperty( "specularMap", specularMap );
+}
 
                 var environmentMap = jObj['environmentMap'];
                 if(environmentMap)
@@ -575,7 +582,7 @@ var UberMaterial = function UberMaterial() {
                 }
 
                 this.rebuildShader();
-        }
+        };
 
         this.exportJSON = function()
         {
@@ -640,14 +647,17 @@ var UberMaterial = function UberMaterial() {
                                 jObj.lights = lightArray;
                 }
 
-                if(typeof caps.diffuseMap != 'undefined')
+                if(typeof caps.diffuseMap != 'undefined') {
                         jObj['diffuseMap'] = caps.diffuseMap.texture;
+}
 
-                if(typeof caps.normalMap != 'undefined')
+                if(typeof caps.normalMap != 'undefined') {
                         jObj['normalMap'] = caps.normalMap.texture;
+}
 
-                if(typeof caps.specularMap != 'undefined')
+                if(typeof caps.specularMap != 'undefined') {
                         jObj['specularMap'] = caps.specularMap.texture;
+}
 
                 if(typeof caps.environmentMap != 'undefined')
                 {
@@ -656,7 +666,7 @@ var UberMaterial = function UberMaterial() {
                 }
 
                 return jObj;
-        }
+        };
 
 
         this.export = function()
@@ -716,17 +726,21 @@ var UberMaterial = function UberMaterial() {
                 }
 
                 var world = this.getWorld();
-                if (!world)
+                if (!world) {
                         throw new Error( "no world in material.export, " + this.getName() );
+}
 
-                if(typeof caps.diffuseMap != 'undefined')
+                if(typeof caps.diffuseMap != 'undefined') {
                         exportStr += "diffuseMap: " + caps.diffuseMap.texture + "\n";
+}
 
-                if(typeof caps.normalMap != 'undefined')
+                if(typeof caps.normalMap != 'undefined') {
                         exportStr += "normalMap: " + caps.normalMap.texture + "\n";
+}
 
-                if(typeof caps.specularMap != 'undefined')
+                if(typeof caps.specularMap != 'undefined') {
                         exportStr += "specularMap: " + caps.specularMap.texture + "\n";
+}