From 82b6b752123022670c422b8a083c93d865c9533a Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 9 Mar 2012 11:01:59 -0800
Subject: Adding webGL I/O runtime functionality

There is a problem that needs to be resolved in the CanvasRuntime.
---
 js/mediators/io-mediator.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'js/mediators')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index c22d95be..277b3a1b 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -389,7 +389,7 @@ exports.IoMediator = Montage.create(Component, {
     			if (!webgllibtag) {
     				webgllibtag = template.document.content.document.createElement('script');
     				webgllibtag.setAttribute('type', 'text/javascript');
-    				webgllibtag.setAttribute('src', rdgeDirName+'/CanvasDataManager.js');
+    				webgllibtag.setAttribute('src', rdgeDirName+'/CanvasRuntime.js');
     				webgllibtag.setAttribute('data-ninja-webgl-lib', 'true');
     				template.document.content.document.head.appendChild(webgllibtag);
     			}
@@ -421,11 +421,11 @@ function initWebGl (e) {\n\
 	//Creating data manager\n\
 	cvsDataMngr = new CanvasDataManager();\n\
 	//Loading data to canvas(es)\n\
-	cvsDataMngr.loadGLData(document.body, ninjaWebGlData, '"+rdgeDirName+"');\n\
+	cvsDataMngr.loadGLData(document.body, ninjaWebGlData.data);\n\
 }\
     			";
     			//TODO: Add version and other data for RDGE
-    			json = '\n({\n\t"version": "'+rdgeVersion+'",\n\t"data": [';
+    			json = '\n({\n\t"version": "'+rdgeVersion+'",\n\t"directory": "'+rdgeDirName+'/",\n\t"data": [';
     			//Looping through data to create escaped array
     			for (var j=0; template.webgl[j]; j++) {
     				if (j === 0) {
@@ -437,7 +437,11 @@ function initWebGl (e) {\n\
     			//Closing array (make-shift JSON string to validate data in <script> tag)
     			json += '\n\t\t]\n})\n';
     			//Setting string in tag
-    			webgltag.innerHTML = json;
+    			webgltag.innerHTML = json.replace(/assets\//gi, webGlDirSwap);
+    			//
+    			function webGlDirSwap (dir) {
+    				return rdgeDirName+'/';
+    			}
     		}
     		//Cleaning URLs from HTML
     		var cleanHTML = template.document.content.document.documentElement.outerHTML.replace(/(\b(?:(?:https?|ftp|file|[A-Za-z]+):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#\/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[A-Z0-9+&@#\/%=~_|$]))/gi, parseNinjaRootUrl.bind(this));
-- 
cgit v1.2.3


From 5da69dfd30f353ff753cba9322744e2f33f32a1a Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 9 Mar 2012 13:36:15 -0800
Subject: Adding missing file for webGL, still need a fix for runtime

---
 js/mediators/io-mediator.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'js/mediators')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 277b3a1b..ffae0192 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -361,7 +361,7 @@ exports.IoMediator = Montage.create(Component, {
     				}
     			}
     			//
-    			var json, matchingtags = [], webgltag, scripts = template.document.content.document.getElementsByTagName('script'), webgljstag, webgllibtag;
+    			var json, matchingtags = [], webgltag, scripts = template.document.content.document.getElementsByTagName('script'), webgljstag, webgllibtag, webglrdgetag;
     			//
     			for (var i in scripts) {
     				if (scripts[i].getAttribute) {
@@ -374,6 +374,9 @@ exports.IoMediator = Montage.create(Component, {
     					if (scripts[i].getAttribute('data-ninja-webgl-lib') !== null) {
     						webgllibtag = scripts[i]; // TODO: Add logic to delete unneccesary tags
     					}
+    					if (scripts[i].getAttribute('data-ninja-webgl-rdge') !== null) {
+    						webglrdgetag = scripts[i]; // TODO: Add logic to delete unneccesary tags
+    					}
     				}
     			}
     			//
@@ -386,6 +389,14 @@ exports.IoMediator = Montage.create(Component, {
     				}
     			}
     			//
+    			if (!webglrdgetag) {
+    				webglrdgetag = template.document.content.document.createElement('script');
+    				webglrdgetag.setAttribute('type', 'text/javascript');
+    				webglrdgetag.setAttribute('src', rdgeDirName+'/rdge-compiled.js');
+    				webglrdgetag.setAttribute('data-ninja-webgl-rdge', 'true');
+    				template.document.content.document.head.appendChild(webglrdgetag);
+    			}
+    			//
     			if (!webgllibtag) {
     				webgllibtag = template.document.content.document.createElement('script');
     				webgllibtag.setAttribute('type', 'text/javascript');
@@ -421,7 +432,7 @@ function initWebGl (e) {\n\
 	//Creating data manager\n\
 	cvsDataMngr = new CanvasDataManager();\n\
 	//Loading data to canvas(es)\n\
-	cvsDataMngr.loadGLData(document.body, ninjaWebGlData.data);\n\
+	cvsDataMngr.loadGLData(document.body, ninjaWebGlData.data, '"+rdgeDirName+"/');\n\
 }\
     			";
     			//TODO: Add version and other data for RDGE
@@ -437,11 +448,14 @@ function initWebGl (e) {\n\
     			//Closing array (make-shift JSON string to validate data in <script> tag)
     			json += '\n\t\t]\n})\n';
     			//Setting string in tag
-    			webgltag.innerHTML = json.replace(/assets\//gi, webGlDirSwap);
+    			webgltag.innerHTML = json;
+    			/*
+webgltag.innerHTML = json.replace(/assets\//gi, webGlDirSwap);
     			//
     			function webGlDirSwap (dir) {
     				return rdgeDirName+'/';
     			}
+*/
     		}
     		//Cleaning URLs from HTML
     		var cleanHTML = template.document.content.document.documentElement.outerHTML.replace(/(\b(?:(?:https?|ftp|file|[A-Za-z]+):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#\/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[A-Z0-9+&@#\/%=~_|$]))/gi, parseNinjaRootUrl.bind(this));
-- 
cgit v1.2.3


From 30c20960190e76cdcff0a3b2036c881dc751e05e Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 9 Mar 2012 14:23:07 -0800
Subject: Clean up

---
 js/mediators/io-mediator.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'js/mediators')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index ffae0192..d26c7a88 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -455,6 +455,8 @@ webgltag.innerHTML = json.replace(/assets\//gi, webGlDirSwap);
     			function webGlDirSwap (dir) {
     				return rdgeDirName+'/';
     			}
+    			//
+    			console.log(webgltag.innerHTML);
 */
     		}
     		//Cleaning URLs from HTML
-- 
cgit v1.2.3


From d8c9578ced2c0dad0a9152ff955511986d9c013d Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Sat, 10 Mar 2012 13:21:50 -0800
Subject: Setting local path to assets

This is still no resolving issues with webGL runtime.
---
 js/mediators/io-mediator.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'js/mediators')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index d26c7a88..11aeb74d 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -431,6 +431,7 @@ function initWebGl (e) {\n\
 	}\n\
 	//Creating data manager\n\
 	cvsDataMngr = new CanvasDataManager();\n\
+	g_Engine._assetPath = '"+rdgeDirName+"/';\n\
 	//Loading data to canvas(es)\n\
 	cvsDataMngr.loadGLData(document.body, ninjaWebGlData.data, '"+rdgeDirName+"/');\n\
 }\
-- 
cgit v1.2.3


From 615be47750fb86c07acd9354da12a76abe6c24e0 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Sat, 10 Mar 2012 16:27:48 -0800
Subject: Temp Runtime WebGL Fix

Added a temporary fix to allow for webGL runtime functionality. Copying the desired folder name into a static name. There is a lag in doing this, so obviously now ideal. Need to discuss adding dynamic path-ing during author and runtime.
---
 js/mediators/io-mediator.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'js/mediators')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 11aeb74d..e9661f20 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -355,7 +355,15 @@ exports.IoMediator = Montage.create(Component, {
 		    		if (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'RDGE') {
 		    			rdgeDirName = (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name+this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version).toLowerCase();
     					rdgeVersion = this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version;
-    					this.application.ninja.coreIoApi.ninjaLibrary.copyLibToCloud(template.document.root, rdgeDirName);
+    					this.application.ninja.coreIoApi.ninjaLibrary.copyLibToCloud(template.document.root, rdgeDirName, hackRename.bind(this));
+    					//TODO: Remove, this is copying the library into a static name
+    					function hackRename (status) {
+    						if (status) {
+    							setTimeout(function () {
+    								this.application.ninja.coreIoApi.copyDirectory({sourceUri: template.document.root+rdgeDirName, destUri: template.document.root+'assets'});
+    							}.bind(this), 3000);
+    						}
+    					}
     				} else {
     					//TODO: Error handle no available library to copy
     				}
@@ -431,7 +439,6 @@ function initWebGl (e) {\n\
 	}\n\
 	//Creating data manager\n\
 	cvsDataMngr = new CanvasDataManager();\n\
-	g_Engine._assetPath = '"+rdgeDirName+"/';\n\
 	//Loading data to canvas(es)\n\
 	cvsDataMngr.loadGLData(document.body, ninjaWebGlData.data, '"+rdgeDirName+"/');\n\
 }\
-- 
cgit v1.2.3