diff options
author | hwc487 | 2012-05-14 10:00:52 -0700 |
---|---|---|
committer | hwc487 | 2012-05-14 10:00:52 -0700 |
commit | 5fcb96cae89007c684df3ce948831e2fcf9fd8b7 (patch) | |
tree | f179b73bdc878d7f5a6799b2b1826e836168b805 /js/lib/drawing | |
parent | 137bfc9d4c41cc918d969565bec28a834fe10472 (diff) | |
download | ninja-5fcb96cae89007c684df3ce948831e2fcf9fd8b7.tar.gz |
Fixing merge issues
Diffstat (limited to 'js/lib/drawing')
-rwxr-xr-x | js/lib/drawing/world.js | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js index b46a002b..14e63f4a 100755 --- a/js/lib/drawing/world.js +++ b/js/lib/drawing/world.js | |||
@@ -31,7 +31,6 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) { | |||
31 | this._canvas = canvas; | 31 | this._canvas = canvas; |
32 | if (this._useWebGL) | 32 | if (this._useWebGL) |
33 | { | 33 | { |
34 | preserveDrawingBuffer = true; | ||
35 | if(preserveDrawingBuffer) | 34 | if(preserveDrawingBuffer) |
36 | { | 35 | { |
37 | this._glContext = canvas.getContext("experimental-webgl", {preserveDrawingBuffer: true}); | 36 | this._glContext = canvas.getContext("experimental-webgl", {preserveDrawingBuffer: true}); |
@@ -79,7 +78,6 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) { | |||
79 | this._firstRender = true; | 78 | this._firstRender = true; |
80 | 79 | ||
81 | this._worldCount = worldCounter; | 80 | this._worldCount = worldCounter; |
82 | console.log( "creating world " + this._worldCount ); | ||
83 | worldCounter++; | 81 | worldCounter++; |
84 | 82 | ||
85 | // keep a counter for generating node names | 83 | // keep a counter for generating node names |