diff options
author | hwc487 | 2012-06-13 10:15:54 -0700 |
---|---|---|
committer | hwc487 | 2012-06-13 10:15:54 -0700 |
commit | 1fe66f1a89ac949dee44ae881556901a8bf98bba (patch) | |
tree | dba7e778fcd8a37eb76249ff8a207ee171c93e1b | |
parent | ba4e58f11d8028375365ae0ddd0d3f601c7f64ca (diff) | |
download | ninja-1fe66f1a89ac949dee44ae881556901a8bf98bba.tar.gz |
Removed a console message.
Removed cloud material from the pulldown.
-rw-r--r-- | js/lib/rdge/texture.js | 3 | ||||
-rwxr-xr-x | js/models/materials-model.js | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/js/lib/rdge/texture.js b/js/lib/rdge/texture.js index bd8e6198..616729f6 100644 --- a/js/lib/rdge/texture.js +++ b/js/lib/rdge/texture.js | |||
@@ -222,10 +222,7 @@ function Texture( dstWorld, texMapName, wrap, mips ) | |||
222 | this.render = function() | 222 | this.render = function() |
223 | { | 223 | { |
224 | if (!this._srcCanvas) | 224 | if (!this._srcCanvas) |
225 | { | ||
226 | console.log( " no source canvas in GLTexture.render" ); | ||
227 | return; | 225 | return; |
228 | } | ||
229 | var srcCanvas = this._srcCanvas; | 226 | var srcCanvas = this._srcCanvas; |
230 | 227 | ||
231 | if (this._isLocal) | 228 | if (this._isLocal) |
diff --git a/js/models/materials-model.js b/js/models/materials-model.js index 95f152e3..0f214356 100755 --- a/js/models/materials-model.js +++ b/js/models/materials-model.js | |||
@@ -16,7 +16,7 @@ var LinearGradientMaterial = require("js/lib/rdge/materials/linear-gradient-mate | |||
16 | var RadialGradientMaterial = require("js/lib/rdge/materials/radial-gradient-material").RadialGradientMaterial; | 16 | var RadialGradientMaterial = require("js/lib/rdge/materials/radial-gradient-material").RadialGradientMaterial; |
17 | var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial; | 17 | var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial; |
18 | var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial; | 18 | var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial; |
19 | var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial; | 19 | //var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial; |
20 | var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial; | 20 | var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial; |
21 | var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial; | 21 | var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial; |
22 | var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial; | 22 | var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial; |
@@ -50,7 +50,7 @@ exports.MaterialsModel = Montage.create(Component, { | |||
50 | // Load all the materials | 50 | // Load all the materials |
51 | this.addMaterial(new FlatMaterial()); | 51 | this.addMaterial(new FlatMaterial()); |
52 | this.addMaterial(new BumpMetalMaterial()); | 52 | this.addMaterial(new BumpMetalMaterial()); |
53 | this.addMaterial(new CloudMaterial()); | 53 | //this.addMaterial(new CloudMaterial()); |
54 | this.addMaterial(new DeformMaterial()); | 54 | this.addMaterial(new DeformMaterial()); |
55 | this.addMaterial(new FlagMaterial()); | 55 | this.addMaterial(new FlagMaterial()); |
56 | this.addMaterial(new FlyMaterial()); | 56 | this.addMaterial(new FlyMaterial()); |
@@ -222,7 +222,7 @@ exports.MaterialsModel = Montage.create(Component, { | |||
222 | case "radialGradient": mat = new RadialGradientMaterial(); break; | 222 | case "radialGradient": mat = new RadialGradientMaterial(); break; |
223 | case "bumpMetal": mat = new BumpMetalMaterial(); break; | 223 | case "bumpMetal": mat = new BumpMetalMaterial(); break; |
224 | case "uber": mat = new UberMaterial(); break; | 224 | case "uber": mat = new UberMaterial(); break; |
225 | case "cloud": mat = new CloudMaterial(); break; | 225 | //case "cloud": mat = new CloudMaterial(); break; |
226 | 226 | ||
227 | case "taper": mat = new TaperMaterial(); break; | 227 | case "taper": mat = new TaperMaterial(); break; |
228 | case "twistVert": mat = new TwistVertMaterial(); break; | 228 | case "twistVert": mat = new TwistVertMaterial(); break; |