diff options
author | hwc487 | 2012-06-14 13:55:32 -0700 |
---|---|---|
committer | hwc487 | 2012-06-14 13:55:32 -0700 |
commit | bcb0266bb6f9a578d033ad5b7b9869074e4f98a1 (patch) | |
tree | b66210f852aa924f890f9c2b2925a6a36553ff5b /js/lib/rdge/materials/uber-material.js | |
parent | bcd7ce86e2fb71ebc1420ea5967770ce70d9faa2 (diff) | |
download | ninja-bcb0266bb6f9a578d033ad5b7b9869074e4f98a1.tar.gz |
Fixed alphabetization of material names.
Removed console output.
Removed texture map field from Mandel material editor.
Diffstat (limited to 'js/lib/rdge/materials/uber-material.js')
-rwxr-xr-x | js/lib/rdge/materials/uber-material.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js index 9aa0f7ea..3dffb238 100755 --- a/js/lib/rdge/materials/uber-material.js +++ b/js/lib/rdge/materials/uber-material.js | |||
@@ -183,7 +183,7 @@ var UberMaterial = function UberMaterial() { | |||
183 | this.updateAmbientColor = function () { | 183 | this.updateAmbientColor = function () { |
184 | this._ambientColor = this._propValues['ambientColor'].slice(0); | 184 | this._ambientColor = this._propValues['ambientColor'].slice(0); |
185 | var material = this._materialNode; | 185 | var material = this._materialNode; |
186 | console.log( "ambient color: " + this._ambientColor ); | 186 | //console.log( "ambient color: " + this._ambientColor ); |
187 | if (material) { | 187 | if (material) { |
188 | var technique = material.shaderProgram.defaultTechnique; | 188 | var technique = material.shaderProgram.defaultTechnique; |
189 | technique.u_ambientColor.set(this._ambientColor); | 189 | technique.u_ambientColor.set(this._ambientColor); |