aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-11 11:11:18 -0700
committerValerio Virgillito2012-05-11 11:11:18 -0700
commit5d154f12287dcc1e8a4125b931d4f36e633d6907 (patch)
treeb68b4fa144b740fd4890de2447c463fd7d9eb812
parent063252524696261bc347e2c3fb1ca82db80183e0 (diff)
parent6abfeed78ddae26f04531cddbcb560451891c412 (diff)
downloadninja-5d154f12287dcc1e8a4125b931d4f36e633d6907.tar.gz
Merge pull request #218 from mqg734/Dom-Architecture
Fixing runtime error after toggling use webgl.
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js6
-rwxr-xr-xjs/helper-classes/3D/view-utils.js2
2 files changed, 3 insertions, 5 deletions
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index f639521c..b53ac4ad 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -1170,8 +1170,8 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
1170 var saveColor = this._lineColor; 1170 var saveColor = this._lineColor;
1171 var saveLineWidth = this._lineWidth; 1171 var saveLineWidth = this._lineWidth;
1172 1172
1173 var origLeft = 50; 1173 var origLeft = 60;
1174 var origTop = this.snapManager.getStageHeight() - 50; 1174 var origTop = this.snapManager.getStageHeight() - 60;
1175 1175
1176 var mat = this.viewUtils.getMatrixFromElement( this._sourceSpaceElt ); 1176 var mat = this.viewUtils.getMatrixFromElement( this._sourceSpaceElt );
1177 var tMat = Matrix.Translation([origLeft,origTop,0]); 1177 var tMat = Matrix.Translation([origLeft,origTop,0]);
@@ -1203,7 +1203,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
1203 this.setDrawingSurfaceElement(this.application.ninja.stage.layoutCanvas); 1203 this.setDrawingSurfaceElement(this.application.ninja.stage.layoutCanvas);
1204 // clear just the 3d compass area 1204 // clear just the 3d compass area
1205 this._drawingContext.save(); 1205 this._drawingContext.save();
1206 this._drawingContext.rect(0, origTop-50, 100, 100); 1206 this._drawingContext.rect(10, origTop-60, 100, 110);
1207 this._drawingContext.clip(); 1207 this._drawingContext.clip();
1208 1208
1209 this._drawingContext.lineWidth = 2.0; 1209 this._drawingContext.lineWidth = 2.0;
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index 5dc099ee..6da6de0e 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -359,11 +359,9 @@ exports.ViewUtils = Montage.create(Component, {
359 { 359 {
360 pt = this.childToParent( pt, child ); 360 pt = this.childToParent( pt, child );
361 361
362// if (parent === this._rootElement) break;
363 if (child === this._stageElement) break; 362 if (child === this._stageElement) break;
364 363
365 child = parent; 364 child = parent;
366 parent = parent.offsetParent;
367 } 365 }
368 366
369 ///////////////////////////////////////////////////////// 367 /////////////////////////////////////////////////////////