From 65419917517b5e7decbd15c37bf0f2179eac07d1 Mon Sep 17 00:00:00 2001 From: Logan Barnett Date: Sat, 16 Mar 2013 17:17:34 -0700 Subject: [PATCH] ShakePosition now respects isLocal as does the editor. This fixes errors with shaking a moving object --- Assets/iTweenEditor/Helper Classes/EventParamMappings.cs | 1 + Assets/iTweenEditor/iTween.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/iTweenEditor/Helper Classes/EventParamMappings.cs b/Assets/iTweenEditor/Helper Classes/EventParamMappings.cs index c7990df..3ba53ac 100644 --- a/Assets/iTweenEditor/Helper Classes/EventParamMappings.cs +++ b/Assets/iTweenEditor/Helper Classes/EventParamMappings.cs @@ -660,6 +660,7 @@ static EventParamMappings() { mappings[iTweenEvent.TweenType.ShakePosition]["x"] = typeof(float); mappings[iTweenEvent.TweenType.ShakePosition]["y"] = typeof(float); mappings[iTweenEvent.TweenType.ShakePosition]["z"] = typeof(float); + mappings[iTweenEvent.TweenType.ShakePosition]["islocal"] = typeof(bool); mappings[iTweenEvent.TweenType.ShakePosition]["space"] = typeof(Space); mappings[iTweenEvent.TweenType.ShakePosition]["orienttopath"] = typeof(bool); mappings[iTweenEvent.TweenType.ShakePosition]["looktarget"] = typeof(Vector3OrTransform); diff --git a/Assets/iTweenEditor/iTween.cs b/Assets/iTweenEditor/iTween.cs index 44972ca..b2228c2 100644 --- a/Assets/iTweenEditor/iTween.cs +++ b/Assets/iTweenEditor/iTween.cs @@ -3865,7 +3865,7 @@ void GenerateShakePositionTargets(){ vector3s[3] = transform.eulerAngles; //root: - vector3s[0]=transform.position; + vector3s[0] = isLocal ? transform.localPosition : transform.position; //amount: if (tweenArguments.Contains("amount")) {