aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-24 11:05:32 -0700
committerValerio Virgillito2012-07-24 11:05:32 -0700
commit2e86072a159c4bc270c6e897a7e1a81a492ed886 (patch)
tree66f10ae874f546fa5e2936956afe233d322539a8 /js
parent2222e73faee8326e4d5be276bc8486316d83f2a6 (diff)
parent4f0b38baec63b4d1a666d1d9b4e5720553de2983 (diff)
downloadninja-2e86072a159c4bc270c6e897a7e1a81a492ed886.tar.gz
Merge branch 'TimelineUber' of https://github.com/imix23ways/ninja into v0.7.1
Diffstat (limited to 'js')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js9
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js4
2 files changed, 11 insertions, 2 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index c9b59253..9ad88a69 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -312,6 +312,15 @@ var Tween = exports.Tween = Montage.create(Component, {
312 this.parentComponent.parentComponent.updateKeyframeRule(); 312 this.parentComponent.parentComponent.updateKeyframeRule();
313 this.isTweenAnimated = true; 313 this.isTweenAnimated = true;
314 } 314 }
315
316 if(eventDetail.source === "pi" && eventDetail.type === "setMatrix"){
317 var piArrMat = eventDetail.data.value,
318 piStrTweenProperty = "perspective(1400) matrix3d(" + piArrMat.join() + ")";
319
320 this.tweenedProperties["-webkit-transform"] = piStrTweenProperty;
321 this.parentComponent.parentComponent.updateKeyframeRule();
322 this.isTweenAnimated = true;
323 }
315 } 324 }
316 }, 325 },
317 326
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
index f4c31f53..526bab5c 100755
--- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
+++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
@@ -317,9 +317,9 @@ exports.ThreeD = Montage.create(Component, {
317 } 317 }
318 318
319 if(isChanging) { 319 if(isChanging) {
320 this.application.ninja.elementMediator.setMatrix(item, mat, true); 320 this.application.ninja.elementMediator.setMatrix(item, mat, true, "pi");
321 } else { 321 } else {
322 this.application.ninja.elementMediator.setMatrix(item, mat, false); 322 this.application.ninja.elementMediator.setMatrix(item, mat, false, "pi");
323 323
324 if(!inGlobalMode) { 324 if(!inGlobalMode) {
325 value.value = 0; 325 value.value = 0;