aboutsummaryrefslogtreecommitdiff
path: root/js/models
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-03 12:20:10 -0800
committerValerio Virgillito2012-02-03 12:20:10 -0800
commite6e539f345f5e1ac36a595db5d1a1c3700715e88 (patch)
tree39846bf1570f9b5a4057b726c54905de9e9e1c02 /js/models
parent7950424cf704bb221971f4645406b01e6979db18 (diff)
parentc630ead20487c3948fa36448d3e7d5f7b5cba782 (diff)
downloadninja-e6e539f345f5e1ac36a595db5d1a1c3700715e88.tar.gz
Merge branch 'master' into components
Conflicts: node_modules/montage/ui/bluemoon/progress.reel/progress.html node_modules/montage/ui/image2.reel/image2.html node_modules/ninja-components/effect/desaturate-effect.js node_modules/ninja-components/effect/effect.js node_modules/ninja-components/effect/invert-effect.js node_modules/ninja-components/effect/kaliedoscope-effect.js node_modules/ninja-components/effect/multiply-effect.js node_modules/ninja-components/effect/sepia-effect.js node_modules/ninja-components/flow-controller.reel/flow-controller.html node_modules/ninja-components/flow-controller.reel/flow-controller.js node_modules/ninja-components/flow-offset.js node_modules/ninja-components/hottext.reel/hottext.css node_modules/ninja-components/hottext.reel/hottext.html node_modules/ninja-components/hottext.reel/hottext.js node_modules/ninja-components/hottextunit.reel/hottextunit.css node_modules/ninja-components/hottextunit.reel/hottextunit.html node_modules/ninja-components/hottextunit.reel/hottextunit.js node_modules/ninja-components/image2.reel/image2.html node_modules/ninja-components/image2.reel/image2.js node_modules/ninja-components/image3d.reel/image3d.html node_modules/ninja-components/image3d.reel/image3d.js node_modules/ninja-components/photo-editor.reel/photo-editor.css node_modules/ninja-components/photo-editor.reel/photo-editor.html node_modules/ninja-components/photo-editor.reel/photo-editor.js node_modules/ninja-components/slider-base.js user-document-templates/montage-application-cloud/appdelegate.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/models')
-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