aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Guzman2012-03-16 15:09:09 -0700
committerEric Guzman2012-03-16 15:09:09 -0700
commitf08e3660384ed6ed2ba8ecf959c90fd1ade818eb (patch)
tree49c36caa1f0cf7e5ff8ca9239609965aa1b7a8e5
parent4afb01e3b8261ab5e9492bfc63ad17e44dfcb934 (diff)
parent3e98d9eaf6f691aa0f7a4334983537a4ee3ffd39 (diff)
downloadninja-f08e3660384ed6ed2ba8ecf959c90fd1ade818eb.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
-rw-r--r--assets/canvas-runtime.js243
-rw-r--r--js/components/focus-manager.reel/focus-manager.js49
-rwxr-xr-xjs/controllers/document-controller.js2
-rwxr-xr-xjs/controllers/elements/element-controller.js17
-rwxr-xr-xjs/document/html-document.js14
-rwxr-xr-xjs/helper-classes/3D/vec-utils.js71
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/MeshManager.js2
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/run_state.js16
-rw-r--r--js/helper-classes/RDGE/src/tools/compile-rdge-core.bat4
-rw-r--r--js/helper-classes/RDGE/src/tools/compile-rdge-core.sh3
-rw-r--r--js/helper-classes/RDGE/src/tools/compiler.jarbin4927265 -> 0 bytes
-rw-r--r--js/helper-classes/RDGE/src/tools/rdge-compiled.js452
-rwxr-xr-xjs/helper-classes/backup-delete/GLAnchorPoint.js168
-rwxr-xr-xjs/helper-classes/backup-delete/GLBrushStroke.js561
-rwxr-xr-xjs/helper-classes/backup-delete/GLCircle.js711
-rwxr-xr-xjs/helper-classes/backup-delete/GLGeomObj.js324
-rwxr-xr-xjs/helper-classes/backup-delete/GLLight.js30
-rwxr-xr-xjs/helper-classes/backup-delete/GLLine.js507
-rwxr-xr-xjs/helper-classes/backup-delete/GLMaterial.js308
-rwxr-xr-xjs/helper-classes/backup-delete/GLPath.js232
-rwxr-xr-xjs/helper-classes/backup-delete/GLRectangle.js1238
-rwxr-xr-xjs/helper-classes/backup-delete/GLSubpath.js1286
-rwxr-xr-xjs/helper-classes/backup-delete/GLWorld.js1029
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/BumpMetalMaterial.js307
-rw-r--r--js/helper-classes/backup-delete/Materials/DeformMaterial.js133
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/FlatMaterial.js165
-rw-r--r--js/helper-classes/backup-delete/Materials/FlyMaterial.js133
-rw-r--r--js/helper-classes/backup-delete/Materials/JuliaMaterial.js150
-rw-r--r--js/helper-classes/backup-delete/Materials/KeleidoscopeMaterial.js149
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/LinearGradientMaterial.js379
-rw-r--r--js/helper-classes/backup-delete/Materials/MandelMaterial.js151
-rw-r--r--js/helper-classes/backup-delete/Materials/PlasmaMaterial.js134
-rw-r--r--js/helper-classes/backup-delete/Materials/PulseMaterial.js266
-rw-r--r--js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js257
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/RadialGradientMaterial.js305
-rw-r--r--js/helper-classes/backup-delete/Materials/ReliefTunnelMaterial.js133
-rw-r--r--js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js133
-rw-r--r--js/helper-classes/backup-delete/Materials/StarMaterial.js133
-rw-r--r--js/helper-classes/backup-delete/Materials/TaperMaterial.js223
-rw-r--r--js/helper-classes/backup-delete/Materials/TunnelMaterial.js133
-rw-r--r--js/helper-classes/backup-delete/Materials/TwistMaterial.js149
-rw-r--r--js/helper-classes/backup-delete/Materials/TwistVertMaterial.js248
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/UberMaterial.js744
-rw-r--r--js/helper-classes/backup-delete/Materials/WaterMaterial.js133
-rw-r--r--js/helper-classes/backup-delete/Materials/ZInvertMaterial.js133
-rwxr-xr-xjs/helper-classes/backup-delete/MaterialsLibrary.js230
-rwxr-xr-xjs/helper-classes/backup-delete/ParseUtils.js84
-rwxr-xr-xjs/helper-classes/backup-delete/glUtils.js319
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-workflow-controller.js11
-rwxr-xr-xjs/lib/geom/geom-obj.js6
-rwxr-xr-xjs/lib/rdge/materials/flat-material.js6
-rwxr-xr-xjs/lib/rdge/materials/uber-material.js130
-rwxr-xr-xjs/mediators/drag-drop-mediator.js194
-rwxr-xr-xjs/ninja.reel/ninja.css4
-rwxr-xr-xjs/ninja.reel/ninja.html13
-rwxr-xr-xjs/panels/Splitter.js6
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js20
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js86
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js5
-rw-r--r--js/panels/presets/default-transition-presets.js30
-rwxr-xr-xjs/panels/properties.reel/properties.html72
-rwxr-xr-xjs/panels/properties.reel/properties.js93
-rwxr-xr-xjs/preloader/Preloader.js302
-rwxr-xr-xjs/preloader/PreloaderWorker.js95
-rwxr-xr-xjs/stage/stage.reel/stage.html7
-rwxr-xr-xjs/stage/stage.reel/stage.js11
66 files changed, 752 insertions, 12930 deletions
diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index 655e52fa..fd823f35 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -4,6 +4,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5</copyright> */ 5</copyright> */
6 6
7
8
7/////////////////////////////////////////////////////////////////////// 9///////////////////////////////////////////////////////////////////////
8//Loading webGL/canvas data 10//Loading webGL/canvas data
9function initWebGl (rootElement, directory) { 11function initWebGl (rootElement, directory) {
@@ -27,7 +29,8 @@ function CanvasDataManager()
27{ 29{
28 this.loadGLData = function(root, valueArray, assetPath ) 30 this.loadGLData = function(root, valueArray, assetPath )
29 { 31 {
30 this._assetPath = assetPath.slice(); 32 if (assetPath)
33 this._assetPath = assetPath.slice();
31 34
32 var value = valueArray; 35 var value = valueArray;
33 var nWorlds = value.length; 36 var nWorlds = value.length;
@@ -118,17 +121,22 @@ function GLRuntime( canvas, importStr, assetPath )
118 this._zFar = 100.0; 121 this._zFar = 100.0;
119 this._viewDist = 5.0; 122 this._viewDist = 5.0;
120 123
124 this.elapsed = 0;
125
121 this._aspect = canvas.width/canvas.height; 126 this._aspect = canvas.width/canvas.height;
122 127
123 this._geomRoot; 128 this._geomRoot = null;
124 129
125 // all "live" materials 130 // all "live" materials
126 this._materials = []; 131 this._materials = [];
127 132
128 // provide the mapping for the asset directory 133 // provide the mapping for the asset directory
129 this._assetPath = assetPath.slice(); 134 if (assetPath)
130 if (this._assetPath[this._assetPath.length-1] != '/') 135 {
131 this._assetPath += '/'; 136 this._assetPath = assetPath.slice();
137 if (this._assetPath[this._assetPath.length-1] != '/')
138 this._assetPath += '/';
139 }
132 140
133 /////////////////////////////////////////////////////////////////////// 141 ///////////////////////////////////////////////////////////////////////
134 // accessors 142 // accessors
@@ -166,6 +174,7 @@ function GLRuntime( canvas, importStr, assetPath )
166 this.importObjects( importStr ); 174 this.importObjects( importStr );
167 this.linkMaterials( this._geomRoot ); 175 this.linkMaterials( this._geomRoot );
168 this.initMaterials(); 176 this.initMaterials();
177 this.linkLights();
169 } 178 }
170 else 179 else
171 { 180 {
@@ -221,8 +230,8 @@ function GLRuntime( canvas, importStr, assetPath )
221 rdgeGlobalParameters.u_light0Pos.set( [5*Math.cos(this.elapsed), 5*Math.sin(this.elapsed), 20]); 230 rdgeGlobalParameters.u_light0Pos.set( [5*Math.cos(this.elapsed), 5*Math.sin(this.elapsed), 20]);
222 231
223 // orbit the light nodes around the boxes 232 // orbit the light nodes around the boxes
224 //this.light.setPosition([1.2*Math.cos(this.elapsed*2.0), 1.2*Math.sin(this.elapsed*2.0), 1.2*Math.cos(this.elapsed*2.0)]); 233 if (this.light ) this.light.setPosition([1.2*Math.cos(this.elapsed*2.0), 1.2*Math.sin(this.elapsed*2.0), 1.2*Math.cos(this.elapsed*2.0)]);
225 //this.light2.setPosition([-1.2*Math.cos(this.elapsed*2.0), 1.2*Math.sin(this.elapsed*2.0), -1.2*Math.cos(this.elapsed)]); 234 if (this.light2) this.light2.setPosition([-1.2*Math.cos(this.elapsed*2.0), 1.2*Math.sin(this.elapsed*2.0), -1.2*Math.cos(this.elapsed)]);
226 235
227 this.updateMaterials(); 236 this.updateMaterials();
228 237
@@ -344,6 +353,16 @@ function GLRuntime( canvas, importStr, assetPath )
344 parent.addChild( obj ); 353 parent.addChild( obj );
345 } 354 }
346 355
356 this.linkLights = function()
357 {
358 var matNode = this.findMaterialNode( "lights", this.myScene.scene );
359 if (matNode)
360 {
361 this.light = matNode.lightChannel[1];
362 this.light2 = matNode.lightChannel[2];
363 }
364 }
365
347 this.linkMaterials = function( obj ) 366 this.linkMaterials = function( obj )
348 { 367 {
349 if (!obj) return; 368 if (!obj) return;
@@ -377,6 +396,7 @@ function GLRuntime( canvas, importStr, assetPath )
377 396
378 this.remapAssetFolder = function( url ) 397 this.remapAssetFolder = function( url )
379 { 398 {
399 /*
380 var searchStr = "assets/"; 400 var searchStr = "assets/";
381 var index = url.indexOf( searchStr ); 401 var index = url.indexOf( searchStr );
382 var rtnPath = url; 402 var rtnPath = url;
@@ -386,6 +406,8 @@ function GLRuntime( canvas, importStr, assetPath )
386 rtnPath = this._assetPath + rtnPath; 406 rtnPath = this._assetPath + rtnPath;
387 } 407 }
388 return rtnPath; 408 return rtnPath;
409 */
</