diff options
author | Valerio Virgillito | 2012-07-09 12:16:36 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 12:16:36 -0700 |
commit | bab026fb07f6137ca32cb501f2d7c8167a6bd733 (patch) | |
tree | e3d5acb6eb3f8c3be2e065b2ed7a602b65d53fba /js/helper-classes/3D/math-utils.js | |
parent | 1839f24e8dcbad38d1381bbcd65c17a9caa45987 (diff) | |
parent | 3df60279083f2cda60b3b871037c6d58454de5b2 (diff) | |
download | ninja-bab026fb07f6137ca32cb501f2d7c8167a6bd733.tar.gz |
Merge pull request #357 from ericmueller/GridFixes
Fixes for incorrect line/polygon intersections.
Diffstat (limited to 'js/helper-classes/3D/math-utils.js')
-rwxr-xr-x | js/helper-classes/3D/math-utils.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/helper-classes/3D/math-utils.js b/js/helper-classes/3D/math-utils.js index 8a9be4b5..d793960c 100755 --- a/js/helper-classes/3D/math-utils.js +++ b/js/helper-classes/3D/math-utils.js | |||
@@ -839,7 +839,8 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, { | |||
839 | { | 839 | { |
840 | //var t = vec1.modulus() / vec0.modulus(); | 840 | //var t = vec1.modulus() / vec0.modulus(); |
841 | var t = VecUtils.vecMag(2, vec1)/VecUtils.vecMag(2, vec0); | 841 | var t = VecUtils.vecMag(2, vec1)/VecUtils.vecMag(2, vec0); |
842 | if ((this.fpSign(t) >= 0) && (this.fpCmp(t,1.0) <= 0)) | 842 | var dot = VecUtils.vecDot(2, vec0, vec1); |
843 | if ((this.fpSign(dot) >= 0) && (this.fpSign(t) >= 0) && (this.fpCmp(t,1.0) <= 0)) | ||
843 | return this.ON; | 844 | return this.ON; |
844 | else | 845 | else |
845 | return this.OUTSIDE; | 846 | return this.OUTSIDE; |