aboutsummaryrefslogtreecommitdiff
path: root/js/preloader/Preloader.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-23 00:34:37 -0800
committerValerio Virgillito2012-02-23 00:34:37 -0800
commit3675cac3993430490d9eef18157314d53ffa1a6a (patch)
treefb225a6d8fc3c983c96b1507483d628909dc8c1e /js/preloader/Preloader.js
parent2afef244a3f8124f8a049e504e9782c05904ce23 (diff)
parent3730bbc7cc5d5f07b3d788885475a8f9810b480e (diff)
downloadninja-3675cac3993430490d9eef18157314d53ffa1a6a.tar.gz
Merge pull request #60 from mqg734/WebGLMaterials
Integrating WebGL and canvas-2d drawing fixes. Fixed Materials Editor Popup to work with latest Montage framework. Also adding back WebGL materials.
Diffstat (limited to 'js/preloader/Preloader.js')
-rwxr-xr-xjs/preloader/Preloader.js21
1 files changed, 20 insertions, 1 deletions
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, {
64 {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"}, 64 {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"},
65 {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.js"}, 65 {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.js"},
66 {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"}, 66 {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"},
67
67 {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, 68 {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"},
69 {"type":"js", "url":"js/helper-classes/RDGE/Materials/TaperMaterial.js"},
70 {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistVertMaterial.js"},
68 {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"}, 71 {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"},
69 {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, 72 {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"},
70 {"type":"js", "url":"js/helper-classes/RDGE/Materials/LinearGradientMaterial.js"}, 73 {"type":"js", "url":"js/helper-classes/RDGE/Materials/LinearGradientMaterial.js"},
74 {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"},
75 {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialBlurMaterial.js"},
76 {"type":"js", "url":"js/helper-classes/RDGE/Materials/PulseMaterial.js"},
77 {"type":"js", "url":"js/helper-classes/RDGE/Materials/TunnelMaterial.js"},
78 {"type":"js", "url":"js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js"},
79 {"type":"js", "url":"js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js"},
80 {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlyMaterial.js"},
81 {"type":"js", "url":"js/helper-classes/RDGE/Materials/WaterMaterial.js"},
82 {"type":"js", "url":"js/helper-classes/RDGE/Materials/ZInvertMaterial.js"},
83 {"type":"js", "url":"js/helper-classes/RDGE/Materials/DeformMaterial.js"},
84 {"type":"js", "url":"js/helper-classes/RDGE/Materials/StarMaterial.js"},
85 {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistMaterial.js"},
86 {"type":"js", "url":"js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js"},
87 {"type":"js", "url":"js/helper-classes/RDGE/Materials/JuliaMaterial.js"},
88 {"type":"js", "url":"js/helper-classes/RDGE/Materials/MandelMaterial.js"},
71 {"type":"js", "url":"js/helper-classes/RDGE/Materials/BumpMetalMaterial.js"}, 89 {"type":"js", "url":"js/helper-classes/RDGE/Materials/BumpMetalMaterial.js"},
90
72 {"type":"js", "url":"js/helper-classes/RDGE/GLWorld.js"}, 91 {"type":"js", "url":"js/helper-classes/RDGE/GLWorld.js"},
73 {"type":"js", "url":"js/helper-classes/RDGE/GLGeomObj.js"}, 92 {"type":"js", "url":"js/helper-classes/RDGE/GLGeomObj.js"},
74 {"type":"js", "url":"js/helper-classes/RDGE/GLCircle.js"}, 93 {"type":"js", "url":"js/helper-classes/RDGE/GLCircle.js"},