aboutsummaryrefslogtreecommitdiff
path: root/js/lib
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-14 10:29:18 -0700
committerValerio Virgillito2012-03-14 10:29:18 -0700
commit6df430d86c289413fea48f8e2ac37def72fbde46 (patch)
treecc16f59407a85b6c91d372d25fdae2ee1dac88d1 /js/lib
parentf4373594569f77d710eea9a266fe41419c029f85 (diff)
parentb4d3bf155e38e6554f05bb3cbaddd2f3bf799e90 (diff)
downloadninja-6df430d86c289413fea48f8e2ac37def72fbde46.tar.gz
Merge pull request #117 from mencio/layout-fix
Layout Fixes and Canvas sized when panels are collapsed
Diffstat (limited to 'js/lib')
-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()