diff options
author | hwc487 | 2012-05-01 11:03:56 -0700 |
---|---|---|
committer | hwc487 | 2012-05-01 11:03:56 -0700 |
commit | f6983a69649b1c274ce6fe2d278a325994d092b6 (patch) | |
tree | a360297930c35f3097af16e9f6714ec501bd5894 /js/controllers/elements | |
parent | 80715f4f0c45d29926184fa02e0a01b4e7642a79 (diff) | |
parent | fb47c04b0a4d65f53d975311754aa0dd8a8a3f69 (diff) | |
download | ninja-f6983a69649b1c274ce6fe2d278a325994d092b6.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/controllers/elements')
-rwxr-xr-x | js/controllers/elements/body-controller.js | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js index fbbb7c6e..839d0787 100755 --- a/js/controllers/elements/body-controller.js +++ b/js/controllers/elements/body-controller.js | |||
@@ -12,6 +12,17 @@ exports.BodyController = Montage.create(ElementController, { | |||
12 | // TODO - perspective distance needs to be passed in as "dist" and matrix3d needs to be passed in as "mat" | 12 | // TODO - perspective distance needs to be passed in as "dist" and matrix3d needs to be passed in as "mat" |
13 | set3DProperties: { | 13 | set3DProperties: { |
14 | value: function(el, props, update3DModel) { | 14 | value: function(el, props, update3DModel) { |
15 | var dist = props["dist"], mat = props["mat"]; | ||
16 | this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")", true); | ||
17 | |||
18 | el.elementModel.props3D.matrix3d = mat; | ||
19 | el.elementModel.props3D.perspectiveDist = dist; | ||
20 | |||
21 | this.application.ninja.stage.updatedStage = true; | ||
22 | |||
23 | if(update3DModel) { | ||
24 | this._update3DProperties(el, mat, dist); | ||
25 | } | ||
15 | } | 26 | } |
16 | }, | 27 | }, |
17 | 28 | ||