Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

Conflicts: js/helper-classes/RDGE/rdge-compiled.js js/helper-classes/RDGE/runtime/GLRuntime.js js/helper-classes/RDGE/src/core/script/MeshManager.js js/helper-classes/RDGE/src/core/script/engine.js js/helper-classes/RDGE/src/core/script/fx/ssao.js js/helper-classes/RDGE/src/core/script/init_state.js js/helper-classes/RDGE/src/core/script/run_state.js js/helper-classes/RDGE/src/core/script/scenegraphNodes.js js/helper-classes/RDGE/src/core/script/utilities.js js/helper-classes/RDGE/src/tools/compile-rdge-core.bat js/helper-classes/RDGE/src/tools/compile-rdge-core.sh js/helper-classes/RDGE/src/tools/rdge-compiled.js js/lib/drawing/world.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/deform-material.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/linear-gradient-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-blur-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/relief-tunnel-material.js js/lib/rdge/materials/square-tunnel-material.js js/lib/rdge/materials/star-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/tunnel-material.js js/lib/rdge/materials/twist-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/uber-material.js js/lib/rdge/materials/water-material.js js/lib/rdge/materials/z-invert-material.js js/preloader/Preloader.js
author: John Mayhew 2012-04-02 16:28:39 -0700
committer: John Mayhew 2012-04-02 16:28:39 -0700
commit: b4155fb4c33675a8a7cd37473513718043fdf0ba (patch)
tree: 3d8c802473f2395d53d599ec9d8b70b60a4db50c /js/helper-classes/RDGE/runtime/CanvasDataManager.js
parent: 5ba9aeac94c86049423fd5d4b37b277263939c13 (diff)
parent: c6de22bf42be90b403491b5f87b1818d9020310c (diff)
download: ninja-b4155fb4c33675a8a7cd37473513718043fdf0ba.tar.gz
1 files changed, 0 insertions, 98 deletions
diff --git a/js/helper-classes/RDGE/runtime/CanvasDataManager.js b/js/helper-classes/RDGE/runtime/CanvasDataManager.js
deleted file mode 100644
index 4985fc9a..00000000
--- a/js/helper-classes/RDGE/runtime/CanvasDataManager.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
-///////////////////////////////////////////////////////////////////////
-// Class ShapeRuntime
-//      Manages runtime shape display
-///////////////////////////////////////////////////////////////////////
-function CanvasDataManager()
-{
-        this.loadGLData = function(root,  valueArray)
-        {
-                var value = valueArray;
-                var nWorlds = value.length;
-                for (var i=0;  i<nWorlds;  i++)
-                {
-                        var importStr = value[i];
-                        var startIndex = importStr.indexOf( "id: " );
-                        if (startIndex >= 0)
-                        {
-                                var endIndex = importStr.indexOf( "\n", startIndex );
-                                if (endIndex > 0)
-                                {
-                                        var id = importStr.substring( startIndex+4, endIndex );
-                                        var canvas = this.findCanvasWithID( id, root );
-                                        if (canvas)
-                                        {
-                                                var loadForAuthoring = true;
-                                                var index = importStr.indexOf( "scenedata: " );
-                                                if (index >= 0)  loadForAuthoring = false;
-                                                if (loadForAuthoring)
-                                                {
-                                                        if (!canvas.elementModel)
-                                                        {
-                                                                NJUtils.makeElementModel(canvas, "Canvas", "shape", true);
-                                                        }
-                                                                
-                                                        if (canvas.elementModel)
-                                                        {
-                                                                if (canvas.elementModel.shapeModel.GLWorld)
-                                                                        canvas.elementModel.shapeModel.GLWorld.clearTree();
-                                                                var world = new GLWorld( canvas );
-                                                                canvas.elementModel.shapeModel.GLWorld = world;
-                                                                world.import( importStr );
-                                                        }
-                                                }
-                                                else
-                                                {
-                                                        var rt = new GLRuntime( canvas, importStr );
-                                                }
-                                        }
-                                }
-                        }
-                }
-        }
-        this.collectGLData = function( elt,  dataArray )
-        {
-                if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
-                {
-                        var data = elt.elementModel.shapeModel.GLWorld.export();
-                        dataArray.push( data );
-                }
-                if (elt.children)
-                {
-                        var nKids = elt.children.length;
-                        for (var i=0;  i<nKids;  i++)
-                        {
-                                var child = elt.children[i];
-                                this.collectGLData( child, dataArray );
-                        }
-                }
-        }
-        this.findCanvasWithID = function( id,  elt )
-        {
-                var cid = elt.getAttribute( "data-RDGE-id" );
-                if (cid == id)  return elt;
-                if (elt.children)
-                {
-                        var nKids = elt.children.length;
-                        for (var i=0;  i<nKids;  i++)
-                        {
-                                var child = elt.children[i];
-                                this.findCanvasWithID( id, child );
-                        }
-                }
-        }
-}
author	John Mayhew	2012-04-02 16:28:39 -0700
committer	John Mayhew	2012-04-02 16:28:39 -0700
commit	b4155fb4c33675a8a7cd37473513718043fdf0ba (patch)
tree	3d8c802473f2395d53d599ec9d8b70b60a4db50c /js/helper-classes/RDGE/runtime/CanvasDataManager.js
parent	5ba9aeac94c86049423fd5d4b37b277263939c13 (diff)
parent	c6de22bf42be90b403491b5f87b1818d9020310c (diff)
download	ninja-b4155fb4c33675a8a7cd37473513718043fdf0ba.tar.gz

