diff options
author | Pushkar Joshi | 2012-03-14 15:39:59 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-14 15:39:59 -0700 |
commit | 571ed9ef856780eded3ac7104ed0ce72c7c7c81c (patch) | |
tree | fc7bdcd86b2eb742f4cda2ccdee6bd599b1f382e /js/lib | |
parent | 23baa44e0bc7bfb24e42702c1ef58bf62da083d8 (diff) | |
parent | 089534a80c64226bf7d124ab9147afce386fdb5c (diff) | |
download | ninja-571ed9ef856780eded3ac7104ed0ce72c7c7c81c.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/lib')
-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() |