From 486842239c71e7964f38a09aacda4970f2a82e1a Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Tue, 7 Feb 2012 10:58:14 -0800 Subject: Updated tools and PI to get/set materials by binding to appModel's materials property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary. Signed-off-by: Nivesh Rajbhandari --- js/helper-classes/RDGE/MaterialsLibrary.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'js/helper-classes/RDGE/MaterialsLibrary.js') diff --git a/js/helper-classes/RDGE/MaterialsLibrary.js b/js/helper-classes/RDGE/MaterialsLibrary.js index edc4f7da..9616b525 100644 --- a/js/helper-classes/RDGE/MaterialsLibrary.js +++ b/js/helper-classes/RDGE/MaterialsLibrary.js @@ -169,6 +169,7 @@ var MaterialsLibrary = Object.create(Object.prototype, { // create the library of stroke and fill materials +var flatMaterial = new FlatMaterial(); var uberMaterial = new UberMaterial(); //var linearGradientMaterial = new LinearGradientMaterial(); //var radialGradientMaterial = new RadialGradientMaterial(); @@ -182,6 +183,7 @@ var uberMaterial = new UberMaterial(); //var plasmaMaterial = new PlasmaMaterial(); var bumpMetalMaterial = new BumpMetalMaterial(); +MaterialsLibrary.addMaterial(flatMaterial); //MaterialsLibrary.addMaterial(linearGradientMaterial); //MaterialsLibrary.addMaterial(radialGradientMaterial); //MaterialsLibrary.addMaterial(radialBlurMaterial); -- cgit v1.2.3 From 2d68f944e93b201deb46015392e706b7a24201c9 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Wed, 8 Feb 2012 14:24:48 -0800 Subject: Fixed several typos in Materials import/export code to support toggling between 2d and 3d shape modes. Signed-off-by: Nivesh Rajbhandari --- js/helper-classes/RDGE/MaterialsLibrary.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/helper-classes/RDGE/MaterialsLibrary.js') diff --git a/js/helper-classes/RDGE/MaterialsLibrary.js b/js/helper-classes/RDGE/MaterialsLibrary.js index 9616b525..e7fc51ac 100644 --- a/js/helper-classes/RDGE/MaterialsLibrary.js +++ b/js/helper-classes/RDGE/MaterialsLibrary.js @@ -141,7 +141,7 @@ var MaterialsLibrary = Object.create(Object.prototype, { case "julia": mat = new JuliaMaterial(); break; case "mandel": mat = new MandelMaterial(); break; case "plasma": mat = new PlasmaMaterial(); break; - case "bumpMetal": mat = new PlasmaMaterial(); break; + case "bumpMetal": mat = new BumpMetalMaterial(); break; case "uber": mat = new UberMaterial(); break; default: -- cgit v1.2.3 From 805059d68087530721212a650412aefb85e98d1f Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Thu, 9 Feb 2012 10:26:57 -0800 Subject: Removed unused materials. Signed-off-by: Nivesh Rajbhandari --- js/helper-classes/RDGE/MaterialsLibrary.js | 38 ++++-------------------------- 1 file changed, 5 insertions(+), 33 deletions(-) (limited to 'js/helper-classes/RDGE/MaterialsLibrary.js') diff --git a/js/helper-classes/RDGE/MaterialsLibrary.js b/js/helper-classes/RDGE/MaterialsLibrary.js index e7fc51ac..314a13bc 100644 --- a/js/helper-classes/RDGE/MaterialsLibrary.js +++ b/js/helper-classes/RDGE/MaterialsLibrary.js @@ -127,20 +127,8 @@ var MaterialsLibrary = Object.create(Object.prototype, { switch (type) { case "flat": mat = new FlatMaterial(); break; - case "brick": mat = new BrickMaterial(); break; - case "iridescentScales": mat = new IridescentScalesMaterial(); break; - case "quilt_1": mat = new QuiltMaterial01(); break; - case "quilt_2": mat = new QuiltMaterial02(); break; case "linearGradient": mat = new LinearGradientMaterial(); break; case "radialGradient": mat = new RadialGradientMaterial(); break; - case "radialBlur": mat = new RadiaBlurMaterial(); break; - case "pulse": mat = new PulseMaterial(); break; - case "tunnel": mat = new TunnelMaterial(); break; - case "twist": mat = new TwistMaterial(); break; - case "keleidoscope": mat = new KeleidoscopeMaterial(); break; - case "julia": mat = new JuliaMaterial(); break; - case "mandel": mat = new MandelMaterial(); break; - case "plasma": mat = new PlasmaMaterial(); break; case "bumpMetal": mat = new BumpMetalMaterial(); break; case "uber": mat = new UberMaterial(); break; @@ -170,30 +158,14 @@ var MaterialsLibrary = Object.create(Object.prototype, { // create the library of stroke and fill materials var flatMaterial = new FlatMaterial(); -var uberMaterial = new UberMaterial(); -//var linearGradientMaterial = new LinearGradientMaterial(); -//var radialGradientMaterial = new RadialGradientMaterial(); -//var radialBlurMaterial = new RadialBlurMaterial(); -//var pulseMaterial = new PulseMaterial(); -//var tunnelMaterial = new TunnelMaterial(); -//var twistMaterial = new TwistMaterial(); -//var keleidoscopeMaterial = new KeleidoscopeMaterial(); -//var juliaMaterial = new JuliaMaterial(); -//var mandelMaterial = new MandelMaterial(); -//var plasmaMaterial = new PlasmaMaterial(); +var linearGradientMaterial = new LinearGradientMaterial(); +var radialGradientMaterial = new RadialGradientMaterial(); var bumpMetalMaterial = new BumpMetalMaterial(); +var uberMaterial = new UberMaterial(); MaterialsLibrary.addMaterial(flatMaterial); -//MaterialsLibrary.addMaterial(linearGradientMaterial); -//MaterialsLibrary.addMaterial(radialGradientMaterial); -//MaterialsLibrary.addMaterial(radialBlurMaterial); -//MaterialsLibrary.addMaterial(pulseMaterial); -//MaterialsLibrary.addMaterial(tunnelMaterial); -//MaterialsLibrary.addMaterial(twistMaterial); -//MaterialsLibrary.addMaterial(keleidoscopeMaterial); -//MaterialsLibrary.addMaterial(juliaMaterial); -//MaterialsLibrary.addMaterial(mandelMaterial); -//MaterialsLibrary.addMaterial(plasmaMaterial); +MaterialsLibrary.addMaterial(linearGradientMaterial); +MaterialsLibrary.addMaterial(radialGradientMaterial); MaterialsLibrary.addMaterial(bumpMetalMaterial); MaterialsLibrary.addMaterial(uberMaterial); -- cgit v1.2.3