diff --git a/js/helper-classes/RDGE/runtime/CanvasDataManager.js b/js/helper-classes/RDGE/runtime/CanvasDataManager.js deleted file mode 100644 index 4985fc9a..00000000 --- a/js/helper-classes/RDGE/runtime/CanvasDataManager.js +++ /dev/null
@@ -1,98 +0,0 @@
1	/* <copyright>
2	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5	</copyright> */
6
7
8
9	///////////////////////////////////////////////////////////////////////
10	// Class ShapeRuntime
11	// Manages runtime shape display
12	///////////////////////////////////////////////////////////////////////
13	function CanvasDataManager()
14	{
15	this.loadGLData = function(root, valueArray)
16	{
17	var value = valueArray;
18	var nWorlds = value.length;
19	for (var i=0; i<nWorlds; i++)
20	{
21	var importStr = value[i];
22	var startIndex = importStr.indexOf( "id: " );
23	if (startIndex >= 0)
24	{
25	var endIndex = importStr.indexOf( "\n", startIndex );
26	if (endIndex > 0)
27	{
28	var id = importStr.substring( startIndex+4, endIndex );
29	var canvas = this.findCanvasWithID( id, root );
30	if (canvas)
31	{
32	var loadForAuthoring = true;
33	var index = importStr.indexOf( "scenedata: " );
34	if (index >= 0) loadForAuthoring = false;
35
36	if (loadForAuthoring)
37	{
38	if (!canvas.elementModel)
39	{
40	NJUtils.makeElementModel(canvas, "Canvas", "shape", true);
41	}
42
43	if (canvas.elementModel)
44	{
45	if (canvas.elementModel.shapeModel.GLWorld)
46	canvas.elementModel.shapeModel.GLWorld.clearTree();
47
48	var world = new GLWorld( canvas );
49	canvas.elementModel.shapeModel.GLWorld = world;
50	world.import( importStr );
51	}
52	}
53	else
54	{
55	var rt = new GLRuntime( canvas, importStr );
56	}
57	}
58	}
59	}
60	}
61	}
62
63	this.collectGLData = function( elt, dataArray )
64	{
65	if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
66	{
67	var data = elt.elementModel.shapeModel.GLWorld.export();
68	dataArray.push( data );
69	}
70
71	if (elt.children)
72	{
73	var nKids = elt.children.length;
74	for (var i=0; i<nKids; i++)
75	{
76	var child = elt.children[i];
77	this.collectGLData( child, dataArray );
78	}
79	}
80	}
81
82	this.findCanvasWithID = function( id, elt )
83	{
84	var cid = elt.getAttribute( "data-RDGE-id" );
85	if (cid == id) return elt;
86
87	if (elt.children)
88	{
89	var nKids = elt.children.length;
90	for (var i=0; i<nKids; i++)
91	{
92	var child = elt.children[i];
93	this.findCanvasWithID( id, child );
94	}
95	}
96	}
97	}
98