aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js11
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js4
2 files changed, 13 insertions, 2 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index c9b59253..14ce3090 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -282,6 +282,8 @@ var Tween = exports.Tween = Montage.create(Component, {
282 // ==== Begin Controllers 282 // ==== Begin Controllers
283 setTweenProperties:{ 283 setTweenProperties:{
284 value:function (eventDetail) { 284 value:function (eventDetail) {
285 console.log("EVENT DETAIL");
286 console.log(eventDetail);
285 if (eventDetail.source === "SelectionTool" || eventDetail.source === "timeline" || eventDetail.source === "pi" || eventDetail.source === "cssPanelChange") { 287 if (eventDetail.source === "SelectionTool" || eventDetail.source === "timeline" || eventDetail.source === "pi" || eventDetail.source === "cssPanelChange") {
286 if(this.parentComponent.parentComponent.animatedElement.offsetTop != this.tweenedProperties["top"]){ 288 if(this.parentComponent.parentComponent.animatedElement.offsetTop != this.tweenedProperties["top"]){
287 this.tweenedProperties["top"] = this.parentComponent.parentComponent.animatedElement.offsetTop + "px"; 289 this.tweenedProperties["top"] = this.parentComponent.parentComponent.animatedElement.offsetTop + "px";
@@ -312,6 +314,15 @@ var Tween = exports.Tween = Montage.create(Component, {
312 this.parentComponent.parentComponent.updateKeyframeRule(); 314 this.parentComponent.parentComponent.updateKeyframeRule();
313 this.isTweenAnimated = true; 315 this.isTweenAnimated = true;
314 } 316 }
317
318 if(eventDetail.source === "pi" && eventDetail.type === "setMatrix"){
319 var piArrMat = eventDetail.data.value,
320 piStrTweenProperty = "perspective(1400) matrix3d(" + piArrMat.join() + ")";
321
322 this.tweenedProperties["-webkit-transform"] = piStrTweenProperty;
323 this.parentComponent.parentComponent.updateKeyframeRule();
324 this.isTweenAnimated = true;
325 }
315 } 326 }
316 }, 327 },
317 328
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;