aboutsummaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorEric2012-03-13 10:54:53 -0700
committerEric2012-03-13 10:54:53 -0700
commitf6c7b88404cfa44f468170f1219b565fda3e38c1 (patch)
treedf33988e4240ea868d91fe07f35cc3c72f6ac307 /assets
parent46defc9bd11bf077efd672c72787a3b67da1a178 (diff)
parent4d7b86f55c504ee4e8c2460cf6b60cb9a2cf18f0 (diff)
downloadninja-f6c7b88404cfa44f468170f1219b565fda3e38c1.tar.gz
Merge pull request #5 from joseeight/FileIO-Integration
Clean-Up
Diffstat (limited to 'assets')
-rw-r--r--assets/canvas-runtime.js (renamed from assets/CanvasRuntime.js)14
-rw-r--r--assets/descriptor.json4
2 files changed, 16 insertions, 2 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
4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5</copyright> */ 5</copyright> */
6 6
7///////////////////////////////////////////////////////////////////////
8//Loading webGL/canvas data
9function initWebGl (rootElement, directory) {
10 var cvsDataMngr, ninjaWebGlData = JSON.parse((document.querySelectorAll(['script[data-ninja-webgl]'])[0].innerHTML.replace('(', '')).replace(')', ''));
11 if (ninjaWebGlData && ninjaWebGlData.data) {
12 for (var n=0; ninjaWebGlData.data[n]; n++) {
13 ninjaWebGlData.data[n] = unescape(ninjaWebGlData.data[n]);
14 }
15 }
16 //Creating data manager
17 cvsDataMngr = new CanvasDataManager();
18 //Loading data to canvas(es)
19 cvsDataMngr.loadGLData(rootElement, ninjaWebGlData.data, directory);
20}
7 21
8/////////////////////////////////////////////////////////////////////// 22///////////////////////////////////////////////////////////////////////
9// Class ShapeRuntime 23// 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 @@
1{ 1{
2 "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.", 2 "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.",
3 "version": "0.5.1.0", 3 "version": "0.0.0.0",
4 "root": "/assets/", 4 "root": "/assets/",
5 "directories": [{"name": "images"}, {"name": "shaders"}], 5 "directories": [{"name": "images"}, {"name": "shaders"}],
6 "files": [ 6 "files": [
7 "CanvasRuntime.js", 7 "canvas-runtime.js",
8 "rdge-compiled.js", 8 "rdge-compiled.js",
9 "images/BoxB2_AO.png", 9 "images/BoxB2_AO.png",
10 "images/grey.png", 10 "images/grey.png",