aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mayhew2012-07-24 15:46:16 -0700
committerJohn Mayhew2012-07-24 15:46:16 -0700
commit9f240b8b9b1f5fb0f145c343ca5e533e25e81374 (patch)
tree407564eaa6466e8d4cf2eeee0c56dc623243586f
parentd25359c75089215ee48838db081fd3d51cbbd85f (diff)
parent21d74af1e9fc57cc25cea8aa7408beabf79ff2f3 (diff)
downloadninja-9f240b8b9b1f5fb0f145c343ca5e533e25e81374.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja
-rw-r--r--README.md4
-rw-r--r--assets/canvas-runtime.js6
-rw-r--r--assets/descriptor.json6
-rw-r--r--assets/images/bluesky.png (renamed from assets/images/paris.png)bin4108 -> 4108 bytes
-rw-r--r--assets/images/darkblur.png (renamed from assets/images/raiders.png)bin5674 -> 5674 bytes
-rw-r--r--assets/shaders/Paris.frag.glsl68
-rwxr-xr-xcss/ninja.css6
-rw-r--r--js/clipboard/external-apps-clipboard-agent.js185
-rw-r--r--js/clipboard/internal-ops/elements-clipboard-agent.js24
-rw-r--r--js/components/converter/node-name-converter.js (renamed from js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js)24
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html6
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.css13
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html23
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js6
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.css49
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.html55
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.js77
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.css18
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html21
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.js21
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html4
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.js81
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.css4
-rw-r--r--js/controllers/clipboard-controller.js14
-rwxr-xr-xjs/controllers/elements/shapes-controller.js8
-rwxr-xr-xjs/controllers/styles-controller.js110
-rwxr-xr-xjs/data/menu-data.js582
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js658
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js4
-rwxr-xr-xjs/helper-classes/3D/view-utils.js99
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/MeshManager.js22
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/renderer.js4
-rw-r--r--js/io/system/ninjalibrary.json2
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.js14
-rwxr-xr-xjs/lib/NJUtils.js1
-rwxr-xr-xjs/lib/drawing/world.js30
-rwxr-xr-xjs/lib/geom/brush-stroke.js14
-rwxr-xr-xjs/lib/geom/circle.js57
-rwxr-xr-xjs/lib/geom/geom-obj.js24
-rwxr-xr-xjs/lib/geom/line.js26
-rwxr-xr-xjs/lib/geom/rectangle.js57
-rwxr-xr-xjs/lib/rdge/materials/material.js4
-rw-r--r--js/lib/rdge/materials/radial-blur-material.js14
-rw-r--r--js/lib/rdge/materials/water-material.js14
-rwxr-xr-xjs/mediators/element-mediator.js15
-rwxr-xr-xjs/mediators/keyboard-mediator.js16
-rwxr-xr-xjs/models/app-model.js169
-rwxr-xr-xjs/models/element-model.js8
-rwxr-xr-xjs/models/materials-model.js18
-rwxr-xr-xjs/ninja.reel/ninja.html22
-rwxr-xr-xjs/ninja.reel/ninja.js52
-rw-r--r--js/panels/Materials/materials-data.json18
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.js28
-rwxr-xr-xjs/panels/Splitter.js2
-rw-r--r--js/panels/Timeline/DragDrop.js161
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.js104
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js29
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js384
-rw-r--r--js/panels/Timeline/Span.reel/Span.js192
-rw-r--r--js/panels/Timeline/Style.reel/Style.js695
-rw-r--r--js/panels/Timeline/Style.reel/css/Style.css124
-rw-r--r--js/panels/Timeline/Style.reel/scss/Style.scss2
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html26
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js2849
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css128
-rwxr-xr-xjs/panels/Timeline/TimelinePanel.reel/images/knob.pngbin0 -> 1036 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss55
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js1019
-rw-r--r--js/panels/Timeline/Track.reel/Track.html88
-rw-r--r--js/panels/Timeline/Track.reel/Track.js212
-rw-r--r--js/panels/Timeline/Track.reel/css/Track.css57
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html55
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css36
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js156
-rw-r--r--js/panels/css-panel/rule-list.reel/rule-list.js2
-rw-r--r--js/panels/css-panel/style-sheet.reel/style-sheet.html3
-rw-r--r--js/panels/css-panel/style-sheet.reel/style-sheet.js20
-rw-r--r--js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js10
-rw-r--r--js/panels/css-panel/styles-view-container.reel/styles-view-container.js6
-rw-r--r--js/panels/css-panel/styles-view-delegate.js3
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js4
-rwxr-xr-xjs/stage/binding-view.reel/binding-view.js2
-rwxr-xr-xjs/stage/layout.js58
-rwxr-xr-xjs/stage/stage.reel/stage.js356
-rwxr-xr-xjs/tools/EyedropperTool.js26
-rwxr-xr-xjs/tools/FillTool.js7
-rwxr-xr-xjs/tools/InkBottleTool.js7
-rwxr-xr-xjs/tools/PanTool.js22
-rwxr-xr-xjs/tools/PenTool.js28
-rwxr-xr-xjs/tools/Rotate3DToolBase.js8
-rwxr-xr-xjs/tools/SelectionTool.js105
-rwxr-xr-xjs/tools/ShapeTool.js46
-rwxr-xr-xjs/tools/TextTool.js33
-rwxr-xr-xjs/tools/Translate3DToolBase.js1
-rwxr-xr-xjs/tools/TranslateObject3DTool.js11
-rwxr-xr-xjs/tools/ZoomTool.js330
-rwxr-xr-xjs/tools/drawing-tool-base.js7
-rwxr-xr-xjs/tools/modifier-tool-base.js15
-rw-r--r--js/ui/menu/menu-controller.js636
-rwxr-xr-xjs/ui/menu/menu-entry.reel/menu-entry.css (renamed from js/components/menu/menu-entry.reel/menu-entry.css)55
-rwxr-xr-xjs/ui/menu/menu-entry.reel/menu-entry.html (renamed from js/components/menu/menu-entry.reel/menu-entry.html)37
-rwxr-xr-xjs/ui/menu/menu-entry.reel/menu-entry.js (renamed from js/components/menu/menu-entry.reel/menu-entry.js)90
-rwxr-xr-xjs/ui/menu/menu-item.reel/menu-item.css (renamed from js/components/menu/menu-item.reel/menu-item.css)101
-rwxr-xr-xjs/ui/menu/menu-item.reel/menu-item.html (renamed from js/components/menu/menu-item.reel/menu-item.html)67
-rwxr-xr-xjs/ui/menu/menu-item.reel/menu-item.js (renamed from js/components/menu/menu-item.reel/menu-item.js)150
-rwxr-xr-xjs/ui/menu/menu.reel/menu.css (renamed from js/components/menu/menu.reel/menu.css)4
-rwxr-xr-xjs/ui/menu/menu.reel/menu.html (renamed from js/components/menu/menu.reel/menu.html)21
-rwxr-xr-xjs/ui/menu/menu.reel/menu.js (renamed from js/components/menu/menu.reel/menu.js)78
-rwxr-xr-xscss/imports/scss/_MainWindow.scss2
-rwxr-xr-xscss/imports/scss/_Tools.scss10
110 files changed, 5499 insertions, 6041 deletions
diff --git a/README.md b/README.md
index 286a99ae..9479a000 100644
--- a/README.md
+++ b/README.md
@@ -25,13 +25,13 @@ If you're already familiar with using Git, GitHub, you can clone master branch o
25 - Browse to HKEY_CURRENT_USER/Software/Motorola Mobility/Ninja Local Cloud/Options. 25 - Browse to HKEY_CURRENT_USER/Software/Motorola Mobility/Ninja Local Cloud/Options.
26 - Right click and select New > String value. 26 - Right click and select New > String value.
27 - Type 'Local Ninja Origin' no quotes. 27 - Type 'Local Ninja Origin' no quotes.
28 - Double click on Local Ninja Origin and paste in the Ninja app ID copied in step 6 from the Chrome extensions page in the Value data field. 28 - Double click on Local Ninja Origin and paste in the Ninja app ID copied in step 6 from the Chrome extensions page in the Value data field. To have multiple builds of Ninja installed but not running simultaneously as this is not supported, multiple app IDs can be added separated by comma and no space.
29 - Close Registry Editor. 29 - Close Registry Editor.
308. On Mac: 308. On Mac:
31 - Launch Finder. 31 - Launch Finder.
32 - Double click on /Users/\<user\>/Library/Preferences/com.MotorolaMobility.Ninja-Local-Cloud.plist. Note: on Lion (10.7), user library folder is hidden by default. To browse to it, in Finder choose Go > Go to Folder and type ~/Library, or select Go menu with Alt (Option) key down to see Library listed in Go menu or make the user library folder permanently visible by running the following command in Terminal: chflags nohidden ~/Library 32 - Double click on /Users/\<user\>/Library/Preferences/com.MotorolaMobility.Ninja-Local-Cloud.plist. Note: on Lion (10.7), user library folder is hidden by default. To browse to it, in Finder choose Go > Go to Folder and type ~/Library, or select Go menu with Alt (Option) key down to see Library listed in Go menu or make the user library folder permanently visible by running the following command in Terminal: chflags nohidden ~/Library
33 - Click on Add Child Type 'Local Ninja Origin' no quotes. 33 - Click on Add Child Type 'Local Ninja Origin' no quotes.
34 - For value, paste in the Ninja app ID copied in step 6 from the Chrome extensions page. 34 - For value, paste in the Ninja app ID copied in step 6 from the Chrome extensions page. To have multiple builds of Ninja installed but not running simultaneously as this is not supported, multiple app IDs can be added separated by comma and no space.
35 - Save (File > Save or Cmd S). 35 - Save (File > Save or Cmd S).
36 - Close Property List Editor. 36 - Close Property List Editor.
379. Quit Ninja Local Cloud 379. Quit Ninja Local Cloud
diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index 4ab377c6..7c2554df 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -289,7 +289,7 @@ NinjaCvsRt.GLRuntime = Object.create(Object.prototype, {
289 this.renderer.cameraManager().setActiveCamera(cam); 289 this.renderer.cameraManager().setActiveCamera(cam);
290 290
291 // change clear color 291 // change clear color
292 this.renderer.setClearColor([1.0, 1.0, 1.0, 0.0]); 292 this.renderer.setClearColor([0.0, 0.0, 0.0, 0.0]);
293 293
294 // create an empty scene graph 294 // create an empty scene graph
295 this.myScene = new RDGE.SceneGraph(); 295 this.myScene = new RDGE.SceneGraph();