aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements/element-controller.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-04-11 11:06:40 -0700
committerJose Antonio Marquez2012-04-11 11:06:40 -0700
commit61ece4058e22ab8a9b1da0b00f4a38f7f74d57e4 (patch)
tree9ebbe37bf22cb5280882a0ef5b95196fcf163251 /js/controllers/elements/element-controller.js
parentd14f78b06d37aa469885f2ecf84419bcb7e3e613 (diff)
parent9d1c919a4865ab1a2b0b0b9fc893a54b145c82c0 (diff)
downloadninja-61ece4058e22ab8a9b1da0b00f4a38f7f74d57e4.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/controllers/elements/element-controller.js')
-rwxr-xr-xjs/controllers/elements/element-controller.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index fda3a3c5..7ab6664f 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -249,10 +249,6 @@ exports.ElementController = Montage.create(Component, {
249 else 249 else
250 { 250 {
251 var dist = this.application.ninja.stylesController.getPerspectiveDistFromElement(el, false); 251 var dist = this.application.ninja.stylesController.getPerspectiveDistFromElement(el, false);
252 if(dist == null) {
253 dist = 1400;
254 }
255
256 el.elementModel.props3D.perspectiveDist = dist; 252 el.elementModel.props3D.perspectiveDist = dist;
257 return dist; 253 return dist;
258 } 254 }
@@ -266,9 +262,13 @@ exports.ElementController = Montage.create(Component, {
266 mat = props[index]["mat"]; 262 mat = props[index]["mat"];
267 this.application.ninja.stylesController.setElementStyle(el, 263 this.application.ninja.stylesController.setElementStyle(el,
268 "-webkit-transform", 264 "-webkit-transform",
269 "perspective(" + dist + ") " +
270 "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")"); 265 "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")");
271 266
267 // TODO - We don't support perspective on individual elements yet
268// this.application.ninja.stylesController.setElementStyle(el,
269// "-webkit-perspective",
270// dist);
271
272 el.elementModel.props3D.matrix3d = mat; 272 el.elementModel.props3D.matrix3d = mat;
273 el.elementModel.props3D.perspectiveDist = dist; 273 el.elementModel.props3D.perspectiveDist = dist;
274 274