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/preloader/Preloader.js | 16 ++++++++-------- js/preloader/PreloaderWorker.js | 0 2 files changed, 8 insertions(+), 8 deletions(-) mode change 100644 => 100755 js/preloader/PreloaderWorker.js (limited to 'js/preloader') diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js index f137f4b6..41768cfa 100755 --- a/js/preloader/Preloader.js +++ b/js/preloader/Preloader.js @@ -8,14 +8,14 @@ var Montage = require("montage/core/core").Montage, Component = require("montage/ui/component").Component, defaultEventManager = require("montage/core/event/event-manager").defaultEventManager; -exports.Preloader = Montage.create(Component, { +var codeMirrorPath = "imports/codemirror"; +exports.Preloader = Montage.create(Component, { ninjaJsRequire: { value: [ {"type":"js", "url":"js/helper-classes/3D/GLMatrix/gl-matrix.js"}, - {"type":"js", "url":"js/codemirror/lib/codemirror.js"}, //{"type":"js", "url":"js/helper-classes/RDGE/rdge-compiled.js"}, @@ -91,18 +91,18 @@ exports.Preloader = Montage.create(Component, { {"type":"js", "url":"js/helper-classes/RDGE/precompiled.js"}, {"type":"js", "url":"js/helper-classes/RDGE/MaterialsLibrary.js"}, {"type":"js", "url":"js/helper-classes/3D/glUtils.js"}, - {"type":"js", "url":"js/codemirror/mode/htmlmixed/htmlmixed.js"}, - {"type":"js", "url":"js/codemirror/mode/xml/xml.js"}, - {"type":"js", "url":"js/codemirror/mode/javascript/javascript.js"}, - {"type":"js", "url":"js/codemirror/mode/css/css.js"} + {"type":"js", "url": codeMirrorPath + "/lib/codemirror.js"}, + {"type":"js", "url": codeMirrorPath + "/mode/htmlmixed/htmlmixed.js"}, + {"type":"js", "url": codeMirrorPath + "/mode/xml/xml.js"}, + {"type":"js", "url": codeMirrorPath + "/mode/javascript/javascript.js"}, + {"type":"js", "url": codeMirrorPath + "/mode/css/css.js"} ] }, ninjaCssRequire: { value: [ - {"type":"css", "url":"js/codemirror/lib/codemirror.css"}, - {"type":"css", "url":"js/codemirror/theme/default.css"} + {"type":"css", "url": codeMirrorPath + "/lib/codemirror.css"} ] }, diff --git a/js/preloader/PreloaderWorker.js b/js/preloader/PreloaderWorker.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/preloader/Preloader.js | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'js/preloader') diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js index 42460093..929e4ef4 100755 --- a/js/preloader/Preloader.js +++ b/js/preloader/Preloader.js @@ -17,10 +17,10 @@ exports.Preloader = Montage.create(Component, { {"type":"js", "url":"js/helper-classes/3D/GLMatrix/gl-matrix.js"}, {"type":"js", "url":"js/codemirror/lib/codemirror.js"}, - //{"type":"js", "url":"js/helper-classes/RDGE/rdge-compiled.js"}, + {"type":"js", "url":"js/helper-classes/RDGE/rdge-compiled.js"}, // source RDGE - /* */ + /* {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/math/vec2.js"}, {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/math/vec3.js"}, {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/math/vec4.js"}, @@ -58,26 +58,15 @@ exports.Preloader = Montage.create(Component, { {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/init_state.js"}, {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/runtime.js"}, {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/util/dbgpanel.js"}, - /* */ + */ {"type":"js", "url":"js/helper-classes/3D/ParseUtils.js"}, {"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/BrickMaterial.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/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/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/IridescentScalesMaterial.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/BumpMetalMaterial.js"}, {"type":"js", "url":"js/helper-classes/RDGE/GLWorld.js"}, -- 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/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