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/preloader/Preloader.js | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'js/preloader') diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js index 13ebbdbd..21d7fcee 100755 --- a/js/preloader/Preloader.js +++ b/js/preloader/Preloader.js @@ -64,11 +64,30 @@ exports.Preloader = Montage.create(Component, { {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"}, {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.js"}, {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/TaperMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistVertMaterial.js"}, {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"}, {"type":"js", "url":"js/helper-classes/RDGE/Materials/LinearGradientMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialBlurMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/PulseMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/TunnelMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlyMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/WaterMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/ZInvertMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/DeformMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/StarMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/JuliaMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/MandelMaterial.js"}, {"type":"js", "url":"js/helper-classes/RDGE/Materials/BumpMetalMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/GLWorld.js"}, {"type":"js", "url":"js/helper-classes/RDGE/GLGeomObj.js"}, {"type":"js", "url":"js/helper-classes/RDGE/GLCircle.js"}, -- 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/preloader/Preloader.js | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'js/preloader') diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js index 21d7fcee..13ebbdbd 100755 --- a/js/preloader/Preloader.js +++ b/js/preloader/Preloader.js @@ -64,30 +64,11 @@ exports.Preloader = Montage.create(Component, { {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"}, {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.js"}, {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/TaperMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistVertMaterial.js"}, {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/LinearGradientMaterial.js"}, {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialBlurMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/PulseMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/TunnelMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlyMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/WaterMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/ZInvertMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/DeformMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/StarMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/JuliaMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/MandelMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/LinearGradientMaterial.js"}, {"type":"js", "url":"js/helper-classes/RDGE/Materials/BumpMetalMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/GLWorld.js"}, {"type":"js", "url":"js/helper-classes/RDGE/GLGeomObj.js"}, {"type":"js", "url":"js/helper-classes/RDGE/GLCircle.js"}, -- 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/preloader/Preloader.js | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'js/preloader') diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js index 13ebbdbd..21d7fcee 100755 --- a/js/preloader/Preloader.js +++ b/js/preloader/Preloader.js @@ -64,11 +64,30 @@ exports.Preloader = Montage.create(Component, { {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"}, {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.js"}, {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/TaperMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistVertMaterial.js"}, {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"}, {"type":"js", "url":"js/helper-classes/RDGE/Materials/LinearGradientMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialBlurMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/PulseMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/TunnelMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlyMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/WaterMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/ZInvertMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/DeformMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/StarMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/JuliaMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/Materials/MandelMaterial.js"}, {"type":"js", "url":"js/helper-classes/RDGE/Materials/BumpMetalMaterial.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/GLWorld.js"}, {"type":"js", "url":"js/helper-classes/RDGE/GLGeomObj.js"}, {"type":"js", "url":"js/helper-classes/RDGE/GLCircle.js"}, -- cgit v1.2.3