From 84332ab81c1b445195f1d9be8bbeae0725c8e758 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 6 Mar 2012 10:58:25 -0800 Subject: Squashed commit of preload-fix into Master - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito --- js/preloader/Preloader.js | 104 +++++++++++++++++++++++----------------------- 1 file changed, 53 insertions(+), 51 deletions(-) (limited to 'js/preloader') diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js index 5b806909..b584cb76 100755 --- a/js/preloader/Preloader.js +++ b/js/preloader/Preloader.js @@ -15,9 +15,12 @@ exports.Preloader = Montage.create(Component, { ninjaJsRequire: { value: [ - {"type":"js", "url":"js/helper-classes/3D/GLMatrix/gl-matrix.js"}, +// {"type":"js", "url":"js/helper-classes/3D/GLMatrix/gl-matrix.js"}, +// {"type":"js", "url":"js/helper-classes/RDGE/rdge-compiled.js"}, +// {"type":"js", "url":"js/helper-classes/3D/ParseUtils.js"} - {"type":"js", "url":"js/helper-classes/RDGE/rdge-compiled.js"}, +// {"type":"js", "url":"js/helper-classes/RDGE/runtime/CanvasDataManager.js"}, +// {"type":"js", "url":"js/helper-classes/RDGE/runtime/GLRuntime.js"}, // source RDGE /* @@ -60,61 +63,60 @@ exports.Preloader = Montage.create(Component, { {"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/runtime/CanvasDataManager.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/runtime/GLRuntime.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/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"}, - {"type":"js", "url":"js/helper-classes/RDGE/GLRectangle.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"}, - {"type":"js", "url":"js/helper-classes/RDGE/GLPath.js"}, - {"type":"js", "url": "js/helper-classes/RDGE/GLAnchorPoint.js" }, - {"type":"js", "url": "js/helper-classes/RDGE/GLSubpath.js" }, - {"type":"js", "url": "js/helper-classes/RDGE/GLBrushStroke.js" }, - {"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": 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"} + + + + +// {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.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/BumpMetalMaterial.js"}, +// {"type":"js", "url":"js/helper-classes/RDGE/MaterialsLibrary.js"}, +// {"type":"js", "url":"js/helper-classes/3D/glUtils.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/GLLine.js"}, +// {"type":"js", "url":"js/helper-classes/RDGE/GLCircle.js"}, +// {"type":"js", "url":"js/helper-classes/RDGE/GLRectangle.js"}, +// {"type":"js", "url":"js/helper-classes/RDGE/GLPath.js"}, // Not USED +// {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"}, Not used anywhere. +// {"type":"js", "url": "js/helper-classes/RDGE/GLAnchorPoint.js" }, +// {"type":"js", "url": "js/helper-classes/RDGE/GLSubpath.js" }, +// {"type":"js", "url": "js/helper-classes/RDGE/GLBrushStroke.js" }, + +// {"type":"js", "url":"js/helper-classes/RDGE/precompiled.js"}, // Why are why adding an empty file? + +// {"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": codeMirrorPath + "/lib/codemirror.css"} +// {"type":"css", "url": codeMirrorPath + "/lib/codemirror.css"} ] }, -- cgit v1.2.3