diff options
author | Jose Antonio Marquez | 2012-03-06 11:18:30 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-06 11:18:30 -0800 |
commit | 3c4967fa93b3abc529fc404115707307ba72d5cd (patch) | |
tree | f3737db979727ee050f8b9c85ef994b0e6ddae27 /js/preloader/Preloader.js | |
parent | bee2df0d4da72677aaa2adae669ffdd4ac210dd6 (diff) | |
parent | 84332ab81c1b445195f1d9be8bbeae0725c8e758 (diff) | |
download | ninja-3c4967fa93b3abc529fc404115707307ba72d5cd.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/preloader/Preloader.js')
-rwxr-xr-x | js/preloader/Preloader.js | 104 |
1 files changed, 53 insertions, 51 deletions
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, { | |||
15 | ninjaJsRequire: { | 15 | ninjaJsRequire: { |
16 | value: | 16 | value: |
17 | [ | 17 | [ |
18 | {"type":"js", "url":"js/helper-classes/3D/GLMatrix/gl-matrix.js"}, | 18 | // {"type":"js", "url":"js/helper-classes/3D/GLMatrix/gl-matrix.js"}, |
19 | // {"type":"js", "url":"js/helper-classes/RDGE/rdge-compiled.js"}, | ||
20 | // {"type":"js", "url":"js/helper-classes/3D/ParseUtils.js"} | ||
19 | 21 | ||
20 | {"type":"js", "url":"js/helper-classes/RDGE/rdge-compiled.js"}, | 22 | // {"type":"js", "url":"js/helper-classes/RDGE/runtime/CanvasDataManager.js"}, |
23 | // {"type":"js", "url":"js/helper-classes/RDGE/runtime/GLRuntime.js"}, | ||
21 | 24 | ||
22 | // source RDGE | 25 | // source RDGE |
23 | /* | 26 | /* |
@@ -60,61 +63,60 @@ exports.Preloader = Montage.create(Component, { | |||
60 | {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/util/dbgpanel.js"}, | 63 | {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/util/dbgpanel.js"}, |
61 | */ | 64 | */ |
62 | 65 | ||
63 | {"type":"js", "url":"js/helper-classes/3D/ParseUtils.js"}, | 66 | |
64 | {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"}, | 67 | |
65 | {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.js"}, | 68 | |
66 | {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"}, | 69 | |
67 | 70 | // {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.js"}, | |
68 | {"type":"js", "url":"js/helper-classes/RDGE/runtime/CanvasDataManager.js"}, | 71 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, |
69 | {"type":"js", "url":"js/helper-classes/RDGE/runtime/GLRuntime.js"}, | 72 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/TaperMaterial.js"}, |
70 | 73 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistVertMaterial.js"}, | |
71 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, | 74 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"}, |
72 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/TaperMaterial.js"}, | 75 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"}, |
73 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistVertMaterial.js"}, | 76 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/LinearGradientMaterial.js"}, |
74 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"}, | 77 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, |
75 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"}, | 78 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialBlurMaterial.js"}, |
76 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/LinearGradientMaterial.js"}, | 79 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/PulseMaterial.js"}, |
77 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, | 80 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/TunnelMaterial.js"}, |
78 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialBlurMaterial.js"}, | 81 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js"}, |
79 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/PulseMaterial.js"}, | 82 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js"}, |
80 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/TunnelMaterial.js"}, | 83 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlyMaterial.js"}, |
81 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js"}, | 84 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/WaterMaterial.js"}, |
82 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js"}, | 85 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/ZInvertMaterial.js"}, |
83 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlyMaterial.js"}, | 86 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/DeformMaterial.js"}, |
84 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/WaterMaterial.js"}, | 87 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/StarMaterial.js"}, |
85 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/ZInvertMaterial.js"}, | 88 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistMaterial.js"}, |
86 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/DeformMaterial.js"}, | 89 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js"}, |
87 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/StarMaterial.js"}, | 90 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/JuliaMaterial.js"}, |
88 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistMaterial.js"}, | 91 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/MandelMaterial.js"}, |
89 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js"}, | 92 | // {"type":"js", "url":"js/helper-classes/RDGE/Materials/BumpMetalMaterial.js"}, |
90 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/JuliaMaterial.js"}, | 93 | // {"type":"js", "url":"js/helper-classes/RDGE/MaterialsLibrary.js"}, |
91 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/MandelMaterial.js"}, | 94 | // {"type":"js", "url":"js/helper-classes/3D/glUtils.js"}, |
92 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/BumpMetalMaterial.js"}, | 95 | // {"type":"js", "url":"js/helper-classes/RDGE/GLWorld.js"}, |
93 | 96 | // {"type":"js", "url":"js/helper-classes/RDGE/GLGeomObj.js"}, | |
94 | {"type":"js", "url":"js/helper-classes/RDGE/GLWorld.js"}, | 97 | // {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"}, |
95 | {"type":"js", "url":"js/helper-classes/RDGE/GLGeomObj.js"}, | 98 | // {"type":"js", "url":"js/helper-classes/RDGE/GLCircle.js"}, |
96 | {"type":"js", "url":"js/helper-classes/RDGE/GLCircle.js"}, | 99 | // {"type":"js", "url":"js/helper-classes/RDGE/GLRectangle.js"}, |
97 | {"type":"js", "url":"js/helper-classes/RDGE/GLRectangle.js"}, | 100 | // {"type":"js", "url":"js/helper-classes/RDGE/GLPath.js"}, // Not USED |
98 | {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"}, | 101 | // {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"}, Not used anywhere. |
99 | {"type":"js", "url":"js/helper-classes/RDGE/GLPath.js"}, | 102 | // {"type":"js", "url": "js/helper-classes/RDGE/GLAnchorPoint.js" }, |
100 | {"type":"js", "url": "js/helper-classes/RDGE/GLAnchorPoint.js" }, | 103 | // {"type":"js", "url": "js/helper-classes/RDGE/GLSubpath.js" }, |
101 | {"type":"js", "url": "js/helper-classes/RDGE/GLSubpath.js" }, | 104 | // {"type":"js", "url": "js/helper-classes/RDGE/GLBrushStroke.js" }, |
102 | {"type":"js", "url": "js/helper-classes/RDGE/GLBrushStroke.js" }, | 105 | |
103 | {"type":"js", "url":"js/helper-classes/RDGE/precompiled.js"}, | 106 | // {"type":"js", "url":"js/helper-classes/RDGE/precompiled.js"}, // Why are why adding an empty file? |
104 | {"type":"js", "url":"js/helper-classes/RDGE/MaterialsLibrary.js"}, | 107 | |
105 | {"type":"js", "url":"js/helper-classes/3D/glUtils.js"}, | 108 | // {"type":"js", "url": codeMirrorPath + "/lib/codemirror.js"}, |
106 | {"type":"js", "url": codeMirrorPath + "/lib/codemirror.js"}, | 109 | // {"type":"js", "url": codeMirrorPath + "/mode/htmlmixed/htmlmixed.js"}, |
107 | {"type":"js", "url": codeMirrorPath + "/mode/htmlmixed/htmlmixed.js"}, | 110 | // {"type":"js", "url": codeMirrorPath + "/mode/xml/xml.js"}, |
108 | {"type":"js", "url": codeMirrorPath + "/mode/xml/xml.js"}, | 111 | // {"type":"js", "url": codeMirrorPath + "/mode/javascript/javascript.js"}, |
109 | {"type":"js", "url": codeMirrorPath + "/mode/javascript/javascript.js"}, | 112 | // {"type":"js", "url": codeMirrorPath + "/mode/css/css.js"} |
110 | {"type":"js", "url": codeMirrorPath + "/mode/css/css.js"} | ||
111 | ] | 113 | ] |
112 | }, | 114 | }, |
113 | 115 | ||
114 | ninjaCssRequire: { | 116 | ninjaCssRequire: { |
115 | value: | 117 | value: |
116 | [ | 118 | [ |
117 | {"type":"css", "url": codeMirrorPath + "/lib/codemirror.css"} | 119 | // {"type":"css", "url": codeMirrorPath + "/lib/codemirror.css"} |
118 | ] | 120 | ] |
119 | }, | 121 | }, |
120 | 122 | ||