Merge pull request #5 from joseeight/FileIO-Integration

Clean-Up

3 files changed, 25 insertions, 27 deletions

diff --git a/assets/CanvasRuntime.js b/assets/canvas-runtime.js
index 445050bc..655e52fa 100644
--- a/assets/CanvasRuntime.js
+++ b/assets/canvas-runtime.js
@@ -4,6 +4,20 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
+///////////////////////////////////////////////////////////////////////
+//Loading webGL/canvas data
+function initWebGl (rootElement, directory) {
+        var cvsDataMngr, ninjaWebGlData = JSON.parse((document.querySelectorAll(['script[data-ninja-webgl]'])[0].innerHTML.replace('(', '')).replace(')', ''));
+        if (ninjaWebGlData && ninjaWebGlData.data) {
+                for (var n=0; ninjaWebGlData.data[n]; n++) {
+                        ninjaWebGlData.data[n] = unescape(ninjaWebGlData.data[n]);
+                }
+        }
+        //Creating data manager
+        cvsDataMngr = new CanvasDataManager();
+        //Loading data to canvas(es)
+        cvsDataMngr.loadGLData(rootElement, ninjaWebGlData.data, directory);
+}
 
 ///////////////////////////////////////////////////////////////////////
 // Class ShapeRuntime
diff --git a/assets/descriptor.json b/assets/descriptor.json
index 0da58755..af0520dd 100644
--- a/assets/descriptor.json
+++ b/assets/descriptor.json
@@ -1,10 +1,10 @@
 {
         "copyright": "This file contains proprietary software owned by Motorola Mobility, Inc. No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder. (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.",
-        "version": "0.5.1.0",
+        "version": "0.0.0.0",
         "root": "/assets/",
         "directories": [{"name": "images"}, {"name": "shaders"}],
         "files": [
-                "CanvasRuntime.js",
+                "canvas-runtime.js",
                 "rdge-compiled.js",
                 "images/BoxB2_AO.png",
                 "images/grey.png",
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index e9661f20..d81f4543 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -408,7 +408,7 @@ exports.IoMediator = Montage.create(Component, {
                         if (!webgllibtag) {
                                 webgllibtag = template.document.content.document.createElement('script');
                                 webgllibtag.setAttribute('type', 'text/javascript');
-                                webgllibtag.setAttribute('src', rdgeDirName+'/CanvasRuntime.js');
+                                webgllibtag.setAttribute('src', rdgeDirName+'/canvas-runtime.js');
                                 webgllibtag.setAttribute('data-ninja-webgl-lib', 'true');
                                 template.document.content.document.head.appendChild(webgllibtag);
                         }
@@ -418,7 +418,7 @@ exports.IoMediator = Montage.create(Component, {
                                 webgltag.setAttribute('data-ninja-webgl', 'true');
                                 template.document.content.document.head.appendChild(webgltag);
                         }
-                        //
+                        //TODO: Remove this tag and place inside JS file
                         if (!webgljstag) {
                                 webgljstag = template.document.content.document.createElement('script');
                                 webgljstag.setAttribute('type', 'text/javascript');
@@ -426,24 +426,17 @@ exports.IoMediator = Montage.create(Component, {
                                 template.document.content.document.head.appendChild(webgljstag);
                         }
                         //TODO: Decide if this should be over-writter or only written on creation
+                        var rootElement = 'document.body'; //TODO: Set actual root element
                         webgljstag.innerHTML = "\
 //Loading webGL/canvas data on window load\n\
-window.addEventListener('load', initWebGl, false);\n\
-function initWebGl (e) {\n\
-        window.removeEventListener('load', initWebGl, false);\n\
-        var cvsDataMngr, ninjaWebGlData = JSON.parse((document.querySelectorAll(['script[data-ninja-webgl]'])[0].innerHTML.replace(\"(\", \"\")).replace(\")\", \"\"));\n\
-        if (ninjaWebGlData && ninjaWebGlData.data) {\n\
-                for (var n=0; ninjaWebGlData.data[n]; n++) {\n\
-                        ninjaWebGlData.data[n] = unescape(ninjaWebGlData.data[n]);\n\
-                }\n\
-        }\n\
-        //Creating data manager\n\
-        cvsDataMngr = new CanvasDataManager();\n\
-        //Loading data to canvas(es)\n\
-        cvsDataMngr.loadGLData(document.body, ninjaWebGlData.data, '"+rdgeDirName+"/');\n\
+window.addEventListener('load', loadWebGL, false);\n\
+function loadWebGL (e) {\n\
+        window.removeEventListener('load', loadWebGL, false);\n\
+        //Calling method to initialize all webGL/canvas(es)\n\
+        initWebGl("+rootElement+", '"+rdgeDirName+"/');\n\
 }\
                         ";
-                        //TODO: Add version and other data for RDGE
+                        //TODO: This data should be saved to a JSON file eventually
                         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++) {
@@ -457,15 +450,6 @@ function initWebGl (e) {\n\
                         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+'/';
-                        }
-                        //
-                        console.log(webgltag.innerHTML);
-*/
                 }
                 //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));