aboutsummaryrefslogtreecommitdiff
path: root/js/models/properties-3d.js
diff options
context:
space:
mode:
authorhwc4872012-01-31 10:46:48 -0800
committerhwc4872012-01-31 10:46:48 -0800
commitaa1b4b78d9e1b9cc15529dbf7196b7ac8a88e260 (patch)
tree9fd0364c371b8c9bbe1620b9a5a58a45dd0574a9 /js/models/properties-3d.js
parent0b8d8b2eb595b64ef53440b949f3c5ec891daf8a (diff)
parent6066b9bda2990c9d6b4311d221b0d0c773b20f60 (diff)
downloadninja-aa1b4b78d9e1b9cc15529dbf7196b7ac8a88e260.tar.gz
Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working
Conflicts: js/stage/stage.reel/stage.js
Diffstat (limited to 'js/models/properties-3d.js')
-rw-r--r--js/models/properties-3d.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/js/models/properties-3d.js b/js/models/properties-3d.js
index 6d65bc91..cf4a045f 100644
--- a/js/models/properties-3d.js
+++ b/js/models/properties-3d.js
@@ -22,7 +22,7 @@ exports.Properties3D = Montage.create(Component, {
22 _world : {value : null, enumerable:true}, // keep a referenceto the GLWorld (if any) 22 _world : {value : null, enumerable:true}, // keep a referenceto the GLWorld (if any)
23 23
24 // Keep track of 3d properties 24 // Keep track of 3d properties
25 matrix3d : {value : [1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1], enumerable: true}, 25 matrix3d : {value : null, enumerable: true},
26 26
27 xAngle : {value : 0, enumerable: true}, 27 xAngle : {value : 0, enumerable: true},
28 yAngle : {value : 0, enumerable: true}, 28 yAngle : {value : 0, enumerable: true},
@@ -33,9 +33,11 @@ exports.Properties3D = Montage.create(Component, {
33 z3D : {value : 0, enumerable: true}, 33 z3D : {value : 0, enumerable: true},
34 34
35 //TODO - not sure if this should be part of the tool or stage or a utility 35 //TODO - not sure if this should be part of the tool or stage or a utility
36 perspectiveDist : { value : 1400, enumerable: true}, 36 perspectiveDist : { value : null, enumerable: true},
37 perspectiveMode : { value : null, enumerable: true}, 37 perspectiveMode : { value : null, enumerable: true},
38 38
39 elementPlane : { value : null, enumerable: true},
40
39 init : { 41 init : {
40 value : function(elt) { 42 value : function(elt) {
41 43