diff options
author | Valerio Virgillito | 2012-06-06 14:28:45 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-06 14:28:45 -0700 |
commit | 9b2aacd1ced60edb9cb604e9983f7c36fd409e0b (patch) | |
tree | eb90111539ab8ba8b4e6666ec7799906ca09198c /js/helper-classes | |
parent | 18e212dca48066d1ddaca96875a3f40adcc859b6 (diff) | |
parent | ea195af100d327aac68ada28387fe8259d0f31f4 (diff) | |
download | ninja-9b2aacd1ced60edb9cb604e9983f7c36fd409e0b.tar.gz |
Merge pull request #272 from pushkarjoshi/pentool
Pentool
Diffstat (limited to 'js/helper-classes')
-rwxr-xr-x | js/helper-classes/3D/math-utils.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/js/helper-classes/3D/math-utils.js b/js/helper-classes/3D/math-utils.js index 2f0283a9..35ee8112 100755 --- a/js/helper-classes/3D/math-utils.js +++ b/js/helper-classes/3D/math-utils.js | |||
@@ -928,17 +928,18 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, { | |||
928 | return 0; | 928 | return 0; |
929 | } | 929 | } |
930 | //TODO testing...remove this block | 930 | //TODO testing...remove this block |
931 | console.log("getAxisAngleBetween3DVectors Angle: "+angle); | ||
932 | if (isNaN(angle)){ | 931 | if (isNaN(angle)){ |
933 | console.log("getAxisAngleBetween3DVectors Angle is NaN"); | 932 | console.log("Warning! getAxisAngleBetween3DVectors Angle is NaN"); |
934 | } | 933 | } |
935 | //TODO end testing block | 934 | //TODO end testing block |
936 | //optionally, if axis is provided, create the axis of rotation as well | 935 | //optionally, if axis is provided, create the axis of rotation as well |
937 | var rotAxis = VecUtils.vecCross(3, v1n, v2n); | 936 | var rotAxis = VecUtils.vecCross(3, v1n, v2n); |
938 | rotAxis = VecUtils.vecNormalize(3, rotAxis, 1); | 937 | rotAxis = VecUtils.vecNormalize(3, rotAxis, 1); |
939 | axis[0] = rotAxis[0]; | 938 | if (axis){ |
940 | axis[1] = rotAxis[1]; | 939 | axis[0] = rotAxis[0]; |
941 | axis[2] = rotAxis[2]; | 940 | axis[1] = rotAxis[1]; |
941 | axis[2] = rotAxis[2]; | ||
942 | } | ||
942 | return angle; | 943 | return angle; |
943 | } | 944 | } |
944 | }, | 945 | }, |