From 55b2231d7badec16990b63ef1b6c770ef1e6fc25 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 16 Mar 2012 15:17:53 -0700
Subject: Supporting new and old GL data formats.

---
 assets/canvas-runtime.js | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'assets')

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index dd4ad6f9..adff0e8c 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -37,15 +37,25 @@ function CanvasDataManager()
 		for (var i=0;  i<nWorlds;  i++)
 		{
 			var importStr = value[i];
-			var jObj = JSON.parse( importStr );
 
-			var id = jObj.id;
-			if (id)
+			// there should be some version information in
+			// the form of 'v0.0;'  Pull that off.  (the trailing ';' should
+			// be in the first 24 characters).
+			var index = importStr.indexOf( ';' );
+			if ((importStr[0] === 'v') && (index < 24))
 			{
-				var canvas = this.findCanvasWithID( id, root );
-				if (canvas)
+				// JSON format.  pull off the version info
+				importStr = importStr.substr( index+1 );
+
+				var jObj = JSON.parse( importStr );
+				var id = jObj.id;
+				if (id)
 				{
-					new GLRuntime( canvas, jObj,  assetPath );
+					var canvas = this.findCanvasWithID( id, root );
+					if (canvas)
+					{
+						new GLRuntime( canvas, jObj,  assetPath );
+					}
 				}
 			}
 		}
-- 
cgit v1.2.3