diff options
author | Armen Kesablyan | 2012-02-07 16:51:14 -0800 |
---|---|---|
committer | Armen Kesablyan | 2012-02-07 16:51:14 -0800 |
commit | 8110e01dc5093ac6baf621103dcaa5f769e5be92 (patch) | |
tree | ecf339e3097b6ba25d81cbe44d913ee67591bf4b /js/models/properties-3d.js | |
parent | 5f506542d28e12b707c3bfa41b53383519838477 (diff) | |
parent | 668510892537eaaeb2e11520831d87b44b2489b7 (diff) | |
download | ninja-8110e01dc5093ac6baf621103dcaa5f769e5be92.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/models/properties-3d.js')
-rw-r--r-- | js/models/properties-3d.js | 6 |
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 | ||