diff options
author | Kris Kowal | 2012-07-09 16:38:08 -0700 |
---|---|---|
committer | Kris Kowal | 2012-07-09 16:38:08 -0700 |
commit | 7bee50379c1df86bb571e0e8d6c08e24d25231f5 (patch) | |
tree | 5b11abd0414e0a3ab50ec6276b6334fbd168db7e /js/tools/drawing-tool-base.js | |
parent | 26d4b5ce30e6e0ea6e0fde870853c1e2a673a7b4 (diff) | |
download | ninja-7bee50379c1df86bb571e0e8d6c08e24d25231f5.tar.gz |
BSD License
Diffstat (limited to 'js/tools/drawing-tool-base.js')
-rwxr-xr-x | js/tools/drawing-tool-base.js | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/js/tools/drawing-tool-base.js b/js/tools/drawing-tool-base.js index b2c8e6b4..5560f197 100755 --- a/js/tools/drawing-tool-base.js +++ b/js/tools/drawing-tool-base.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 |
@@ -50,7 +51,7 @@ exports.DrawingToolBase = Montage.create(Component, { | |||
50 | 51 | ||
51 | /** | 52 | /** |
52 | * Used on the initial MouseDown for Drawing Tools | 53 | * Used on the initial MouseDown for Drawing Tools |
53 | * | 54 | * |
54 | * Returns: An array containing: | 55 | * Returns: An array containing: |
55 | * 0 - HitRec point | 56 | * 0 - HitRec point |
56 | * 1 - X value converted to screen point | 57 | * 1 - X value converted to screen point |
@@ -292,7 +293,7 @@ exports.DrawingToolBase = Montage.create(Component, { | |||
292 | // return ({"width":w, "height":h, "planeMat":planeMat, "midPt":midPt}); | 293 | // return ({"width":w, "height":h, "planeMat":planeMat, "midPt":midPt}); |
293 | var s0Offset = s0.slice(0); | 294 | var s0Offset = s0.slice(0); |
294 | var s1Offset = s1.slice(0); | 295 | var s1Offset = s1.slice(0); |
295 | 296 | ||
296 | s0Offset[0] += snapManager.getStageWidth() / 2.0; | 297 | s0Offset[0] += snapManager.getStageWidth() / 2.0; |
297 | s0Offset[1] += snapManager.getStageHeight() / 2.0; | 298 | s0Offset[1] += snapManager.getStageHeight() / 2.0; |
298 | s1Offset[0] += snapManager.getStageWidth() / 2.0; | 299 | s1Offset[0] += snapManager.getStageWidth() / 2.0; |
@@ -515,7 +516,7 @@ exports.DrawingToolBase = Montage.create(Component, { | |||
515 | value: function( s0In, s1In, planeMat, planeMatInv, fixedS1 ) { | 516 | value: function( s0In, s1In, planeMat, planeMatInv, fixedS1 ) { |
516 | var s0 = s0In.slice(0); | 517 | var s0 = s0In.slice(0); |
517 | var s2 = s1In.slice(0); | 518 | var s2 = s1In.slice(0); |
518 | 519 | ||
519 | 520 | ||
520 | // calculate the mid point of the rectangle | 521 | // calculate the mid point of the rectangle |
521 | var midPt = vecUtils.vecAdd(3, s0, s2); | 522 | var midPt = vecUtils.vecAdd(3, s0, s2); |
@@ -549,7 +550,7 @@ exports.DrawingToolBase = Montage.create(Component, { | |||
549 | z = pt[2]*p/(p + pt[2]); | 550 | z = pt[2]*p/(p + pt[2]); |
550 | var x = pt[0]*(p - z)/p, | 551 | var x = pt[0]*(p - z)/p, |
551 | y = pt[1]*(p - z)/p; | 552 | y = pt[1]*(p - z)/p; |
552 | 553 | ||
553 | 554 | ||
554 | pt[0] = x; pt[1] = y; pt[2] = z; | 555 | pt[0] = x; pt[1] = y; pt[2] = z; |
555 | } | 556 | } |
@@ -683,6 +684,6 @@ exports.DrawingToolBase = Montage.create(Component, { | |||
683 | } | 684 | } |
684 | } | 685 | } |
685 | } | 686 | } |
686 | 687 | ||
687 | }); | 688 | }); |
688 | 689 | ||