diff options
| author | Jonathan Duran | 2012-06-18 08:34:58 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-18 08:34:58 -0700 |
| commit | f8f7754ff19a8d2bc7f66fbaa3feb13082076dc5 (patch) | |
| tree | 1169413a30c74b87e973cbd2c77e1b6f90c762d0 /js/controllers/elements | |
| parent | 0639b36bd4dc9c4c7659b87c05a22a08a4c49221 (diff) | |
| parent | e570fc8518cf03dd03c15982edcf17c5ba0a293d (diff) | |
| download | ninja-f8f7754ff19a8d2bc7f66fbaa3feb13082076dc5.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/controllers/elements')
| -rwxr-xr-x | js/controllers/elements/body-controller.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js index 27989c65..0ca6c417 100755 --- a/js/controllers/elements/body-controller.js +++ b/js/controllers/elements/body-controller.js | |||
| @@ -13,7 +13,8 @@ exports.BodyController = Montage.create(ElementController, { | |||
| 13 | set3DProperties: { | 13 | set3DProperties: { |
| 14 | value: function(el, props, update3DModel) { | 14 | value: function(el, props, update3DModel) { |
| 15 | var dist = props["dist"], mat = props["mat"]; | 15 | var dist = props["dist"], mat = props["mat"]; |
| 16 | this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")"); | 16 | // this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")"); |
| 17 | el.style["-webkit-transform"] = "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")"; | ||
| 17 | 18 | ||
| 18 | el.elementModel.props3D.matrix3d = mat; | 19 | el.elementModel.props3D.matrix3d = mat; |
| 19 | el.elementModel.props3D.perspectiveDist = dist; | 20 | el.elementModel.props3D.perspectiveDist = dist; |