aboutsummaryrefslogtreecommitdiff
path: root/js/preloader
diff options
context:
space:
mode:
authorhwc4872012-03-06 16:03:26 -0800
committerhwc4872012-03-06 16:03:26 -0800
commit855e8727b147771ff7b05e71bed481e65fe4b6b0 (patch)
tree60d7f091fcf0870495aeaa63748492dbd558619d /js/preloader
parent1207735f05f202b5bdc5f70c73445f8e0934a227 (diff)
parent4f498b43264327f5886e0370bd3536453d47570a (diff)
downloadninja-855e8727b147771ff7b05e71bed481e65fe4b6b0.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts: js/preloader/Preloader.js
Diffstat (limited to 'js/preloader')
-rwxr-xr-xjs/preloader/Preloader.js100
1 files changed, 51 insertions, 49 deletions
diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js
index 63db0a93..feda2569 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,63 +63,62 @@ 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"},
64 {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"},
65 {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.js"},
66 {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"},
67 66
68 {"type":"js", "url":"js/helper-classes/RDGE/runtime/CanvasDataManager.js"},
69 {"type":"js", "url":"js/helper-classes/RDGE/runtime/GLRuntime.js"},
70 {"type":"js", "url":"js/helper-classes/RDGE/runtime/RuntimeGeomObj.js"}, 67 {"type":"js", "url":"js/helper-classes/RDGE/runtime/RuntimeGeomObj.js"},
71 {"type":"js", "url":"js/helper-classes/RDGE/runtime/RuntimeMaterial.js"}, 68 {"type":"js", "url":"js/helper-classes/RDGE/runtime/RuntimeMaterial.js"},
72 69
73 {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, 70
74 {"type":"js", "url":"js/helper-classes/RDGE/Materials/TaperMaterial.js"}, 71
75 {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistVertMaterial.js"}, 72// {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.js"},
76 {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"}, 73// {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"},
77 {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"}, 74// {"type":"js", "url":"js/helper-classes/RDGE/Materials/TaperMaterial.js"},
78 {"type":"js", "url":"js/helper-classes/RDGE/Materials/LinearGradientMaterial.js"}, 75// {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistVertMaterial.js"},
79 {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, 76// {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"},
80 {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialBlurMaterial.js"}, 77// {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"},
81 {"type":"js", "url":"js/helper-classes/RDGE/Materials/PulseMaterial.js"}, 78// {"type":"js", "url":"js/helper-classes/RDGE/Materials/LinearGradientMaterial.js"},
82 {"type":"js", "url":"js/helper-classes/RDGE/Materials/TunnelMaterial.js"}, 79// {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"},
83 {"type":"js", "url":"js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js"}, 80// {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialBlurMaterial.js"},
84 {"type":"js", "url":"js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js"}, 81// {"type":"js", "url":"js/helper-classes/RDGE/Materials/PulseMaterial.js"},
85 {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlyMaterial.js"}, 82// {"type":"js", "url":"js/helper-classes/RDGE/Materials/TunnelMaterial.js"},
86 {"type":"js", "url":"js/helper-classes/RDGE/Materials/WaterMaterial.js"}, 83// {"type":"js", "url":"js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js"},
87 {"type":"js", "url":"js/helper-classes/RDGE/Materials/ZInvertMaterial.js"}, 84// {"type":"js", "url":"js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js"},
88 {"type":"js", "url":"js/helper-classes/RDGE/Materials/DeformMaterial.js"}, 85// {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlyMaterial.js"},
89 {"type":"js", "url":"js/helper-classes/RDGE/Materials/StarMaterial.js"}, 86// {"type":"js", "url":"js/helper-classes/RDGE/Materials/WaterMaterial.js"},
90 {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistMaterial.js"}, 87// {"type":"js", "url":"js/helper-classes/RDGE/Materials/ZInvertMaterial.js"},
91 {"type":"js", "url":"js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js"}, 88// {"type":"js", "url":"js/helper-classes/RDGE/Materials/DeformMaterial.js"},
92 {"type":"js", "url":"js/helper-classes/RDGE/Materials/JuliaMaterial.js"}, 89// {"type":"js", "url":"js/helper-classes/RDGE/Materials/StarMaterial.js"},
93 {"type":"js", "url":"js/helper-classes/RDGE/Materials/MandelMaterial.js"}, 90// {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistMaterial.js"},
94 {"type":"js", "url":"js/helper-classes/RDGE/Materials/BumpMetalMaterial.js"}, 91// {"type":"js", "url":"js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js"},
95 92// {"type":"js", "url":"js/helper-classes/RDGE/Materials/JuliaMaterial.js"},
96 {"type":"js", "url":"js/helper-classes/RDGE/GLWorld.js"}, 93// {"type":"js", "url":"js/helper-classes/RDGE/Materials/MandelMaterial.js"},
97 {"type":"js", "url":"js/helper-classes/RDGE/GLGeomObj.js"}, 94// {"type":"js", "url":"js/helper-classes/RDGE/Materials/BumpMetalMaterial.js"},
98 {"type":"js", "url":"js/helper-classes/RDGE/GLCircle.js"}, 95// {"type":"js", "url":"js/helper-classes/RDGE/MaterialsLibrary.js"},
99 {"type":"js", "url":"js/helper-classes/RDGE/GLRectangle.js"}, 96// {"type":"js", "url":"js/helper-classes/3D/glUtils.js"},
100 {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"}, 97// {"type":"js", "url":"js/helper-classes/RDGE/GLWorld.js"},
101 {"type":"js", "url":"js/helper-classes/RDGE/GLPath.js"}, 98// {"type":"js", "url":"js/helper-classes/RDGE/GLGeomObj.js"},
102 {"type":"js", "url": "js/helper-classes/RDGE/GLAnchorPoint.js" }, 99// {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"},
103 {"type":"js", "url": "js/helper-classes/RDGE/GLSubpath.js" }, 100// {"type":"js", "url":"js/helper-classes/RDGE/GLCircle.js"},
104 {"type":"js", "url": "js/helper-classes/RDGE/GLBrushStroke.js" }, 101// {"type":"js", "url":"js/helper-classes/RDGE/GLRectangle.js"},
105 {"type":"js", "url":"js/helper-classes/RDGE/precompiled.js"}, 102// {"type":"js", "url":"js/helper-classes/RDGE/GLPath.js"}, // Not USED
106 {"type":"js", "url":"js/helper-classes/RDGE/MaterialsLibrary.js"}, 103// {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"}, Not used anywhere.
107 {"type":"js", "url":"js/helper-classes/3D/glUtils.js"}, 104// {"type":"js", "url": "js/helper-classes/RDGE/GLAnchorPoint.js" },
108 {"type":"js", "url": codeMirrorPath + "/lib/codemirror.js"}, 105// {"type":"js", "url": "js/helper-classes/RDGE/GLSubpath.js" },
109 {"type":"js", "url": codeMirrorPath + "/mode/htmlmixed/htmlmixed.js"}, 106// {"type":"js", "url": "js/helper-classes/RDGE/GLBrushStroke.js" },
110 {"type":"js", "url": codeMirrorPath + "/mode/xml/xml.js"}, 107
111 {"type":"js", "url": codeMirrorPath + "/mode/javascript/javascript.js"}, 108// {"type":"js", "url":"js/helper-classes/RDGE/precompiled.js"}, // Why are why adding an empty file?
112 {"type":"js", "url": codeMirrorPath + "/mode/css/css.js"} 109
110// {"type":"js", "url": codeMirrorPath + "/lib/codemirror.js"},
111// {"type":"js", "url": codeMirrorPath + "/mode/htmlmixed/htmlmixed.js"},
112// {"type":"js", "url": codeMirrorPath + "/mode/xml/xml.js"},
113// {"type":"js", "url": codeMirrorPath + "/mode/javascript/javascript.js"},
114// {"type":"js", "url": codeMirrorPath + "/mode/css/css.js"}
113 ] 115 ]
114 }, 116 },
115 117
116 ninjaCssRequire: { 118 ninjaCssRequire: {
117 value: 119 value:
118 [ 120 [
119 {"type":"css", "url": codeMirrorPath + "/lib/codemirror.css"} 121// {"type":"css", "url": codeMirrorPath + "/lib/codemirror.css"}
120 ] 122 ]
121 }, 123 },
122 124
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 18:31:39 +0000