From 4b199cf04af83f59895d4d1e9a2d8443c1ec8e06 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Tue, 3 Apr 2012 09:36:14 -0700 Subject: started the flag material --- js/models/materials-model.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'js/models/materials-model.js') diff --git a/js/models/materials-model.js b/js/models/materials-model.js index 692ac09a..97a48f5a 100755 --- a/js/models/materials-model.js +++ b/js/models/materials-model.js @@ -22,6 +22,7 @@ var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMate var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial; var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial; var ReliefTunnelMaterial = require("js/lib/rdge/materials/relief-tunnel-material").ReliefTunnelMaterial; +var FlagMaterial = require("js/lib/rdge/materials/flag-material").FlagMaterial; var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial; var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial; var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial; @@ -55,6 +56,7 @@ exports.MaterialsModel = Montage.create(Component, { this.addMaterial(new PulseMaterial()); this.addMaterial(new TunnelMaterial()); this.addMaterial(new ReliefTunnelMaterial()); + this.addMaterial(new FlagMaterial()); this.addMaterial(new SquareTunnelMaterial()); this.addMaterial(new FlyMaterial()); this.addMaterial(new WaterMaterial()); @@ -235,6 +237,7 @@ exports.MaterialsModel = Montage.create(Component, { case "tunnel": mat = new TunnelMaterial(); break; case "reliefTunnel": mat = new ReliefTunnelMaterial(); break; case "squareTunnel": mat = new SquareTunnelMaterial(); break; + case "flag": mat = new FlagMaterial(); break; case "fly": mat = new FlyMaterial(); break; case "water": mat = new WaterMaterial(); break; case "paris": mat = new ParisMaterial(); break; -- cgit v1.2.3 From 0f31002ca696c1ef303d2926a504afd27305e94f Mon Sep 17 00:00:00 2001 From: hwc487 Date: Wed, 4 Apr 2012 05:52:54 -0700 Subject: Added Flag material --- js/models/materials-model.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/models/materials-model.js') diff --git a/js/models/materials-model.js b/js/models/materials-model.js index 97a48f5a..b4595bd6 100755 --- a/js/models/materials-model.js +++ b/js/models/materials-model.js @@ -118,7 +118,7 @@ exports.MaterialsModel = Montage.create(Component, { value: function (materialName) { var index = this.getIndexOfMaterial(materialName); if(index !== -1) { - return this._materials[index].dup(); + return this._materials[index]; } } }, @@ -129,7 +129,7 @@ exports.MaterialsModel = Montage.create(Component, { { var index = this.getIndexOfMaterialByShader( shaderName ); if (index >= 0) - return this._materials[index].dup(); + return this._materials[index]; } }, -- cgit v1.2.3 From b6a8f72f670a8edee35554a4ca3a0618c526d651 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Thu, 5 Apr 2012 05:30:55 -0700 Subject: Re-added taper and twist-vert materials. --- js/models/materials-model.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'js/models/materials-model.js') diff --git a/js/models/materials-model.js b/js/models/materials-model.js index b4595bd6..a06f692b 100755 --- a/js/models/materials-model.js +++ b/js/models/materials-model.js @@ -31,6 +31,8 @@ var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvert var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial; var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial; var TwistMaterial = require("js/lib/rdge/materials/twist-material").TwistMaterial; +var TwistVertMaterial = require("js/lib/rdge/materials/twist-vert-material").TwistVertMaterial; +var TaperMaterial = require("js/lib/rdge/materials/taper-material").TaperMaterial; var JuliaMaterial = require("js/lib/rdge/materials/julia-material").JuliaMaterial; var KeleidoscopeMaterial = require("js/lib/rdge/materials/keleidoscope-material").KeleidoscopeMaterial; var MandelMaterial = require("js/lib/rdge/materials/mandel-material").MandelMaterial; @@ -65,6 +67,8 @@ exports.MaterialsModel = Montage.create(Component, { this.addMaterial(new DeformMaterial()); this.addMaterial(new StarMaterial()); this.addMaterial(new TwistMaterial()); + this.addMaterial(new TwistVertMaterial()); + this.addMaterial(new TaperMaterial()); this.addMaterial(new JuliaMaterial()); this.addMaterial(new KeleidoscopeMaterial()); this.addMaterial(new MandelMaterial()); -- cgit v1.2.3 From c1a6cacf364d79cbf23b41e7089a1a6d39afea85 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Tue, 10 Apr 2012 10:12:49 -0700 Subject: Cloud material --- js/models/materials-model.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'js/models/materials-model.js') diff --git a/js/models/materials-model.js b/js/models/materials-model.js index a06f692b..178be3f2 100755 --- a/js/models/materials-model.js +++ b/js/models/materials-model.js @@ -16,6 +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 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; @@ -52,6 +53,7 @@ exports.MaterialsModel = Montage.create(Component, { this.addMaterial(new RadialGradientMaterial()); this.addMaterial(new BumpMetalMaterial()); this.addMaterial(new UberMaterial()); + this.addMaterial(new CloudMaterial()); this.addMaterial(new RadialBlurMaterial()); this.addMaterial(new RaidersMaterial()); this.addMaterial(new PlasmaMaterial()); @@ -232,6 +234,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 "taper": mat = new TaperMaterial(); break; case "twistVert": mat = new TwistVertMaterial(); break; -- cgit v1.2.3 From 5a1965bf2ed9a54601ca16fd67555335c510ce08 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Thu, 26 Apr 2012 16:40:05 -0700 Subject: Update materials to the new texture model. Create local world for deleted source canvases --- js/models/materials-model.js | 62 ++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'js/models/materials-model.js') diff --git a/js/models/materials-model.js b/js/models/materials-model.js index a083dc54..20ef317a 100755 --- a/js/models/materials-model.js +++ b/js/models/materials-model.js @@ -45,37 +45,37 @@ exports.MaterialsModel = Montage.create(Component, { value: false }, - deserializedFromTemplate: { - value: function() { - // Load all the materials - this.addMaterial(new FlatMaterial()); - this.addMaterial(new LinearGradientMaterial()); - this.addMaterial(new RadialGradientMaterial()); - this.addMaterial(new BumpMetalMaterial()); - this.addMaterial(new UberMaterial()); - this.addMaterial(new CloudMaterial()); - this.addMaterial(new RadialBlurMaterial()); - this.addMaterial(new RaidersMaterial()); - this.addMaterial(new PlasmaMaterial()); - this.addMaterial(new PulseMaterial()); - this.addMaterial(new TunnelMaterial()); - this.addMaterial(new ReliefTunnelMaterial()); - this.addMaterial(new FlagMaterial()); - this.addMaterial(new SquareTunnelMaterial()); - this.addMaterial(new FlyMaterial()); - this.addMaterial(new WaterMaterial()); - this.addMaterial(new ParisMaterial()); - this.addMaterial(new ZInvertMaterial()); - this.addMaterial(new DeformMaterial()); - this.addMaterial(new StarMaterial()); - this.addMaterial(new TwistMaterial()); - this.addMaterial(new TwistVertMaterial()); - this.addMaterial(new TaperMaterial()); - this.addMaterial(new JuliaMaterial()); - this.addMaterial(new KeleidoscopeMaterial()); - this.addMaterial(new MandelMaterial()); - } - }, + deserializedFromTemplate: { + value: function() { + // Load all the materials + this.addMaterial(new BumpMetalMaterial()); + this.addMaterial(new CloudMaterial()); + this.addMaterial(new DeformMaterial()); + this.addMaterial(new FlagMaterial()); + this.addMaterial(new FlatMaterial()); + this.addMaterial(new FlyMaterial()); + this.addMaterial(new JuliaMaterial()); + this.addMaterial(new KeleidoscopeMaterial()); + this.addMaterial(new LinearGradientMaterial()); + this.addMaterial(new MandelMaterial()); + this.addMaterial(new PlasmaMaterial()); + this.addMaterial(new PulseMaterial()); + this.addMaterial(new ParisMaterial()); + this.addMaterial(new RadialGradientMaterial()); + this.addMaterial(new RadialBlurMaterial()); + this.addMaterial(new RaidersMaterial()); + this.addMaterial(new ReliefTunnelMaterial()); + this.addMaterial(new SquareTunnelMaterial()); + this.addMaterial(new StarMaterial()); + this.addMaterial(new TaperMaterial()); + this.addMaterial(new TunnelMaterial()); + this.addMaterial(new TwistMaterial()); + this.addMaterial(new TwistVertMaterial()); + this.addMaterial(new WaterMaterial()); + this.addMaterial(new ZInvertMaterial()); + this.addMaterial(new UberMaterial()); + } + }, _materials : { value: AppModel.materials -- cgit v1.2.3 From 6c994c4b90023cecf4fd0caafb404b859fe28f54 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Wed, 6 Jun 2012 16:34:41 -0700 Subject: material cleanup and rearchitecture --- js/models/materials-model.js | 89 ++++++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 40 deletions(-) (limited to 'js/models/materials-model.js') diff --git a/js/models/materials-model.js b/js/models/materials-model.js index 20ef317a..c3b111f4 100755 --- a/js/models/materials-model.js +++ b/js/models/materials-model.js @@ -27,7 +27,7 @@ var FlagMaterial = require("js/lib/rdge/materials/flag-material").FlagMaterial; var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial; var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial; var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial; -var ParisMaterial = require("js/lib/rdge/materials/water-material").ParisMaterial; +//var ParisMaterial = require("js/lib/rdge/materials/water-material").ParisMaterial; var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvertMaterial; var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial; var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial; @@ -60,7 +60,7 @@ exports.MaterialsModel = Montage.create(Component, { this.addMaterial(new MandelMaterial()); this.addMaterial(new PlasmaMaterial()); this.addMaterial(new PulseMaterial()); - this.addMaterial(new ParisMaterial()); + //this.addMaterial(new ParisMaterial()); this.addMaterial(new RadialGradientMaterial()); this.addMaterial(new RadialBlurMaterial()); this.addMaterial(new RaidersMaterial()); @@ -210,6 +210,51 @@ exports.MaterialsModel = Montage.create(Component, { } }, + createMaterialByShaderName: + { + value: function(shaderName) + { + var mat; + switch (shaderName) + { + case "flat": mat = new FlatMaterial(); break; + case "linearGradient": mat = new LinearGradientMaterial(); break; + 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 "taper": mat = new TaperMaterial(); break; + case "twistVert": mat = new TwistVertMaterial(); break; + case "radialBlur": mat = new RadialBlurMaterial(); break; + case "plasma": mat = new PlasmaMaterial(); break; + case "pulse": mat = new PulseMaterial(); break; + case "tunnel": mat = new TunnelMaterial(); break; + case "reliefTunnel": mat = new ReliefTunnelMaterial(); break; + case "squareTunnel": mat = new SquareTunnelMaterial(); break; + case "flag": mat = new FlagMaterial(); break; + case "fly": mat = new FlyMaterial(); break; + case "water": mat = new WaterMaterial(); break; + //case "paris": mat = new ParisMaterial(); break; + case "raiders": mat = new RaidersMaterial(); break; + case "zinvert": mat = new ZInvertMaterial(); break; + case "deform": mat = new DeformMaterial(); break; + case "star": mat = new StarMaterial(); break; + case "twist": mat = new TwistMaterial(); break; + case "julia": mat = new JuliaMaterial(); break; + case "keleidoscope": mat = new KeleidoscopeMaterial(); break; + case "mandel": mat = new MandelMaterial(); break; + + + default: + console.log( "Unrecognized shader name: " + shaderName ); + break; + } + + return mat; + } + }, + importMaterials: { value: function( jObj ) { @@ -224,45 +269,9 @@ exports.MaterialsModel = Montage.create(Component, { var nMats = matArray.length; for (var i=0; i