diff options
Diffstat (limited to 'js/lib/geom/anchor-point.js')
-rwxr-xr-x | js/lib/geom/anchor-point.js | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/js/lib/geom/anchor-point.js b/js/lib/geom/anchor-point.js index a1fcfc0d..3eb829f8 100755 --- a/js/lib/geom/anchor-point.js +++ b/js/lib/geom/anchor-point.js | |||
@@ -1,24 +1,25 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | Copyright (c) 2012, Motorola Mobility, Inc | 2 | Copyright (c) 2012, Motorola Mobility LLC. |
3 | All Rights Reserved. | 3 | All Rights Reserved. |
4 | BSD License. | ||
5 | 4 | ||
6 | Redistribution and use in source and binary forms, with or without | 5 | Redistribution and use in source and binary forms, with or without |
7 | modification, are permitted provided that the following conditions are met: | 6 | modification, are permitted provided that the following conditions are met: |
8 | 7 | ||
9 | - Redistributions of source code must retain the above copyright notice, | 8 | * Redistributions of source code must retain the above copyright notice, |
10 | this list of conditions and the following disclaimer. | 9 | this list of conditions and the following disclaimer. |
11 | - Redistributions in binary form must reproduce the above copyright | 10 | |
12 | notice, this list of conditions and the following disclaimer in the | 11 | * Redistributions in binary form must reproduce the above copyright notice, |
13 | documentation and/or other materials provided with the distribution. | 12 | this list of conditions and the following disclaimer in the documentation |
14 | - Neither the name of Motorola Mobility nor the names of its contributors | 13 | and/or other materials provided with the distribution. |
15 | may be used to endorse or promote products derived from this software | 14 | |
16 | without specific prior written permission. | 15 | * Neither the name of Motorola Mobility LLC nor the names of its |
16 | contributors may be used to endorse or promote products derived from this | ||
17 | software without specific prior written permission. | ||
17 | 18 | ||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -30,14 +31,14 @@ POSSIBILITY OF SUCH DAMAGE. | |||
30 | 31 | ||
31 | ///////////////////////////////////////////// | 32 | ///////////////////////////////////////////// |
32 | // Class GLAnchorPoint | 33 | // Class GLAnchorPoint |
33 | // GL representation of a point clicked | 34 | // GL representation of a point clicked |
34 | // and dragged during pen tool | 35 | // and dragged during pen tool |
35 | // | 36 | // |
36 | // | 37 | // |
37 | ///////////////////////////////////////////// | 38 | ///////////////////////////////////////////// |
38 | var GLAnchorPoint = function GLAnchorPoint() { | 39 | var GLAnchorPoint = function GLAnchorPoint() { |
39 | ///////////////////////////////////////// | 40 | ///////////////////////////////////////// |
40 | // Instance variables | 41 | // Instance variables |
41 | ///////////////////////////////////////// | 42 | ///////////////////////////////////////// |
42 | this._x = 0.0; | 43 | this._x = 0.0; |
43 | this._y = 0.0; | 44 | this._y = 0.0; |
@@ -99,7 +100,7 @@ GLAnchorPoint.prototype.translateNextFromPrev = function (tx, ty, tz) { | |||
99 | if (totalTransSq < 0.0000001) { | 100 | if (totalTransSq < 0.0000001) { |
100 | return; | 101 | return; |
101 | } | 102 | } |
102 | 103 | ||
103 | // *** compute the rotation of the prev vector *** | 104 | // *** compute the rotation of the prev vector *** |
104 | var oldP = [this._prevX + tx - this._x, this._prevY + ty - this._y, this._prevZ + tz - this._z]; | 105 | var oldP = [this._prevX + tx - this._x, this._prevY + ty - this._y, this._prevZ + tz - this._z]; |
105 | var newP = [this._prevX - this._x, this._prevY - this._y, this._prevZ - this._z]; | 106 | var newP = [this._prevX - this._x, this._prevY - this._y, this._prevZ - this._z]; |
@@ -133,7 +134,7 @@ GLAnchorPoint.prototype.translatePrevFromNext = function (tx, ty, tz) { | |||
133 | if (totalTransSq < 0.0000001) { | 134 | if (totalTransSq < 0.0000001) { |
134 | return; | 135 | return; |
135 | } | 136 | } |
136 | 137 | ||
137 | // *** compute the rotation of the next vector *** | 138 | // *** compute the rotation of the next vector *** |
138 | var oldN = [this._nextX + tx - this._x, this._nextY + ty - this._y, this._nextZ + tz - this._z]; | 139 | var oldN = [this._nextX + tx - this._x, this._nextY + ty - this._y, this._nextZ + tz - this._z]; |
139 | var newN = [this._nextX - this._x, this._nextY - this._y, this._nextZ - this._z]; | 140 | var newN = [this._nextX - this._x, this._nextY - this._y, this._nextZ - this._z]; |