From a0d23354802ebc6b437698acb4b18d3395d47cd1 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 16 Mar 2012 12:26:30 -0700
Subject: Conversion to JSON based file IO for canvas2D and WebGL rendering

---
 js/document/html-document.js | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

(limited to 'js/document/html-document.js')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index d4db6e2f..bf03e38b 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -194,11 +194,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 			//
 			if (elt) {
 				this._glData = [];
-				//if (path) {
-					//this.collectGLData(elt, this._glData, path);
-				//} else {
-					this.collectGLData(elt, this._glData );
-				//}
+				this.collectGLData(elt, this._glData );
 			} else {
 				this._glData = null
 			}
@@ -220,25 +216,26 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 
 					// /*
 					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 );
-							if (id) {
-								var canvas = this.findCanvasWithID( id, elt );
-								if (canvas) {
-									if (!canvas.elementModel) {
-										NJUtils.makeElementModel(canvas, "Canvas", "shape", true);
+					var jObj = JSON.parse( importStr );
+					if (jObj)
+					{
+						var id = jObj.id;
+						if (id)
+						{
+							var canvas = this.findCanvasWithID( id, elt );
+							if (canvas) {
+								if (!canvas.elementModel) {
+									NJUtils.makeElementModel(canvas, "Canvas", "shape", true);
+								}
+								if (canvas.elementModel) {
+									if (canvas.elementModel.shapeModel.GLWorld) {
+										canvas.elementModel.shapeModel.GLWorld.clearTree();
 									}
-									if (canvas.elementModel) {
-										if (canvas.elementModel.shapeModel.GLWorld) {
-											canvas.elementModel.shapeModel.GLWorld.clearTree();
-										}
-										var index = importStr.indexOf( "webGL: " );
-										var useWebGL = (index >= 0)
+									if (jObj)
+									{
+										var useWebGL = jObj.webGL;
 										var world = new GLWorld( canvas, useWebGL );
-										world.import( importStr );
+										world.importJSON( jObj );
 										this.buildShapeModel( canvas.elementModel, world );
 									}
 								}
@@ -382,7 +379,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 		{
 			if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
 			{
-				var data = elt.elementModel.shapeModel.GLWorld.export();
+				var data = elt.elementModel.shapeModel.GLWorld.exportJSON();
 				dataArray.push( data );
 			}
 
-- 
cgit v1.2.3