From 07c48708a99b94a220c043ad5951a331bbd4fc2d Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 29 Feb 2012 15:23:28 -0800
Subject: WebGL file I/O

---
 js/helper-classes/RDGE/runtime/CanvasDataManager.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'js/helper-classes/RDGE/runtime/CanvasDataManager.js')

diff --git a/js/helper-classes/RDGE/runtime/CanvasDataManager.js b/js/helper-classes/RDGE/runtime/CanvasDataManager.js
index 4985fc9a..46d944a1 100644
--- a/js/helper-classes/RDGE/runtime/CanvasDataManager.js
+++ b/js/helper-classes/RDGE/runtime/CanvasDataManager.js
@@ -29,9 +29,10 @@ function CanvasDataManager()
 					var canvas = this.findCanvasWithID( id, root );
 					if (canvas)
 					{
-						var loadForAuthoring = true;
+						//var loadForAuthoring = true;
 						var index = importStr.indexOf( "scenedata: " );
-						if (index >= 0)  loadForAuthoring = false;
+						//if (index >= 0)  loadForAuthoring = false;
+						var loadForAuthoring = false;
 
 						if (loadForAuthoring)
 						{
@@ -64,7 +65,7 @@ function CanvasDataManager()
 	{
 		if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
 		{
-			var data = elt.elementModel.shapeModel.GLWorld.export();
+			var data = elt.elementModel.shapeModel.GLWorld.export( true );
 			dataArray.push( data );
 		}
 
@@ -90,7 +91,8 @@ function CanvasDataManager()
 			for (var i=0;  i<nKids;  i++)
 			{
 				var child = elt.children[i];
-				this.findCanvasWithID( id, child );
+				var foundElt = this.findCanvasWithID( id, child );
+				if (foundElt)  return foundElt;
 			}
 		}
 	}
-- 
cgit v1.2.3


From 232784ffafe834f75a46ca7fc311e8ca2ff5eec9 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Mon, 5 Mar 2012 16:33:51 -0800
Subject: Corrections for canvas file IO

---
 .../RDGE/runtime/CanvasDataManager.js              | 29 ++--------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

(limited to 'js/helper-classes/RDGE/runtime/CanvasDataManager.js')

diff --git a/js/helper-classes/RDGE/runtime/CanvasDataManager.js b/js/helper-classes/RDGE/runtime/CanvasDataManager.js
index 46d944a1..efbfe4db 100644
--- a/js/helper-classes/RDGE/runtime/CanvasDataManager.js
+++ b/js/helper-classes/RDGE/runtime/CanvasDataManager.js
@@ -12,7 +12,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 ///////////////////////////////////////////////////////////////////////
 function CanvasDataManager()
 {
-	this.loadGLData = function(root,  valueArray)
+	this.loadGLData = function(root,  valueArray,  NinjaUtils)
 	{
 		var value = valueArray;
 		var nWorlds = value.length;
@@ -29,32 +29,7 @@ function CanvasDataManager()
 					var canvas = this.findCanvasWithID( id, root );
 					if (canvas)
 					{
-						//var loadForAuthoring = true;
-						var index = importStr.indexOf( "scenedata: " );
-						//if (index >= 0)  loadForAuthoring = false;
-						var 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 );
-						}
+						var rt = new GLRuntime( canvas, importStr );
 					}
 				}
 			}
-- 
cgit v1.2.3


From 818582d389f504c915be0c9052fafa33e3e76c92 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 7 Mar 2012 16:48:48 -0800
Subject: File IO

---
 .../RDGE/runtime/CanvasDataManager.js              | 75 ----------------------
 1 file changed, 75 deletions(-)
 delete mode 100644 js/helper-classes/RDGE/runtime/CanvasDataManager.js

(limited to 'js/helper-classes/RDGE/runtime/CanvasDataManager.js')

diff --git a/js/helper-classes/RDGE/runtime/CanvasDataManager.js b/js/helper-classes/RDGE/runtime/CanvasDataManager.js
deleted file mode 100644
index efbfe4db..00000000
--- a/js/helper-classes/RDGE/runtime/CanvasDataManager.js
+++ /dev/null
@@ -1,75 +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,  NinjaUtils)
-	{
-		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 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( true );
-			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];
-				var foundElt = this.findCanvasWithID( id, child );
-				if (foundElt)  return foundElt;
-			}
-		}
-	}
-}
-
-- 
cgit v1.2.3