diff options
author | Eric Guzman | 2012-03-14 10:58:02 -0700 |
---|---|---|
committer | Eric Guzman | 2012-03-14 10:58:02 -0700 |
commit | 562e6d71d8bbe149f856b126e4c4246fc2d843ef (patch) | |
tree | f4f4f551003807d5344a93ebcad88f99d2c15444 /js/lib/drawing | |
parent | 9aa0880cd37d34c9c2d9c4ed455aa1f562f56ef3 (diff) | |
parent | 6df430d86c289413fea48f8e2ac37def72fbde46 (diff) | |
download | ninja-562e6d71d8bbe149f856b126e4c4246fc2d843ef.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/lib/drawing')
-rwxr-xr-x | js/lib/drawing/world.js | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js index df24f556..049145ce 100755 --- a/js/lib/drawing/world.js +++ b/js/lib/drawing/world.js | |||
@@ -351,20 +351,18 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) { | |||
351 | return false; | 351 | return false; |
352 | }; | 352 | }; |
353 | 353 | ||
354 | this.generateUniqueNodeID = function() | 354 | this.generateUniqueNodeID = function() { |
355 | { | ||
356 | var str = "" + this._nodeCounter; | 355 | var str = "" + this._nodeCounter; |
357 | this._nodeCounter++; | 356 | this._nodeCounter++; |
358 | return str; | 357 | return str; |
359 | } | 358 | }; |
360 | 359 | ||
361 | 360 | ||
362 | // start RDGE passing your runtime object, and false to indicate we don't need a an initialization state | 361 | // start RDGE passing your runtime object, and false to indicate we don't need a an initialization state |
363 | // in the case of a procedurally built scene an init state is not needed for loading data | 362 | // in the case of a procedurally built scene an init state is not needed for loading data |
364 | if (this._useWebGL) { | 363 | if (this._useWebGL) { |
365 | rdgeStarted = true; | 364 | rdgeStarted = true; |
366 | var id = this._canvas.getAttribute( "data-RDGE-id" ); | 365 | this._canvas.rdgeid = this._canvas.getAttribute( "data-RDGE-id" ); |
367 | this._canvas.rdgeid = id; | ||
368 | g_Engine.registerCanvas(this._canvas, this); | 366 | g_Engine.registerCanvas(this._canvas, this); |
369 | RDGEStart( this._canvas ); | 367 | RDGEStart( this._canvas ); |
370 | this._canvas.task.stop() | 368 | this._canvas.task.stop() |