94 files changed, 5166 insertions, 4240 deletions
diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index 6268f0bb..13b36540 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -56,60 +56,64 @@ NinjaCvsRt.initWebGl = function (rootElement, directory, data) {
 ///////////////////////////////////////////////////////////////////////
 NinjaCvsRt.CanvasDataManager = Object.create(Object.prototype, {
-    loadGLData: {
+        loadGLData: {
-        value: function(root, valueArray, assetPath) {
+                value: function(root, valueArray, assetPath) {
-            if (assetPath)
+                        if (assetPath)
-                this._assetPath = assetPath.slice();
+                                this._assetPath = assetPath.slice();
-            var value = valueArray;
+                        var value = valueArray;
-            var nWorlds = value.length;
+                        var nWorlds = value.length;
-            for (var i=0;  i<nWorlds;  i++)
+                        for (var i=0;  i<nWorlds;  i++)
-            {
+                        {
-                var importStr = value[i];
+                                var importStr = value[i];
-                // there should be some version information in
+                                // there should be some version information in
-                // the form of 'v0.0;'  Pull that off.  (the trailing ';' should
+                                // the form of 'v0.0;'  Pull that off.  (the trailing ';' should
-                // be in the first 24 characters).
+                                // be in the first 24 characters).
-                var index = importStr.indexOf( ';' );
+                                var index = importStr.indexOf( ';' );
-                if ((importStr[0] === 'v') && (index < 24))
+                                if ((importStr[0] === 'v') && (index < 24))
-                {
+                                {
-                    // JSON format.  pull off the version info
+                                        // JSON format.  pull off the version info
-                    importStr = importStr.substr( index+1 );
+                                        importStr = importStr.substr( index+1 );
-                    var jObj = JSON.parse( importStr );
+                                        var jObj = JSON.parse( importStr );
-                    var id = jObj.id;
+                                        var id = jObj.id;
-                    if (id)
+                                        if (id)
-                    {
+                                        {
-                        var canvas = this.findCanvasWithID( id, root );
+                                                var canvas = this.findCanvasWithID( id, root );
-                        if (canvas)
+                                                if (canvas)
-                        {
+                                                {
 //                            new NinjaCvsRt.GLRuntime( canvas, jObj,  assetPath );
-                            var glRt = Object.create(NinjaCvsRt.GLRuntime, {});
+                                                        var glRt = Object.create(NinjaCvsRt.GLRuntime, {});
-                            glRt.renderWorld(canvas, jObj, this._assetPath);
+                                                        glRt.renderWorld(canvas, jObj, this._assetPath);

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js index 6268f0bb..13b36540 100644 --- a/assets/canvas-runtime.js +++ b/assets/canvas-runtime.js
@@ -56,60 +56,64 @@ NinjaCvsRt.initWebGl = function (rootElement, directory, data) {
56	///////////////////////////////////////////////////////////////////////	56	///////////////////////////////////////////////////////////////////////
57	NinjaCvsRt.CanvasDataManager = Object.create(Object.prototype, {	57	NinjaCvsRt.CanvasDataManager = Object.create(Object.prototype, {
58		58
59	loadGLData: {	59	loadGLData: {
60	value: function(root, valueArray, assetPath) {	60	value: function(root, valueArray, assetPath) {
61	if (assetPath)	61	if (assetPath)
62	this._assetPath = assetPath.slice();	62	this._assetPath = assetPath.slice();
63		63
64	var value = valueArray;	64	var value = valueArray;
65	var nWorlds = value.length;	65	var nWorlds = value.length;
66	for (var i=0; i<nWorlds; i++)	66	for (var i=0; i<nWorlds; i++)
67	{	67	{
68	var importStr = value[i];	68	var importStr = value[i];
69		69
70	// there should be some version information in	70	// there should be some version information in
71	// the form of 'v0.0;' Pull that off. (the trailing ';' should	71	// the form of 'v0.0;' Pull that off. (the trailing ';' should
72	// be in the first 24 characters).	72	// be in the first 24 characters).
73	var index = importStr.indexOf( ';' );	73	var index = importStr.indexOf( ';' );
74	if ((importStr[0] === 'v') && (index < 24))	74	if ((importStr[0] === 'v') && (index < 24))
75	{	75	{
76	// JSON format. pull off the version info	76	// JSON format. pull off the version info
77	importStr = importStr.substr( index+1 );	77	importStr = importStr.substr( index+1 );
78		78
79	var jObj = JSON.parse( importStr );	79	var jObj = JSON.parse( importStr );
80	var id = jObj.id;	80	var id = jObj.id;
81	if (id)	81	if (id)
82	{	82	{
83	var canvas = this.findCanvasWithID( id, root );	83	var canvas = this.findCanvasWithID( id, root );
84	if (canvas)	84	if (canvas)
85	{	85	{
86	// new NinjaCvsRt.GLRuntime( canvas, jObj, assetPath );	86	// new NinjaCvsRt.GLRuntime( canvas, jObj, assetPath );
87	var glRt = Object.create(NinjaCvsRt.GLRuntime, {});	87	var glRt = Object.create(NinjaCvsRt.GLRuntime, {});
88	glRt.renderWorld(canvas, jObj, this._assetPath);	88	glRt.renderWorld(canvas, jObj, this._assetPath);