aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-06 10:58:25 -0800
committerValerio Virgillito2012-03-06 10:58:25 -0800
commit84332ab81c1b445195f1d9be8bbeae0725c8e758 (patch)
treee322baa1f98d4507ec255279198fa2284b2dff3c
parent13f52cf0c74f53a919fa864f86669e8155f82961 (diff)
downloadninja-84332ab81c1b445195f1d9be8bbeae0725c8e758.tar.gz
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 <valerio@motorola.com>
-rwxr-xr-xindex.html16
-rwxr-xr-xjs/controllers/elements/shapes-controller.js17
-rwxr-xr-xjs/helper-classes/3D/Rectangle.js2
-rwxr-xr-xjs/helper-classes/3D/StageLine.js8
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js2
-rwxr-xr-xjs/helper-classes/3D/element-planes.js2
-rwxr-xr-xjs/helper-classes/3D/math-utils.js54
-rwxr-xr-xjs/helper-classes/3D/snap-2d-record.js2
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js46
-rwxr-xr-xjs/helper-classes/3D/vec-utils.js16
-rwxr-xr-xjs/helper-classes/3D/view-utils.js12
-rwxr-xr-xjs/helper-classes/backup-delete/GLAnchorPoint.js (renamed from js/helper-classes/RDGE/GLAnchorPoint.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/GLBrushStroke.js (renamed from js/helper-classes/RDGE/GLBrushStroke.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/GLCircle.js (renamed from js/helper-classes/RDGE/GLCircle.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/GLGeomObj.js (renamed from js/helper-classes/RDGE/GLGeomObj.js)4
-rwxr-xr-xjs/helper-classes/backup-delete/GLLight.js (renamed from js/helper-classes/RDGE/GLLight.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/GLLine.js (renamed from js/helper-classes/RDGE/GLLine.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/GLMaterial.js (renamed from js/helper-classes/RDGE/GLMaterial.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/GLPath.js (renamed from js/helper-classes/RDGE/GLPath.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/GLRectangle.js (renamed from js/helper-classes/RDGE/GLRectangle.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/GLSubpath.js (renamed from js/helper-classes/RDGE/GLSubpath.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/GLWorld.js (renamed from js/helper-classes/RDGE/GLWorld.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/BumpMetalMaterial.js (renamed from js/helper-classes/RDGE/Materials/BumpMetalMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/DeformMaterial.js (renamed from js/helper-classes/RDGE/Materials/DeformMaterial.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/FlatMaterial.js (renamed from js/helper-classes/RDGE/Materials/FlatMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/FlyMaterial.js (renamed from js/helper-classes/RDGE/Materials/FlyMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/JuliaMaterial.js (renamed from js/helper-classes/RDGE/Materials/JuliaMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/KeleidoscopeMaterial.js (renamed from js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/LinearGradientMaterial.js (renamed from js/helper-classes/RDGE/Materials/LinearGradientMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/MandelMaterial.js (renamed from js/helper-classes/RDGE/Materials/MandelMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/PlasmaMaterial.js (renamed from js/helper-classes/RDGE/Materials/PlasmaMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/PulseMaterial.js (renamed from js/helper-classes/RDGE/Materials/PulseMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js (renamed from js/helper-classes/RDGE/Materials/RadialBlurMaterial.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/RadialGradientMaterial.js (renamed from js/helper-classes/RDGE/Materials/RadialGradientMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/ReliefTunnelMaterial.js (renamed from js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js (renamed from js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/StarMaterial.js (renamed from js/helper-classes/RDGE/Materials/StarMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/TaperMaterial.js (renamed from js/helper-classes/RDGE/Materials/TaperMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/TunnelMaterial.js (renamed from js/helper-classes/RDGE/Materials/TunnelMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/TwistMaterial.js (renamed from js/helper-classes/RDGE/Materials/TwistMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/TwistVertMaterial.js (renamed from js/helper-classes/RDGE/Materials/TwistVertMaterial.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/UberMaterial.js (renamed from js/helper-classes/RDGE/Materials/UberMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/WaterMaterial.js (renamed from js/helper-classes/RDGE/Materials/WaterMaterial.js)0
-rw-r--r--js/helper-classes/backup-delete/Materials/ZInvertMaterial.js (renamed from js/helper-classes/RDGE/Materials/ZInvertMaterial.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/MaterialsLibrary.js (renamed from js/helper-classes/RDGE/MaterialsLibrary.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/ParseUtils.js (renamed from js/helper-classes/3D/ParseUtils.js)0
-rwxr-xr-xjs/helper-classes/backup-delete/glUtils.js (renamed from js/helper-classes/3D/glUtils.js)0
-rwxr-xr-xjs/lib/drawing/world.js917
-rwxr-xr-xjs/lib/geom/anchor-point.js242
-rwxr-xr-xjs/lib/geom/brush-stroke.js482
-rwxr-xr-xjs/lib/geom/circle.js751
-rwxr-xr-xjs/lib/geom/geom-obj.js280
-rwxr-xr-xjs/lib/geom/line.js488
-rwxr-xr-xjs/lib/geom/rectangle.js1165
-rw-r--r--js/lib/geom/shape-primitive.js54
-rwxr-xr-xjs/lib/geom/sub-path.js1288
-rwxr-xr-xjs/lib/math/matrix.js104
-rwxr-xr-xjs/lib/rdge/materials/bump-metal-material.js314
-rw-r--r--js/lib/rdge/materials/deform-material.js127
-rwxr-xr-xjs/lib/rdge/materials/flat-material.js159
-rw-r--r--js/lib/rdge/materials/fly-material.js119
-rw-r--r--js/lib/rdge/materials/julia-material.js136
-rw-r--r--js/lib/rdge/materials/keleidoscope-material.js144
-rwxr-xr-xjs/lib/rdge/materials/linear-gradient-material.js434
-rw-r--r--js/lib/rdge/materials/mandel-material.js147
-rwxr-xr-xjs/lib/rdge/materials/material-parser.js73
-rwxr-xr-xjs/lib/rdge/materials/material.js346
-rw-r--r--js/lib/rdge/materials/plasma-material.js132
-rw-r--r--js/lib/rdge/materials/pulse-material.js258
-rw-r--r--js/lib/rdge/materials/radial-blur-material.js244
-rwxr-xr-xjs/lib/rdge/materials/radial-gradient-material.js351
-rw-r--r--js/lib/rdge/materials/relief-tunnel-material.js122
-rw-r--r--js/lib/rdge/materials/square-tunnel-material.js120
-rw-r--r--js/lib/rdge/materials/star-material.js124
-rw-r--r--js/lib/rdge/materials/taper-material.js223
-rw-r--r--js/lib/rdge/materials/tunnel-material.js125
-rw-r--r--js/lib/rdge/materials/twist-material.js139
-rw-r--r--js/lib/rdge/materials/twist-vert-material.js248
-rwxr-xr-xjs/lib/rdge/materials/uber-material.js614
-rw-r--r--js/lib/rdge/materials/water-material.js126
-rw-r--r--js/lib/rdge/materials/z-invert-material.js125
-rwxr-xr-xjs/models/materials-model.js225
-rwxr-xr-xjs/models/properties-3d.js24
-rwxr-xr-xjs/ninja.reel/ninja.html11
-rwxr-xr-xjs/ninja.reel/ninja.js30
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js3
-rwxr-xr-xjs/preloader/Preloader.js104
-rwxr-xr-xjs/stage/stage-deps.js4
-rwxr-xr-xjs/stage/tool-handle.js60
-rw-r--r--js/tools/BrushTool.js6
-rwxr-xr-xjs/tools/LineTool.js7
-rwxr-xr-xjs/tools/OvalTool.js9
-rwxr-xr-xjs/tools/PenTool.js25
-rwxr-xr-xjs/tools/RectTool.js9
-rwxr-xr-xjs/tools/ShapeTool.js4
-rwxr-xr-xjs/tools/drawing-tool-base.js18
96 files changed, 11182 insertions, 259 deletions
diff --git a/index.html b/index.html
index 30d6aea7..d385e4ba 100755
--- a/index.html
+++ b/index.html
@@ -18,8 +18,9 @@
18 <meta http-equiv="Expires" content="0" /> 18 <meta http-equiv="Expires" content="0" />
19 19
20 <link rel="icon" href="images/favicon.png" sizes="16x16"> 20 <link rel="icon" href="images/favicon.png" sizes="16x16">
21 21
22 <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700|Droid+Sans+Mono' rel='stylesheet' type='text/css'> 22 <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700|Droid+Sans+Mono' rel='stylesheet' type='text/css'>
23 <link href="imports/codemirror/lib/codemirror.css" rel="stylesheet" type="text/css"/>
23 24
24 <style type="text/css"> 25 <style type="text/css">
25 html, body 26 html, body
@@ -174,6 +175,15 @@
174 }; 175 };
175 </script> 176 </script>
176 177
178 <script type="text/javascript" src="js/helper-classes/3D/GLMatrix/gl-matrix.js"></script>
179 <script type="text/javascript" src="js/helper-classes/RDGE/rdge-compiled.js"></script>
180
181 <script type="text/javascript" src="imports/codemirror/lib/codemirror.js"></script>
182 <script type="text/javascript" src="imports/codemirror/mode/htmlmixed/htmlmixed.js"></script>
183 <script type="text/javascript" src="imports/codemirror/mode/xml/xml.js"></script>
184 <script type="text/javascript" src="imports/codemirror/mode/javascript/javascript.js"></script>
185 <script type="text/javascript" src="imports/codemirror/mode/css/css.js"></script>
186
177 <script type="text/javascript" src="node_modules/montage/montage.js"></script> 187 <script type="text/javascript" src="node_modules/montage/montage.js"></script>
178 188
179 <script type="text/montage-serialization"> 189 <script type="text/montage-serialization">
@@ -184,7 +194,7 @@
184 "properties": { 194 "properties": {
185 "mainModule": "js/ninja.reel", 195 "mainModule": "js/ninja.reel",
186 "mainName": "Ninja", 196 "mainName": "Ninja",
187 "minimumBootstrappingDuration": 4000 197 "minimumBootstrappingDuration": 3000
188 } 198 }
189 } 199 }
190 } 200 }
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 749a1dd9..3423a5a7 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -8,6 +8,9 @@ var Montage = require("montage/core/core").Montage,
8 CanvasController = require("js/controllers/elements/canvas-controller").CanvasController, 8 CanvasController = require("js/controllers/elements/canvas-controller").CanvasController,
9 njModule = require("js/lib/NJUtils"); 9 njModule = require("js/lib/NJUtils");
10 10
11var World = require("js/lib/drawing/world").World;
12var MaterialsModel = require("js/models/materials-model").MaterialsModel;
13</