diff options
author | Nivesh Rajbhandari | 2012-06-19 15:56:23 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-19 15:56:23 -0700 |
commit | 3ed06c2a55b1ae840334efeb47f7743944ecb3ca (patch) | |
tree | 0ad3e94248a1d4828386c8743a670c709357a470 | |
parent | a0d18963d746e410511c29edd32bc1775d2d5851 (diff) | |
parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
download | ninja-3ed06c2a55b1ae840334efeb47f7743944ecb3ca.tar.gz |
Merge branch 'refs/heads/ninja-internal' into GIO_Fixes
95 files changed, 5181 insertions, 4247 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) { | |||
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); |
89 | } | 89 | } |
90 | } | 90 | else |
91 | } | 91 | { |
92 | } | 92 | console.log( "***** COULD NOT FIND CANVAS WITH ID " + id + " *****" ); |
93 | } | 93 | } |
94 | }, | 94 | } |
95 | 95 | } | |
96 |