aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-13 11:15:34 -0700
committerValerio Virgillito2012-03-13 11:15:34 -0700
commitf6b958360d82854bdaf51848e7fd715d1f633179 (patch)
tree80f6c08bb730089bdd3f26310df8d2363f9ba863 /js
parentc24f58c10231c30d3a8a4c9fb9a4f395dd746180 (diff)
parent4d7b86f55c504ee4e8c2460cf6b60cb9a2cf18f0 (diff)
downloadninja-f6b958360d82854bdaf51848e7fd715d1f633179.tar.gz
Merge pull request #105 from joseeight/FileIO-Build-Candidate
File I/O adding webGL/canvas data functionality
Diffstat (limited to 'js')
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.js14
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.js14
-rwxr-xr-xjs/controllers/document-controller.js50
-rwxr-xr-xjs/controllers/selection-controller.js19
-rwxr-xr-xjs/controllers/styles-controller.js10
-rwxr-xr-xjs/data/menu-data.js6
-rwxr-xr-xjs/document/html-document.js149
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js4
-rwxr-xr-xjs/helper-classes/3D/math-utils.js5
-rwxr-xr-xjs/helper-classes/RDGE/rdge-compiled.js64
-rw-r--r--js/helper-classes/RDGE/runtime/CanvasDataManager.js98
-rw-r--r--js/helper-classes/RDGE/runtime/GLRuntime.js159
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/engine.js15
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/fx/ssao.js2
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/init_state.js12
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/jshader.js8
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/renderer.js1
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/scenegraphNodes.js2
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/utilities.js4
-rw-r--r--js/helper-classes/RDGE/src/tools/rdge-compiled.js64
-rwxr-xr-xjs/helper-classes/backup-delete/GLCircle.js3
-rwxr-xr-xjs/helper-classes/backup-delete/GLGeomObj.js46
-rwxr-xr-xjs/helper-classes/backup-delete/GLRectangle.js2
-rwxr-xr-xjs/helper-classes/backup-delete/GLWorld.js71
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/BumpMetalMaterial.js39
-rw-r--r--js/helper-classes/backup-delete/Materials/DeformMaterial.js2
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/FlatMaterial.js34
-rw-r--r--js/helper-classes/backup-delete/Materials/FlyMaterial.js2
-rw-r--r--js/helper-classes/backup-delete/Materials/JuliaMaterial.js2
-rw-r--r--js/helper-classes/backup-delete/Materials/KeleidoscopeMaterial.js2
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/LinearGradientMaterial.js2
-rw-r--r--js/helper-classes/backup-delete/Materials/MandelMaterial.js2
-rw-r--r--js/helper-classes/backup-delete/Materials/PlasmaMaterial.js2
-rw-r--r--js/helper-classes/backup-delete/Materials/PulseMaterial.js5
-rw-r--r--js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js2
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/RadialGradientMaterial.js6
-rw-r--r--js/helper-classes/backup-delete/Materials/ReliefTunnelMaterial.js2
-rw-r--r--js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js2
-rw-r--r--js/helper-classes/backup-delete/Materials/StarMaterial.js2
-rw-r--r--js/helper-classes/backup-delete/Materials/TaperMaterial.js4
-rw-r--r--js/helper-classes/backup-delete/Materials/TunnelMaterial.js2
-rw-r--r--js/helper-classes/backup-delete/Materials/TwistMaterial.js2
-rw-r--r--js/helper-classes/backup-delete/Materials/TwistVertMaterial.js2
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/UberMaterial.js73
-rw-r--r--js/helper-classes/backup-delete/Materials/WaterMaterial.js4
-rw-r--r--js/helper-classes/backup-delete/Materials/ZInvertMaterial.js2
-rw-r--r--js/io/system/ninjalibrary.js10
-rw-r--r--js/io/system/ninjalibrary.json2
-rwxr-xr-xjs/io/ui/file-picker/file-picker-controller.js2
-rwxr-xr-xjs/io/ui/file-picker/file-picker-model.js6
-rw-r--r--js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js7
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.js4
-rwxr-xr-xjs/lib/NJUtils.js34
-rwxr-xr-xjs/lib/drawing/world.js92
-rwxr-xr-xjs/lib/geom/circle.js8
-rwxr-xr-xjs/lib/geom/geom-obj.js87
-rwxr-xr-xjs/lib/geom/rectangle.js9
-rwxr-xr-xjs/lib/rdge/materials/bump-metal-material.js10
-rw-r--r--js/lib/rdge/materials/deform-material.js2
-rwxr-xr-xjs/lib/rdge/materials/flat-material.js41
-rw-r--r--js/lib/rdge/materials/fly-material.js2
-rw-r--r--js/lib/rdge/materials/julia-material.js2
-rw-r--r--js/lib/rdge/materials/keleidoscope-material.js2
-rwxr-xr-xjs/lib/rdge/materials/linear-gradient-material.js2
-rw-r--r--js/lib/rdge/materials/mandel-material.js2
-rw-r--r--js/lib/rdge/materials/plasma-material.js37
-rw-r--r--js/lib/rdge/materials/pulse-material.js11
-rw-r--r--js/lib/rdge/materials/radial-blur-material.js9
-rwxr-xr-xjs/lib/rdge/materials/radial-gradient-material.js7
-rw-r--r--js/lib/rdge/materials/relief-tunnel-material.js2
-rw-r--r--js/lib/rdge/materials/square-tunnel-material.js2
-rw-r--r--js/lib/rdge/materials/star-material.js2
-rw-r--r--js/lib/rdge/materials/taper-material.js8
-rw-r--r--js/lib/rdge/materials/tunnel-material.js2
-rw-r--r--js/lib/rdge/materials/twist-material.js2
-rw-r--r--js/lib/rdge/materials/twist-vert-material.js6
-rwxr-xr-xjs/lib/rdge/materials/uber-material.js109
-rw-r--r--js/lib/rdge/materials/water-material.js2
-rw-r--r--js/lib/rdge/materials/z-invert-material.js2
-rw-r--r--js/mediators/io-mediator.js93
-rwxr-xr-xjs/preloader/Preloader.js2
-rwxr-xr-xjs/stage/layout.js10
-rwxr-xr-xjs/stage/stage-view.reel/stage-view.js5
83 files changed, 1028 insertions, 624 deletions
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.js b/js/components/ui/icon-list-basic/icon.reel/icon.js
index 72adbfa1..1ef6e277 100755
--- a/js/components/ui/icon-list-basic/icon.reel/icon.js
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.js
@@ -174,21 +174,17 @@ var Icon = exports.Icon = Montage.create(Component, {
174 enumerable: true, 174 enumerable: true,
175 value:{ 175 value:{
176 "img_root":"images/picker/", 176 "img_root":"images/picker/",
177 ".png":"png_file.png",
178 ".jpg":"jpeg_file.png",
179 ".js":"js_file.png", 177 ".js":"js_file.png",
178 ".json":"json_file.png",
180 ".css":"css_file.png", 179 ".css":"css_file.png",
181 ".html":"html_file.png", 180 ".html":"html_file.png",
182 ".xml":"xml_file.png", 181 ".xml":"xml_file.png",
183 ".php":"php_file.png", 182 ".php":"php_file.png",
183 ".pl":"pl_file.png",
184 ".py":"py_file.png",
185 ".rb":"rb_file.png",
184 ".doc":"doc_file.png", 186 ".doc":"doc_file.png",
185 ".docx":"doc_file.png", 187 ".txt":"txt_file.png",
186 ".rtf":"rtf_file.png",
187 ".pdf":"pdf_file.png",
188 ".zip":"zip_file.png",
189 ".rar":"zip_file.png",
190 ".app":"executable.png",
191 ".exe":"executable.png",
192 "file_default":"file.png", 188 "file_default":"file.png",
193 "directory":"folder.png" 189 "directory":"folder.png"
194 } 190 }
diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.js b/js/components/ui/tree-basic/treeItem.reel/treeItem.js
index 4c71cb6b..a67dad43 100755
--- a/js/components/ui/tree-basic/treeItem.reel/treeItem.js
+++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.js
@@ -242,21 +242,17 @@ exports.TreeItem = Montage.create(Component, {
242 enumerable: true, 242 enumerable: true,
243 value:{ 243 value:{
244 "img_root":"images/picker/", 244 "img_root":"images/picker/",
245 ".png":"png_file.png",
246 ".jpg":"jpeg_file.png",
247 ".js":"js_file.png", 245 ".js":"js_file.png",
246 ".json":"json_file.png",
248 ".css":"css_file.png", 247 ".css":"css_file.png",
249 ".html":"html_file.png", 248 ".html":"html_file.png",
250 ".xml":"xml_file.png", 249 ".xml":"xml_file.png",
251 ".php":"php_file.png", 250 ".php":"php_file.png",
251 ".pl":"pl_file.png",
252 ".py":"py_file.png",
253 ".rb":"rb_file.png",
252 ".doc":"doc_file.png", 254 ".doc":"doc_file.png",
253 ".docx":"doc_file.png", 255 ".txt":"txt_file.png",
254 ".rtf":"rtf_file.png",
255 ".pdf":"pdf_file.png",
256 ".zip":"zip_file.png",
257 ".rar":"zip_file.png",
258 ".app":"executable.png",
259 ".exe":"executable.png",
260 "file_default":"file.png", 256 "file_default":"file.png",
261 "directory":"folder.png" 257 "directory":"folder.png"
262 } 258 }
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index a8056519..87e93465 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -60,8 +60,9 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
60 this.eventManager.addEventListener("executeSave", this, false); 60 this.eventManager.addEventListener("executeSave", this, false);
61 this.eventManager.addEventListener("executeSaveAs", this, false); 61 this.eventManager.