diff options
author | Jose Antonio Marquez | 2012-03-06 11:18:30 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-06 11:18:30 -0800 |
commit | 3c4967fa93b3abc529fc404115707307ba72d5cd (patch) | |
tree | f3737db979727ee050f8b9c85ef994b0e6ddae27 /js/models/properties-3d.js | |
parent | bee2df0d4da72677aaa2adae669ffdd4ac210dd6 (diff) | |
parent | 84332ab81c1b445195f1d9be8bbeae0725c8e758 (diff) | |
download | ninja-3c4967fa93b3abc529fc404115707307ba72d5cd.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/models/properties-3d.js')
-rwxr-xr-x | js/models/properties-3d.js | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/js/models/properties-3d.js b/js/models/properties-3d.js index cf4a045f..0f82dc48 100755 --- a/js/models/properties-3d.js +++ b/js/models/properties-3d.js | |||
@@ -9,9 +9,9 @@ var Montage = require("montage/core/core").Montage, | |||
9 | 9 | ||
10 | exports.Properties3D = Montage.create(Component, { | 10 | exports.Properties3D = Montage.create(Component, { |
11 | 11 | ||
12 | // m_upVector : {value : Vector.create( [0,1,0] ), enumerable: true}, | 12 | // m_upVector : {value : [0,1,0], enumerable: true}, |
13 | // m_targetPos : {value : Vector.create( [0,0,0] ), enumerable: true}, | 13 | // m_targetPos : {value : [0,0,0], enumerable: true}, |
14 | // m_objStartPos : {value : Vector.create( [0,0,0] ), enumerable: true}, | 14 | // m_objStartPos : {value : [0,0,0], enumerable: true}, |
15 | 15 | ||
16 | m_azimuth : {value : 0.0, enumerable: true}, | 16 | m_azimuth : {value : 0.0, enumerable: true}, |
17 | m_altitude : {value : 0.0, enumerable: true}, | 17 | m_altitude : {value : 0.0, enumerable: true}, |
@@ -50,12 +50,12 @@ exports.Properties3D = Montage.create(Component, { | |||
50 | this.m_transformCtr = null; | 50 | this.m_transformCtr = null; |
51 | this.perspectiveDist = 1400; | 51 | this.perspectiveDist = 1400; |
52 | 52 | ||
53 | // this.m_upVector = Vector.create( [0,1,0] ); | 53 | // this.m_upVector = [0,1,0]; |
54 | // this.m_viewDir = Vector.create( [0,0,1] ); | 54 | // this.m_viewDir = [0,0,1]; |
55 | // this.m_endUpVector = Vector.create( [0,1,0] ); | 55 | // this.m_endUpVector = [0,1,0]; |
56 | 56 | ||
57 | // this.m_targetPos = Vector.create( [0,0,0] ); | 57 | // this.m_targetPos = [0,0,0]; |
58 | // this.m_objStartPos = Vector.create( [0,0,0] ); | 58 | // this.m_objStartPos = [0,0,0]; |
59 | 59 | ||
60 | // var mat = this.application.ninja.stage.stageDeps.viewUtils.getMatrixFromElement(elt).slice(0); | 60 | // var mat = this.application.ninja.stage.stageDeps.viewUtils.getMatrixFromElement(elt).slice(0); |
61 | // var elt3DInfo = MathUtils.decomposeMatrix2(mat); | 61 | // var elt3DInfo = MathUtils.decomposeMatrix2(mat); |
@@ -79,8 +79,8 @@ exports.Properties3D = Montage.create(Component, { | |||
79 | 79 | ||
80 | ResetRotationValues : { | 80 | ResetRotationValues : { |
81 | value : function() { | 81 | value : function() { |
82 | // this.m_upVector = Vector.create( [0,1,0] ); | 82 | // this.m_upVector = [0,1,0]; |
83 | // this.m_viewDir = Vector.create( [0,0,1] ); | 83 | // this.m_viewDir = [0,0,1]; |
84 | 84 | ||
85 | this.m_azimuth = 0.0; | 85 | this.m_azimuth = 0.0; |
86 | this.m_altitude = 0.0; | 86 | this.m_altitude = 0.0; |
@@ -89,13 +89,13 @@ exports.Properties3D = Montage.create(Component, { | |||
89 | this.m_endAltitude = 0.0; | 89 | this.m_endAltitude = 0.0; |
90 | 90 | ||
91 | this.m_transformCtr = null; | 91 | this.m_transformCtr = null; |
92 | // this.m_targetPos = Vector.create( [0,0,0] ); | 92 | // this.m_targetPos = [0,0,0]; |
93 | } | 93 | } |
94 | }, | 94 | }, |
95 | 95 | ||
96 | ResetTranslationValues : { | 96 | ResetTranslationValues : { |
97 | value : function() { | 97 | value : function() { |
98 | // this.m_objStartPos = Vector.create( [0,0,0] ); | 98 | // this.m_objStartPos = [0,0,0]; |
99 | this.perspectiveDist = 1400; | 99 | this.perspectiveDist = 1400; |
100 | } | 100 | } |
101 | } | 101 | } |