aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rwxr-xr-xjs/document/html-document.js2
-rwxr-xr-xjs/lib/rdge/materials/uber-material.js12
2 files changed, 8 insertions, 6 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js
index f4ec3184..d4db6e2f 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -218,6 +218,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
218 cdm.loadGLData(elt, value, null ); 218 cdm.loadGLData(elt, value, null );
219 */ 219 */
220 220
221 // /*
221 var importStr = value[i]; 222 var importStr = value[i];
222 var startIndex = importStr.indexOf( "id: " ); 223 var startIndex = importStr.indexOf( "id: " );
223 if (startIndex >= 0) { 224 if (startIndex >= 0) {
@@ -244,6 +245,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
244 } 245 }
245 } 246 }
246 } 247 }
248 // */
247 } 249 }
248 } 250 }
249 } 251 }
diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index 8ec5b05c..91f43754 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -477,7 +477,7 @@ var UberMaterial = function UberMaterial() {
477 if(environmentMap) 477 if(environmentMap)
478 { 478 {
479 this.setProperty( "environmentMap", environmentMap ); 479 this.setProperty( "environmentMap", environmentMap );
480 this.setProperty( "environmentAmount", Number( pu.nextValue( "envReflection" ) ) ); 480 this.setProperty( "environmentAmount", Number( pu.nextValue( "environmentAmount" ) ) );
481 } 481 }
482 482
483 this.rebuildShader(); 483 this.rebuildShader();
@@ -495,10 +495,10 @@ var UberMaterial = function UberMaterial() {
495 if (typeof caps.material != 'undefined') 495 if (typeof caps.material != 'undefined')
496 { 496 {
497 exportStr += "materialProps: true\n"; 497 exportStr += "materialProps: true\n";
498 exportStr += "ambientColor: " + caps.material.ambientColor + "\n"; 498 exportStr += "ambientColor: " + this._ambientColor + "\n";
499 exportStr += "diffuseColor: " + caps.material.diffuseColor + "\n"; 499 exportStr += "diffuseColor: " + this._diffuseColor + "\n";
500 exportStr += "specularColor: " + caps.material.specularColor + "\n"; 500 exportStr += "specularColor: " + this._specularColor + "\n";
501 exportStr += "specularPower: " + caps.material.specularPower + "\n"; 501 exportStr += "specularPower: " + this._specularPower + "\n";
502 } 502 }
503 503
504 if (typeof caps.lighting != 'undefined') 504 if (typeof caps.lighting != 'undefined')
@@ -559,7 +559,7 @@ var UberMaterial = function UberMaterial() {
559 if(typeof caps.environmentMap != 'undefined') 559 if(typeof caps.environmentMap != 'undefined')
560 { 560 {
561 exportStr += "environmentMap: " + caps.environmentMap.texture + "\n"; 561 exportStr += "environmentMap: " + caps.environmentMap.texture + "\n";
562 exportStr += "envReflection: " + caps.environmentMap.envReflection + "\n"; 562 exportStr += "environmentAmount: " + caps.environmentMap.envReflection + "\n";
563 } 563 }
564 564
565 // every material needs to terminate like this 565 // every material needs to terminate like this