diff options
author | Valerio Virgillito | 2012-02-10 16:19:54 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-10 16:19:54 -0800 |
commit | 344933fd505afb9f5dfa3be8cc959112df04da0a (patch) | |
tree | e0fd4bbc44b96909d7619593b29d9b063209a7ce /js/preloader | |
parent | 48977780443d97b9e97b047066639c9056788041 (diff) | |
parent | de65f73c0f129a26aa9007b69e8fce31d0e92d00 (diff) | |
download | ninja-344933fd505afb9f5dfa3be8cc959112df04da0a.tar.gz |
Merge pull request #31 from mqg734/WebGLFixes
Merging WebGL fixes
Diffstat (limited to 'js/preloader')
-rwxr-xr-x | js/preloader/Preloader.js | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js index d735af0b..929e4ef4 100755 --- a/js/preloader/Preloader.js +++ b/js/preloader/Preloader.js | |||
@@ -17,10 +17,10 @@ exports.Preloader = Montage.create(Component, { | |||
17 | {"type":"js", "url":"js/helper-classes/3D/GLMatrix/gl-matrix.js"}, | 17 | {"type":"js", "url":"js/helper-classes/3D/GLMatrix/gl-matrix.js"}, |
18 | {"type":"js", "url":"js/codemirror/lib/codemirror.js"}, | 18 | {"type":"js", "url":"js/codemirror/lib/codemirror.js"}, |
19 | 19 | ||
20 | //{"type":"js", "url":"js/helper-classes/RDGE/rdge-compiled.js"}, | 20 | {"type":"js", "url":"js/helper-classes/RDGE/rdge-compiled.js"}, |
21 | 21 | ||
22 | // source RDGE | 22 | // source RDGE |
23 | /* */ | 23 | /* |
24 | {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/math/vec2.js"}, | 24 | {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/math/vec2.js"}, |
25 | {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/math/vec3.js"}, | 25 | {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/math/vec3.js"}, |
26 | {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/math/vec4.js"}, | 26 | {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/math/vec4.js"}, |
@@ -58,7 +58,7 @@ exports.Preloader = Montage.create(Component, { | |||
58 | {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/init_state.js"}, | 58 | {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/init_state.js"}, |
59 | {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/runtime.js"}, | 59 | {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/runtime.js"}, |
60 | {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/util/dbgpanel.js"}, | 60 | {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/util/dbgpanel.js"}, |
61 | /* */ | 61 | */ |
62 | 62 | ||
63 | {"type":"js", "url":"js/helper-classes/3D/ParseUtils.js"}, | 63 | {"type":"js", "url":"js/helper-classes/3D/ParseUtils.js"}, |
64 | {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"}, | 64 | {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"}, |
@@ -66,17 +66,7 @@ exports.Preloader = Montage.create(Component, { | |||
66 | {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"}, | 66 | {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"}, |
67 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, | 67 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, |
68 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"}, | 68 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"}, |
69 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"}, | ||
70 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, | 69 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, |
71 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialBlurMaterial.js"}, | ||
72 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/PulseMaterial.js"}, | ||
73 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/TunnelMaterial.js"}, | ||
74 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistMaterial.js"}, | ||
75 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js"}, | ||
76 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/JuliaMaterial.js"}, | ||
77 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/MandelMaterial.js"}, | ||
78 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js"}, | ||
79 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"}, | ||
80 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/LinearGradientMaterial.js"}, | 70 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/LinearGradientMaterial.js"}, |
81 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/BumpMetalMaterial.js"}, | 71 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/BumpMetalMaterial.js"}, |
82 | {"type":"js", "url":"js/helper-classes/RDGE/GLWorld.js"}, | 72 | {"type":"js", "url":"js/helper-classes/RDGE/GLWorld.js"}, |