diff options
Diffstat (limited to 'js/tools/Translate3DToolBase.js')
-rwxr-xr-x | js/tools/Translate3DToolBase.js | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js index 00408b6e..c7747c38 100755 --- a/js/tools/Translate3DToolBase.js +++ b/js/tools/Translate3DToolBase.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 |
@@ -170,7 +171,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, | |||
170 | matInv = glmat4.inverse(this._startMat, []), | 171 | matInv = glmat4.inverse(this._startMat, []), |
171 | nMat = glmat4.multiply(transMat, this._startMat, [] ); | 172 | nMat = glmat4.multiply(transMat, this._startMat, [] ); |
172 | // qMat = glmat4.multiply(matInv, nMat, []); | 173 | // qMat = glmat4.multiply(matInv, nMat, []); |
173 | 174 | ||
174 | if(this._mode === 1) { | 175 | if(this._mode === 1) { |
175 | if (len > 1) curMat = target.elementModel.getProperty("mat").slice(); | 176 | if (len > 1) curMat = target.elementModel.getProperty("mat").slice(); |
176 | var curInv = glmat4.inverse( curMat, [] ); | 177 | var curInv = glmat4.inverse( curMat, [] ); |
@@ -313,7 +314,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, | |||
313 | eltCtr[2] = 0; | 314 | eltCtr[2] = 0; |
314 | eltCtr = vecUtils.vecAdd(3, eltCtr, ctrOffset); | 315 | eltCtr = vecUtils.vecAdd(3, eltCtr, ctrOffset); |
315 | } | 316 | } |
316 | 317 | ||
317 | this._origin = viewUtils.localToGlobal(eltCtr, this.target); | 318 | this._origin = viewUtils.localToGlobal(eltCtr, this.target); |
318 | // console.log( "Rotate3DToolBase.captureSelectionDrawn _origin: " + this._origin ); | 319 | // console.log( "Rotate3DToolBase.captureSelectionDrawn _origin: " + this._origin ); |
319 | this._updateTargets(); | 320 | this._updateTargets(); |
@@ -340,8 +341,8 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, | |||
340 | } | 341 | } |
341 | } | 342 | } |
342 | }, | 343 | }, |
343 | 344 | ||
344 | calculateMultiSelOrigin: | 345 | calculateMultiSelOrigin: |
345 | { | 346 | { |
346 | value: function() | 347 | value: function() |
347 | { | 348 | { |
@@ -472,5 +473,5 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, | |||
472 | viewUtils.popViewportObj(); | 473 | viewUtils.popViewportObj(); |
473 | } | 474 | } |
474 | } | 475 | } |
475 | 476 | ||
476 | }); | 477 | }); |