aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-27 09:32:53 -0700
committerNivesh Rajbhandari2012-03-27 09:32:53 -0700
commit406bbfc63f8ed42d7da105dbd068a49ff8fb5f09 (patch)
tree3a8b45f4802f002269ff1bcf596f94cee4679a07
parentbda9f8f5829c943486f8850e68c991e83f8fb8c8 (diff)
parent309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff)
downloadninja-406bbfc63f8ed42d7da105dbd068a49ff8fb5f09.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
-rw-r--r--assets/canvas-runtime.js529
-rw-r--r--assets/descriptor.json4
-rw-r--r--assets/images/paris.pngbin0 -> 4108 bytes
-rw-r--r--assets/images/powderblue.pngbin0 -> 176 bytes
-rw-r--r--assets/images/raiders.pngbin0 -> 5674 bytes
-rwxr-xr-xassets/rdge-compiled.js6
-rw-r--r--assets/shaders/Paris.frag.glsl68
-rwxr-xr-xcss/ninja.css4
-rwxr-xr-xjs/components/button.reel/button.css40
-rwxr-xr-xjs/components/button.reel/button.html26
-rwxr-xr-xjs/components/button.reel/button.js225
-rwxr-xr-xjs/components/checkbox.reel/checkbox.js21
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.css19
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html16
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.js20
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html2
-rwxr-xr-xjs/controllers/color-controller.js5
-rwxr-xr-xjs/controllers/document-controller.js14
-rwxr-xr-xjs/controllers/elements/component-controller.js13
-rwxr-xr-xjs/controllers/elements/shapes-controller.js45
-rwxr-xr-xjs/controllers/selection-controller.js12
-rwxr-xr-xjs/data/pi/pi-data.js33
-rwxr-xr-xjs/document/html-document.js177
-rw-r--r--js/document/templates/montage-html/main.reel/main.js42
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js21
-rwxr-xr-xjs/helper-classes/RDGE/rdge-compiled.js6
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/engine.js7
-rwxr-xr-xjs/io/system/coreioapi.js4
-rw-r--r--js/io/system/ninjalibrary.json4
-rwxr-xr-xjs/lib/NJUtils.js32
-rwxr-xr-xjs/lib/drawing/world.js162
-rwxr-xr-xjs/lib/geom/circle.js54
-rwxr-xr-xjs/lib/geom/geom-obj.js154
-rwxr-xr-xjs/lib/geom/line.js44
-rwxr-xr-xjs/lib/geom/rectangle.js67
-rwxr-xr-xjs/lib/rdge/materials/bump-metal-material.js40
-rw-r--r--js/lib/rdge/materials/cloud-material.js300
-rwxr-xr-xjs/lib/rdge/materials/flat-material.js21
-rw-r--r--js/lib/rdge/materials/julia-material.js6
-rwxr-xr-xjs/lib/rdge/materials/linear-gradient-material.js53
-rw-r--r--js/lib/rdge/materials/mandel-material.js6
-rw-r--r--js/lib/rdge/materials/plasma-material.js18
-rw-r--r--js/lib/rdge/materials/pulse-material.js44
-rw-r--r--js/lib/rdge/materials/radial-blur-material.js57
-rwxr-xr-xjs/lib/rdge/materials/radial-gradient-material.js54
-rw-r--r--js/lib/rdge/materials/taper-material.js27
-rw-r--r--js/lib/rdge/materials/twist-vert-material.js28
-rwxr-xr-xjs/lib/rdge/materials/uber-material.js180
-rw-r--r--js/lib/rdge/materials/water-material.js103
-rw-r--r--js/mediators/io-mediator.js130
-rwxr-xr-xjs/models/materials-model.js90
-rwxr-xr-xjs/models/shape-model.js3
-rwxr-xr-xjs/ninja.reel/ninja.js21
-rwxr-xr-xjs/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js89
-rwxr-xr-xjs/panels/color/colorpopup-manager.js2
-rw-r--r--js/panels/presets/default-animation-presets.js125
-rw-r--r--js/panels/presets/default-style-presets.js18
-rwxr-xr-xjs/panels/properties.reel/properties.css13
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js13
-rwxr-xr-xjs/panels/properties.reel/sections/position-and-size.reel/position-and-size.css32
-rwxr-xr-xjs/panels/properties.reel/sections/position-and-size.reel/position-and-size.html13
-rwxr-xr-xjs/panels/properties.reel/sections/position-and-size.reel/position-and-size.js10
-rw-r--r--manifest.json3
-rw-r--r--node_modules/components-data/feed-reader.json25
-rw-r--r--node_modules/components-data/map.json28
-rw-r--r--node_modules/components-data/picasa-carousel.json20
-rw-r--r--node_modules/components-data/searchfield.json20
-rw-r--r--node_modules/components-data/textfield.json4
-rw-r--r--node_modules/components-data/youtube-channel.json16
-rw-r--r--node_modules/descriptor.json35
-rw-r--r--node_modules/montage/examples/feed-reader/images/07-map-marker.pngbin0 -> 3131 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/10-medical.pngbin0 -> 2915 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/100-coffee.pngbin0 -> 2958 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/107-widescreen.pngbin0 -> 2986 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/125-food.pngbin0 -> 3038 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/142-wine-bottle.pngbin0 -> 187 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/34-coffee.pngbin0 -> 3052 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/35-shopping.pngbin0 -> 2970 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/38-airplane.pngbin0 -> 3004 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/41-picture-frame.pngbin0 -> 2928 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/47-fuel.pngbin0 -> 3091 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/48-fork-and-knife.pngbin0 -> 2882 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/80-shopping-cart.pngbin0 -> 2963 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/87-wine-glass.pngbin0 -> 2983 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/88-beer-mug.pngbin0 -> 3087 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/index.html81
-rw-r--r--node_modules/montage/examples/feed-reader/main.reel/main.html274
-rw-r--r--node_modules/montage/examples/feed-reader/main.reel/main.js55
-rw-r--r--node_modules/montage/examples/feed-reader/map-example.reel/main.css2
-rw-r--r--node_modules/montage/examples/feed-reader/map-example.reel/main.html58
-rw-r--r--node_modules/montage/examples/feed-reader/map-example.reel/main.js24
-rw-r--r--node_modules/montage/examples/feed-reader/package.json10
-rwxr-xr-xnode_modules/montage/examples/youtube-channel-example/index.html45
-rwxr-xr-xnode_modules/montage/examples/youtube-channel-example/package.json7
-rwxr-xr-xnode_modules/montage/examples/youtube-channel-example/style.css47
-rwxr-xr-xnode_modules/montage/examples/youtube-channel-example/youtube-channel-example.js8
-rwxr-xr-xnode_modules/montage/lab/sandbox/ui/picasa-carousel-test/index.html77
-rwxr-xr-xnode_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.css7
-rwxr-xr-xnode_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.html75
-rwxr-xr-xnode_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.js35
-rwxr-xr-xnode_modules/montage/lab/sandbox/ui/picasa-carousel-test/package.json10
-rwxr-xr-xnode_modules/montage/test/ui/youtube-player-spec.js363
-rw-r--r--node_modules/montage/test/ui/youtube-player-test/youtube-player-test.html47
-rwxr-xr-xnode_modules/montage/test/ui/youtube-player-test/youtube-player-test.js9
-rw-r--r--node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.html89
-rw-r--r--node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.js21
-rw-r--r--node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html79
-rw-r--r--node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.js180
-rw-r--r--node_modules/montage/ui/flow.reel/flow.js2
-rw-r--r--node_modules/montage/ui/map.reel/map.css9
-rw-r--r--node_modules/montage/ui/map.reel/map.html46
-rw-r--r--node_modules/montage/ui/map.reel/map.js289
-rw-r--r--node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html40
-rw-r--r--node_modules/montage/ui/picasa-carousel.reel/image.reel/image.js20
-rwxr-xr-xnode_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css44
-rwxr-xr-xnode_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html145
-rw-r--r--node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js153
-rwxr-xr-xnode_modules/montage/ui/template.js6
-rw-r--r--node_modules/montage/ui/text-input.js22
-rw-r--r--node_modules/montage/ui/youtube-channel.reel/youtube-channel.html125
-rw-r--r--node_modules/montage/ui/youtube-channel.reel/youtube-channel.js242
-rw-r--r--node_modules/montage/ui/youtube-player.reel/youtube-player.html25
-rw-r--r--node_modules/montage/ui/youtube-player.reel/youtube-player.js216
-rw-r--r--node_modules/tools/template-creator.js20
-rwxr-xr-xscss/imports/scss/_Tools.scss21
125 files changed, 5624 insertions, 927 deletions
diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index fd823f35..dd909e26 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -37,17 +37,24 @@ function CanvasDataManager()
37 for (var i=0; i<nWorlds; i++) 37 for (var i=0; i<nWorlds; i++)
38 { 38 {
39 var importStr = value[i]; 39 var importStr = value[i];
40 var startIndex = importStr.indexOf( "id: " ); 40
41 if (startIndex >= 0) 41 // there should be some version information in
42 // the form of 'v0.0;' Pull that off. (the trailing ';' should
43 // be in the first 24 characters).
44 var index = importStr.indexOf( ';' );
45 if ((importStr[0] === 'v') && (index < 24))
42 { 46 {
43 var endIndex = importStr.indexOf( "\n", startIndex ); 47 // JSON format. pull off the version info
44 if (endIndex > 0) 48 importStr = importStr.substr( index+1 );
49
50 var jObj = JSON.parse( importStr );
51 var id = jObj.id;