From 1fe66f1a89ac949dee44ae881556901a8bf98bba Mon Sep 17 00:00:00 2001 From: hwc487 Date: Wed, 13 Jun 2012 10:15:54 -0700 Subject: Removed a console message. Removed cloud material from the pulldown. --- js/lib/rdge/texture.js | 3 --- 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 ) this.render = function() { if (!this._srcCanvas) - { - console.log( " no source canvas in GLTexture.render" ); return; - } var srcCanvas = this._srcCanvas; 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 var RadialGradientMaterial = require("js/lib/rdge/materials/radial-gradient-material").RadialGradientMaterial; var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial; var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial; -var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial; +//var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial; var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial; var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial; var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial; @@ -50,7 +50,7 @@ exports.MaterialsModel = Montage.create(Component, { // Load all the materials this.addMaterial(new FlatMaterial()); this.addMaterial(new BumpMetalMaterial()); - this.addMaterial(new CloudMaterial()); + //this.addMaterial(new CloudMaterial()); this.addMaterial(new DeformMaterial()); this.addMaterial(new FlagMaterial()); this.addMaterial(new FlyMaterial()); @@ -222,7 +222,7 @@ exports.MaterialsModel = Montage.create(Component, { case "radialGradient": mat = new RadialGradientMaterial(); break; case "bumpMetal": mat = new BumpMetalMaterial(); break; case "uber": mat = new UberMaterial(); break; - case "cloud": mat = new CloudMaterial(); break; + //case "cloud": mat = new CloudMaterial(); break; case "taper": mat = new TaperMaterial(); break; case "twistVert": mat = new TwistVertMaterial(); break; -- cgit v1.2.3