diff options
Diffstat (limited to 'js/models/properties-3d.js')
-rwxr-xr-x | js/models/properties-3d.js | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/js/models/properties-3d.js b/js/models/properties-3d.js index 98cc03b3..99c9c47c 100755 --- a/js/models/properties-3d.js +++ b/js/models/properties-3d.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 |
@@ -43,7 +44,7 @@ exports.Properties3D = Montage.create(Component, { | |||
43 | m_endAzimuth : {value : 0, enumerable: true}, | 44 | m_endAzimuth : {value : 0, enumerable: true}, |
44 | m_endAltitude : {value : 0, enumerable: true}, | 45 | m_endAltitude : {value : 0, enumerable: true}, |
45 | 46 | ||
46 | _world : {value : null, enumerable:true}, // keep a referenceto the GLWorld (if any) | 47 | _world : {value : null, enumerable:true}, // keep a referenceto the GLWorld (if any) |
47 | 48 | ||
48 | // Keep track of 3d properties | 49 | // Keep track of 3d properties |
49 | matrix3d : {value : null, enumerable: true}, | 50 | matrix3d : {value : null, enumerable: true}, |
@@ -66,8 +67,8 @@ exports.Properties3D = Montage.create(Component, { | |||
66 | value : function(elt, isStage) { | 67 | value : function(elt, isStage) { |
67 | 68 | ||
68 | // this.m_upVector = [0,1,0]; | 69 | // this.m_upVector = [0,1,0]; |
69 | // this.m_viewDir = [0,0,1]; | 70 | // this.m_viewDir = [0,0,1]; |
70 | // this.m_endUpVector = [0,1,0]; | 71 | // this.m_endUpVector = [0,1,0]; |
71 | 72 | ||
72 | // this.m_targetPos = [0,0,0]; | 73 | // this.m_targetPos = [0,0,0]; |
73 | // this.m_objStartPos = [0,0,0]; | 74 | // this.m_objStartPos = [0,0,0]; |