aboutsummaryrefslogtreecommitdiff
path: root/js/lib/drawing
diff options
context:
space:
mode:
authorJon Reid2012-03-15 15:01:15 -0700
committerJon Reid2012-03-15 15:01:15 -0700
commit75dd0a2d333be1448f3f8bc0edd10f1c9199f84c (patch)
treef3a157f8cd92a8defb47edc68d8881db46f20586 /js/lib/drawing
parent21c941bd1fe55e511a72bfa5dc3019748158bd4a (diff)
parent68d82cb56cb0235599c46caf349f328f15300fdf (diff)
downloadninja-75dd0a2d333be1448f3f8bc0edd10f1c9199f84c.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local
Diffstat (limited to 'js/lib/drawing')
-rwxr-xr-xjs/lib/drawing/world.js8
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()