From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Fri, 27 Jan 2012 12:05:17 -0800 Subject: Merged old FileIO --- js/helper-classes/RDGE/MaterialsLibrary.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 js/helper-classes/RDGE/MaterialsLibrary.js (limited to 'js/helper-classes/RDGE/MaterialsLibrary.js') diff --git a/js/helper-classes/RDGE/MaterialsLibrary.js b/js/helper-classes/RDGE/MaterialsLibrary.js old mode 100644 new mode 100755 -- 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 From 96a0a8c916533eb5625816192ed38488f639326d Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Wed, 22 Feb 2012 11:00:20 -0800 Subject: Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL materials. Signed-off-by: Nivesh Rajbhandari --- js/helper-classes/RDGE/MaterialsLibrary.js | 59 ++++++++++++++++++++++++++++++ 1 file changed, 59 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 314a13bc..8f55f2bc 100755 --- a/js/helper-classes/RDGE/MaterialsLibrary.js +++ b/js/helper-classes/RDGE/MaterialsLibrary.js @@ -132,6 +132,25 @@ var MaterialsLibrary = Object.create(Object.prototype, { case "bumpMetal": mat = new BumpMetalMaterial(); break; case "uber": mat = new UberMaterial(); 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 "fly": mat = new FlyMaterial(); break; + case "water": mat = new WaterMaterial(); 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: throw new Error( "Unrecognized material type: " + type ); pu.advancePastToken( "endMaterial\n" ); @@ -163,9 +182,49 @@ var radialGradientMaterial = new RadialGradientMaterial(); var bumpMetalMaterial = new BumpMetalMaterial(); var uberMaterial = new UberMaterial(); +//var taperMaterial = new TaperMaterial(); +//var twistVertMaterial = new TwistVertMaterial(); +var radialBlurMaterial = new RadialBlurMaterial(); +var plasmaMaterial = new PlasmaMaterial(); +var pulseMaterial = new PulseMaterial(); +var tunnelMaterial = new TunnelMaterial(); +var reliefTunnelMaterial = new ReliefTunnelMaterial(); +var squareTunnelMaterial = new SquareTunnelMaterial(); +var flyMaterial = new FlyMaterial(); +var waterMaterial = new WaterMaterial(); +var zInvertMaterial = new ZInvertMaterial(); +var deformMaterial = new DeformMaterial(); +var starMaterial = new StarMaterial(); +var twistMaterial = new TwistMaterial(); +var juliaMaterial = new JuliaMaterial(); +var keleidoscopeMaterial = new KeleidoscopeMaterial(); +var mandelMaterial = new MandelMaterial(); + + MaterialsLibrary.addMaterial(flatMaterial); MaterialsLibrary.addMaterial(linearGradientMaterial); MaterialsLibrary.addMaterial(radialGradientMaterial); MaterialsLibrary.addMaterial(bumpMetalMaterial); MaterialsLibrary.addMaterial(uberMaterial); +//MaterialsLibrary.addMaterial(taperMaterial); +//MaterialsLibrary.addMaterial(twistVertMaterial); + +MaterialsLibrary.addMaterial(radialBlurMaterial); +MaterialsLibrary.addMaterial(plasmaMaterial); +MaterialsLibrary.addMaterial(pulseMaterial); +MaterialsLibrary.addMaterial(tunnelMaterial); +MaterialsLibrary.addMaterial(reliefTunnelMaterial); +MaterialsLibrary.addMaterial(squareTunnelMaterial); +MaterialsLibrary.addMaterial(flyMaterial); +MaterialsLibrary.addMaterial(waterMaterial); +MaterialsLibrary.addMaterial(zInvertMaterial); +MaterialsLibrary.addMaterial(deformMaterial); +MaterialsLibrary.addMaterial(starMaterial); +MaterialsLibrary.addMaterial(twistMaterial); +MaterialsLibrary.addMaterial(juliaMaterial); +MaterialsLibrary.addMaterial(keleidoscopeMaterial); +MaterialsLibrary.addMaterial(mandelMaterial); + + + -- cgit v1.2.3 From f775fb752cac57a0c1f6c42c8c60f5ff329eab32 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Wed, 22 Feb 2012 11:36:19 -0800 Subject: Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL materials." This reverts commit 96a0a8c916533eb5625816192ed38488f639326d. --- js/helper-classes/RDGE/MaterialsLibrary.js | 59 ------------------------------ 1 file changed, 59 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 8f55f2bc..314a13bc 100755 --- a/js/helper-classes/RDGE/MaterialsLibrary.js +++ b/js/helper-classes/RDGE/MaterialsLibrary.js @@ -132,25 +132,6 @@ var MaterialsLibrary = Object.create(Object.prototype, { case "bumpMetal": mat = new BumpMetalMaterial(); break; case "uber": mat = new UberMaterial(); 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 "fly": mat = new FlyMaterial(); break; - case "water": mat = new WaterMaterial(); 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: throw new Error( "Unrecognized material type: " + type ); pu.advancePastToken( "endMaterial\n" ); @@ -182,49 +163,9 @@ var radialGradientMaterial = new RadialGradientMaterial(); var bumpMetalMaterial = new BumpMetalMaterial(); var uberMaterial = new UberMaterial(); -//var taperMaterial = new TaperMaterial(); -//var twistVertMaterial = new TwistVertMaterial(); -var radialBlurMaterial = new RadialBlurMaterial(); -var plasmaMaterial = new PlasmaMaterial(); -var pulseMaterial = new PulseMaterial(); -var tunnelMaterial = new TunnelMaterial(); -var reliefTunnelMaterial = new ReliefTunnelMaterial(); -var squareTunnelMaterial = new SquareTunnelMaterial(); -var flyMaterial = new FlyMaterial(); -var waterMaterial = new WaterMaterial(); -var zInvertMaterial = new ZInvertMaterial(); -var deformMaterial = new DeformMaterial(); -var starMaterial = new StarMaterial(); -var twistMaterial = new TwistMaterial(); -var juliaMaterial = new JuliaMaterial(); -var keleidoscopeMaterial = new KeleidoscopeMaterial(); -var mandelMaterial = new MandelMaterial(); - - MaterialsLibrary.addMaterial(flatMaterial); MaterialsLibrary.addMaterial(linearGradientMaterial); MaterialsLibrary.addMaterial(radialGradientMaterial); MaterialsLibrary.addMaterial(bumpMetalMaterial); MaterialsLibrary.addMaterial(uberMaterial); -//MaterialsLibrary.addMaterial(taperMaterial); -//MaterialsLibrary.addMaterial(twistVertMaterial); - -MaterialsLibrary.addMaterial(radialBlurMaterial); -MaterialsLibrary.addMaterial(plasmaMaterial); -MaterialsLibrary.addMaterial(pulseMaterial); -MaterialsLibrary.addMaterial(tunnelMaterial); -MaterialsLibrary.addMaterial(reliefTunnelMaterial); -MaterialsLibrary.addMaterial(squareTunnelMaterial); -MaterialsLibrary.addMaterial(flyMaterial); -MaterialsLibrary.addMaterial(waterMaterial); -MaterialsLibrary.addMaterial(zInvertMaterial); -MaterialsLibrary.addMaterial(deformMaterial); -MaterialsLibrary.addMaterial(starMaterial); -MaterialsLibrary.addMaterial(twistMaterial); -MaterialsLibrary.addMaterial(juliaMaterial); -MaterialsLibrary.addMaterial(keleidoscopeMaterial); -MaterialsLibrary.addMaterial(mandelMaterial); - - - -- cgit v1.2.3 From d5b216d9d6d2b8cb93106e8f8ca351089d05b41d Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Wed, 22 Feb 2012 11:52:31 -0800 Subject: Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials. Signed-off-by: Nivesh Rajbhandari --- js/helper-classes/RDGE/MaterialsLibrary.js | 59 ++++++++++++++++++++++++++++++ 1 file changed, 59 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 314a13bc..8f55f2bc 100755 --- a/js/helper-classes/RDGE/MaterialsLibrary.js +++ b/js/helper-classes/RDGE/MaterialsLibrary.js @@ -132,6 +132,25 @@ var MaterialsLibrary = Object.create(Object.prototype, { case "bumpMetal": mat = new BumpMetalMaterial(); break; case "uber": mat = new UberMaterial(); 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 "fly": mat = new FlyMaterial(); break; + case "water": mat = new WaterMaterial(); 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: throw new Error( "Unrecognized material type: " + type ); pu.advancePastToken( "endMaterial\n" ); @@ -163,9 +182,49 @@ var radialGradientMaterial = new RadialGradientMaterial(); var bumpMetalMaterial = new BumpMetalMaterial(); var uberMaterial = new UberMaterial(); +//var taperMaterial = new TaperMaterial(); +//var twistVertMaterial = new TwistVertMaterial(); +var radialBlurMaterial = new RadialBlurMaterial(); +var plasmaMaterial = new PlasmaMaterial(); +var pulseMaterial = new PulseMaterial(); +var tunnelMaterial = new TunnelMaterial(); +var reliefTunnelMaterial = new ReliefTunnelMaterial(); +var squareTunnelMaterial = new SquareTunnelMaterial(); +var flyMaterial = new FlyMaterial(); +var waterMaterial = new WaterMaterial(); +var zInvertMaterial = new ZInvertMaterial(); +var deformMaterial = new DeformMaterial(); +var starMaterial = new StarMaterial(); +var twistMaterial = new TwistMaterial(); +var juliaMaterial = new JuliaMaterial(); +var keleidoscopeMaterial = new KeleidoscopeMaterial(); +var mandelMaterial = new MandelMaterial(); + + MaterialsLibrary.addMaterial(flatMaterial); MaterialsLibrary.addMaterial(linearGradientMaterial); MaterialsLibrary.addMaterial(radialGradientMaterial); MaterialsLibrary.addMaterial(bumpMetalMaterial); MaterialsLibrary.addMaterial(uberMaterial); +//MaterialsLibrary.addMaterial(taperMaterial); +//MaterialsLibrary.addMaterial(twistVertMaterial); + +MaterialsLibrary.addMaterial(radialBlurMaterial); +MaterialsLibrary.addMaterial(plasmaMaterial); +MaterialsLibrary.addMaterial(pulseMaterial); +MaterialsLibrary.addMaterial(tunnelMaterial); +MaterialsLibrary.addMaterial(reliefTunnelMaterial); +MaterialsLibrary.addMaterial(squareTunnelMaterial); +MaterialsLibrary.addMaterial(flyMaterial); +MaterialsLibrary.addMaterial(waterMaterial); +MaterialsLibrary.addMaterial(zInvertMaterial); +MaterialsLibrary.addMaterial(deformMaterial); +MaterialsLibrary.addMaterial(starMaterial); +MaterialsLibrary.addMaterial(twistMaterial); +MaterialsLibrary.addMaterial(juliaMaterial); +MaterialsLibrary.addMaterial(keleidoscopeMaterial); +MaterialsLibrary.addMaterial(mandelMaterial); + + + -- cgit v1.2.3