diff options
59 files changed, 4602 insertions, 2414 deletions
diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js index af860b95..ef1d01a9 100644 --- a/assets/canvas-runtime.js +++ b/assets/canvas-runtime.js | |||
@@ -56,60 +56,60 @@ 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 | } |
91 | } | 91 | } |
92 | } | 92 | } |
93 | } | 93 | } |
94 | }, | 94 | }, |
95 | 95 | ||
96 | findCanvasWithID: { | 96 | findCanvasWithID: { |
97 | value: function(id, elt) { | 97 | value: function(id, elt) { |
98 | var cid = elt.getAttribute( "data-RDGE-id" ); | 98 | var cid = elt.getAttribute( "data-RDGE-id" ); |
99 | if (cid == id) return elt; | 99 | if (cid == id) return elt; |
100 | 100 | ||
101 | if (elt.children) | 101 | if (elt.children) |
102 | { | 102 | { |
103 | var nKids = elt.children.length; | 103 | var nKids = elt.children.length; |
104 | for (var i=0; i<nKids; i++) | 104 | for (var i=0; i<nKids; i++) |
105 | { | 105 | { |
106 | var child = elt.children[i]; | 106 | var child = elt.children[i]; |
107 | var foundElt = this.findCanvasWithID( id, child ); | 107 | var foundElt = this.findCanvasWithID( id, child ); |
108 | if (foundElt) return foundElt; | 108 | if (foundElt) return foundElt; |
109 | } | 109 | } |
110 | } | 110 | } |
111 | } | 111 | } |
112 | } | 112 | } |
113 | }); | 113 | }); |
114 | 114 | ||
115 | /////////////////////////////////////////////////////////////////////// | 115 | /////////////////////////////////////////////////////////////////////// |
@@ -117,394 +117,394 @@ NinjaCvsRt.CanvasDataManager = Object.create(Object.prototype, { | |||
117 | // Manages runtime fora WebGL canvas | 117 | // Manages runtime fora WebGL canvas |
118 | /////////////////////////////////////////////////////////////////////// | 118 | /////////////////////////////////////////////////////////////////////// |
119 | NinjaCvsRt.GLRuntime = Object.create(Object.prototype, { | 119 | NinjaCvsRt.GLRuntime = Object.create(Object.prototype, { |
120 | /////////////////////////////////////////////////////////////////////// | 120 | /////////////////////////////////////////////////////////////////////// |
121 | // Instance variables | 121 | // Instance variables |
122 | /////////////////////////////////////////////////////////////////////// | 122 | /////////////////////////////////////////////////////////////////////// |
123 | _canvas: { value: null, writable: true }, | 123 | _canvas: { value: null, writable: true }, |
124 | _context : { value: null, writable: true }, | 124 | _context : { value: null, writable: true }, |
125 | //this._importStr = importStr; | 125 | //this._importStr = importStr; |
126 | _jObj: { value: null, writable: true }, | 126 | _jObj: { value: null, writable: true }, |
127 | 127 | ||
128 | _renderer: { value: null, writable: true }, | 128 | _renderer: { value: null, writable: true }, |
129 | myScene: { value: null, writable: true }, | 129 | myScene: { value: null, writable: true }, |
130 | light: { value: null, writable: true }, | 130 | light: { value: null, writable: true }, |
131 | light2: { value: null, writable: true }, | 131 | light2: { value: null, writable: true }, |
132 | _rootNode: { value: null, writable: true }, | 132 |