diff options
author | hwc487 | 2012-07-09 16:08:02 -0700 |
---|---|---|
committer | hwc487 | 2012-07-09 16:08:02 -0700 |
commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/models/properties-3d.js | |
parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/models/properties-3d.js')
-rwxr-xr-x | js/models/properties-3d.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/models/properties-3d.js b/js/models/properties-3d.js index 98cc03b3..96c749b8 100755 --- a/js/models/properties-3d.js +++ b/js/models/properties-3d.js | |||
@@ -43,7 +43,7 @@ exports.Properties3D = Montage.create(Component, { | |||
43 | m_endAzimuth : {value : 0, enumerable: true}, | 43 | m_endAzimuth : {value : 0, enumerable: true}, |
44 | m_endAltitude : {value : 0, enumerable: true}, | 44 | m_endAltitude : {value : 0, enumerable: true}, |
45 | 45 | ||
46 | _world : {value : null, enumerable:true}, // keep a referenceto the GLWorld (if any) | 46 | _world : {value : null, enumerable:true}, // keep a referenceto the GLWorld (if any) |
47 | 47 | ||
48 | // Keep track of 3d properties | 48 | // Keep track of 3d properties |
49 | matrix3d : {value : null, enumerable: true}, | 49 | matrix3d : {value : null, enumerable: true}, |
@@ -66,8 +66,8 @@ exports.Properties3D = Montage.create(Component, { | |||
66 | value : function(elt, isStage) { | 66 | value : function(elt, isStage) { |
67 | 67 | ||
68 | // this.m_upVector = [0,1,0]; | 68 | // this.m_upVector = [0,1,0]; |
69 | // this.m_viewDir = [0,0,1]; | 69 | // this.m_viewDir = [0,0,1]; |
70 | // this.m_endUpVector = [0,1,0]; | 70 | // this.m_endUpVector = [0,1,0]; |
71 | 71 | ||
72 | // this.m_targetPos = [0,0,0]; | 72 | // this.m_targetPos = [0,0,0]; |
73 | // this.m_objStartPos = [0,0,0]; | 73 | // this.m_objStartPos = [0,0,0]; |