From 50ede4afa801f53caff7939dad0408f9a0a8b744 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Tue, 22 May 2012 15:44:51 -0700
Subject: Editable parameters for flag, pulse, uber, and radial gradient
 materials.

---
 js/lib/rdge/materials/uber-material.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'js/lib/rdge/materials/uber-material.js')

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index 6de74495..0fef78f6 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -247,9 +247,9 @@ var UberMaterial = function UberMaterial() {
                     var technique = material.shaderProgram.defaultTechnique;
                     var renderer = RDGE.globals.engine.getContext().renderer;
                     if (renderer && technique) {
-                        var tex = renderer.getTextureByName(value, caps.environmentMap.wrap);
+                        var tex = renderer.getTextureByName(value, this._ubershaderCaps.environmentMap.wrap);
                         this.registerTexture(tex);
-                        technique.s_environmentMap.set(tex);
+                        technique.s_envMap.set(tex);
                     }
                 }
             }
@@ -276,7 +276,7 @@ var UberMaterial = function UberMaterial() {
 					var technique = material.shaderProgram.defaultTechnique;
 					var renderer = RDGE.globals.engine.getContext().renderer;
 					if (renderer && technique) {
-                        this._diffuseTexture = new Texture( this.getWorld(), value,  caps.diffuseMap.wrap );
+                        this._diffuseTexture = new Texture( this.getWorld(), value,  this._ubershaderCaps.diffuseMap.wrap );
                         var tex = this._diffuseTexture.getTexture();
 						technique.s_diffuseMap.set( tex );
 					}
@@ -304,7 +304,7 @@ var UberMaterial = function UberMaterial() {
                     var technique = material.shaderProgram.defaultTechnique;
                     var renderer = RDGE.globals.engine.getContext().renderer;
                     if (renderer && technique) {
-                        var tex = renderer.getTextureByName(value, caps.specularMap.wrap);
+                        var tex = renderer.getTextureByName(value, this._ubershaderCaps.specularMap.wrap);
                         this.registerTexture(tex);
                         technique.s_specularMap.set(tex);
                     }
@@ -332,7 +332,7 @@ var UberMaterial = function UberMaterial() {
                     var technique = material.shaderProgram.defaultTechnique;
                     var renderer = RDGE.globals.engine.getContext().renderer;
                     if (renderer && technique) {
-                        var tex = renderer.getTextureByName(value, caps.normalMap.wrap);
+                        var tex = renderer.getTextureByName(value, this._ubershaderCaps.normalMap.wrap);
                         this.registerTexture(tex);
                         technique.s_normalMap.set(tex);
                     }
@@ -798,7 +798,7 @@ var UberMaterial = function UberMaterial() {
 
         var material = this._materialNode;
         if (material) {
-            material.setShader(buildUbershader(this._ubershaderCaps));
+            material.setShader( this.buildUberShader(this._ubershaderCaps) );
         }
     };
 };
-- 
cgit v1.2.3