diff options
author | Nivesh Rajbhandari | 2012-03-06 14:09:44 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-03-06 14:09:44 -0800 |
commit | 792793cd3991032b4840ade67f98ae8eae2d30a0 (patch) | |
tree | 69d3df003d2bb58fa1ab562fbd1058ff91851f01 /js/helper-classes/3D/StageLine.js | |
parent | 2346d8ab9db06573d8672c64988c46b6c672e015 (diff) | |
parent | 1cd89d4d06e3a8f2c221628b19cf26a2c69f5d3f (diff) | |
download | ninja-792793cd3991032b4840ade67f98ae8eae2d30a0.tar.gz |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/helper-classes/3D/StageLine.js')
-rwxr-xr-x | js/helper-classes/3D/StageLine.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/helper-classes/3D/StageLine.js b/js/helper-classes/3D/StageLine.js index e0e7a8e3..b86673d1 100755 --- a/js/helper-classes/3D/StageLine.js +++ b/js/helper-classes/3D/StageLine.js | |||
@@ -149,8 +149,8 @@ var StageLine = exports.StageLine = Object.create(Object.prototype, { | |||
149 | var vec = vecUtils.vecSubtract(3, bPt1, bPt0); | 149 | var vec = vecUtils.vecSubtract(3, bPt1, bPt0); |
150 | if (plane.isBackFacing()) | 150 | if (plane.isBackFacing()) |
151 | MathUtils.negate( vec ); | 151 | MathUtils.negate( vec ); |
152 | planeEq = Vector.create( [-vec[1], vec[0], 0] ); | 152 | planeEq = [-vec[1], vec[0], 0]; |
153 | var normal = Vector.create( [planeEq[0], planeEq[1], planeEq[2]] ); | 153 | var normal = [planeEq[0], planeEq[1], planeEq[2]]; |
154 | // var d = -planeEq.dot(bPt0); | 154 | // var d = -planeEq.dot(bPt0); |
155 | var d = -vecUtils.vecDot(3, planeEq, bPt0); | 155 | var d = -vecUtils.vecDot(3, planeEq, bPt0); |
156 | planeEq[3] = d; | 156 | planeEq[3] = d; |
@@ -414,8 +414,8 @@ var StageLine = exports.StageLine = Object.create(Object.prototype, { | |||
414 | if (pt0[1] < pt1[1]) { yMin = pt0[1]; yMax = pt1[1]; } else { yMin = pt1[1]; yMax = pt0[1]; } | 414 | if (pt0[1] < pt1[1]) { yMin = pt0[1]; yMax = pt1[1]; } else { yMin = pt1[1]; yMax = pt0[1]; } |
415 | if (pt0[2] < pt1[2]) { zMin = pt0[2]; zMax = pt1[2]; } else { zMin = pt1[2]; zMax = pt0[2]; } | 415 | if (pt0[2] < pt1[2]) { zMin = pt0[2]; zMax = pt1[2]; } else { zMin = pt1[2]; zMax = pt0[2]; } |
416 | 416 | ||
417 | this._minPt = Vector.create( [xMin, yMin, zMin] ); | 417 | this._minPt = [xMin, yMin, zMin]; |
418 | this._maxPt = Vector.create( [xMax, yMax, zMax] ); | 418 | this._maxPt = [xMax, yMax, zMax]; |
419 | } | 419 | } |
420 | }//, | 420 | }//, |
421 | 421 | ||