diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML index 3d38be9..b4e8e77 100644 --- a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML @@ -188,6 +188,43 @@ Used for custom and animationCurve-based ease functions. Must return a value between 0 and 1. + + + Straight Quaternion plugin. Instead of using Vector3 values accepts Quaternion values directly. + Beware: doesn't work with LoopType.Incremental (neither directly nor if inside a LoopType.Incremental Sequence). + To use it, call DOTween.To with the plugin parameter overload, passing it PureQuaternionPlugin.Plug() as first parameter + (do not use any of the other public PureQuaternionPlugin methods): + DOTween.To(PureQuaternionPlugin.Plug(), ()=> myQuaternionProperty, x=> myQuaternionProperty = x, myQuaternionEndValue, duration); + + + + + Plug this plugin inside a DOTween.To call. + Example: + DOTween.To(PureQuaternionPlugin.Plug(), ()=> myQuaternionProperty, x=> myQuaternionProperty = x, myQuaternionEndValue, duration); + + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + Main DOTween class. Contains static methods to create and control tweens in a generic way @@ -1419,12 +1456,30 @@ The end value to reachThe duration of the tween Rotation mode + + Tweens a Transform's rotation to the given value using pure quaternion values. + Also stores the transform as the tween's target so it can be used for filtered operations. + PLEASE NOTE: DORotate, which takes Vector3 values, is the preferred rotation method. + This method was implemented for very special cases, and doesn't support LoopType.Incremental loops + (neither for itself nor if placed inside a LoopType.Incremental Sequence) + + The end value to reachThe duration of the tween + Tweens a Transform's localRotation to the given value. Also stores the transform as the tween's target so it can be used for filtered operations The end value to reachThe duration of the tween Rotation mode + + Tweens a Transform's rotation to the given value using pure quaternion values. + Also stores the transform as the tween's target so it can be used for filtered operations. + PLEASE NOTE: DOLocalRotate, which takes Vector3 values, is the preferred rotation method. + This method was implemented for very special cases, and doesn't support LoopType.Incremental loops + (neither for itself nor if placed inside a LoopType.Incremental Sequence) + + The end value to reachThe duration of the tween + Tweens a Transform's localScale to the given value. Also stores the transform as the tween's target so it can be used for filtered operations diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll index 31298cd..12cc370 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll.mdb b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll.mdb index fb646c7..b0e996f 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML index 3d38be9..b4e8e77 100644 --- a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML @@ -188,6 +188,43 @@ Used for custom and animationCurve-based ease functions. Must return a value between 0 and 1. + + + Straight Quaternion plugin. Instead of using Vector3 values accepts Quaternion values directly. + Beware: doesn't work with LoopType.Incremental (neither directly nor if inside a LoopType.Incremental Sequence). + To use it, call DOTween.To with the plugin parameter overload, passing it PureQuaternionPlugin.Plug() as first parameter + (do not use any of the other public PureQuaternionPlugin methods): + DOTween.To(PureQuaternionPlugin.Plug(), ()=> myQuaternionProperty, x=> myQuaternionProperty = x, myQuaternionEndValue, duration); + + + + + Plug this plugin inside a DOTween.To call. + Example: + DOTween.To(PureQuaternionPlugin.Plug(), ()=> myQuaternionProperty, x=> myQuaternionProperty = x, myQuaternionEndValue, duration); + + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + Main DOTween class. Contains static methods to create and control tweens in a generic way @@ -1419,12 +1456,30 @@ The end value to reachThe duration of the tween Rotation mode + + Tweens a Transform's rotation to the given value using pure quaternion values. + Also stores the transform as the tween's target so it can be used for filtered operations. + PLEASE NOTE: DORotate, which takes Vector3 values, is the preferred rotation method. + This method was implemented for very special cases, and doesn't support LoopType.Incremental loops + (neither for itself nor if placed inside a LoopType.Incremental Sequence) + + The end value to reachThe duration of the tween + Tweens a Transform's localRotation to the given value. Also stores the transform as the tween's target so it can be used for filtered operations The end value to reachThe duration of the tween Rotation mode + + Tweens a Transform's rotation to the given value using pure quaternion values. + Also stores the transform as the tween's target so it can be used for filtered operations. + PLEASE NOTE: DOLocalRotate, which takes Vector3 values, is the preferred rotation method. + This method was implemented for very special cases, and doesn't support LoopType.Incremental loops + (neither for itself nor if placed inside a LoopType.Incremental Sequence) + + The end value to reachThe duration of the tween + Tweens a Transform's localScale to the given value. Also stores the transform as the tween's target so it can be used for filtered operations diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll index 31298cd..12cc370 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll.mdb b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll.mdb index fb646c7..b0e996f 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML index 3d38be9..b4e8e77 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML @@ -188,6 +188,43 @@ Used for custom and animationCurve-based ease functions. Must return a value between 0 and 1. + + + Straight Quaternion plugin. Instead of using Vector3 values accepts Quaternion values directly. + Beware: doesn't work with LoopType.Incremental (neither directly nor if inside a LoopType.Incremental Sequence). + To use it, call DOTween.To with the plugin parameter overload, passing it PureQuaternionPlugin.Plug() as first parameter + (do not use any of the other public PureQuaternionPlugin methods): + DOTween.To(PureQuaternionPlugin.Plug(), ()=> myQuaternionProperty, x=> myQuaternionProperty = x, myQuaternionEndValue, duration); + + + + + Plug this plugin inside a DOTween.To call. + Example: + DOTween.To(PureQuaternionPlugin.Plug(), ()=> myQuaternionProperty, x=> myQuaternionProperty = x, myQuaternionEndValue, duration); + + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + Main DOTween class. Contains static methods to create and control tweens in a generic way @@ -1419,12 +1456,30 @@ The end value to reachThe duration of the tween Rotation mode + + Tweens a Transform's rotation to the given value using pure quaternion values. + Also stores the transform as the tween's target so it can be used for filtered operations. + PLEASE NOTE: DORotate, which takes Vector3 values, is the preferred rotation method. + This method was implemented for very special cases, and doesn't support LoopType.Incremental loops + (neither for itself nor if placed inside a LoopType.Incremental Sequence) + + The end value to reachThe duration of the tween + Tweens a Transform's localRotation to the given value. Also stores the transform as the tween's target so it can be used for filtered operations The end value to reachThe duration of the tween Rotation mode + + Tweens a Transform's rotation to the given value using pure quaternion values. + Also stores the transform as the tween's target so it can be used for filtered operations. + PLEASE NOTE: DOLocalRotate, which takes Vector3 values, is the preferred rotation method. + This method was implemented for very special cases, and doesn't support LoopType.Incremental loops + (neither for itself nor if placed inside a LoopType.Incremental Sequence) + + The end value to reachThe duration of the tween + Tweens a Transform's localScale to the given value. Also stores the transform as the tween's target so it can be used for filtered operations diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll index 31298cd..12cc370 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb index fb646c7..b0e996f 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/_Tests/PureQuaternionPluginTests.cs b/UnityTests.Unity5/Assets/_Tests/PureQuaternionPluginTests.cs new file mode 100644 index 0000000..a7c1edd --- /dev/null +++ b/UnityTests.Unity5/Assets/_Tests/PureQuaternionPluginTests.cs @@ -0,0 +1,17 @@ +using UnityEngine; +using System.Collections; +using DG.Tweening; +using DG.Tweening.CustomPlugins; + +public class PureQuaternionPluginTests : BrainBase +{ + public Transform target; + public Vector3 to; + public bool isRelative; + + IEnumerator Start() + { + yield return new WaitForSeconds(0.5f); + target.DORotateQuaternion(Quaternion.Euler(to), 3).SetLoops(-1, LoopType.Yoyo).SetRelative(isRelative); + } +} \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_Tests/PureQuaternionPluginTests.cs.meta b/UnityTests.Unity5/Assets/_Tests/PureQuaternionPluginTests.cs.meta new file mode 100644 index 0000000..b09eebe --- /dev/null +++ b/UnityTests.Unity5/Assets/_Tests/PureQuaternionPluginTests.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 627093d16b467164c860afac4c085a5a +timeCreated: 1444906165 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_Tests/PureQuaternionPluginTests.unity b/UnityTests.Unity5/Assets/_Tests/PureQuaternionPluginTests.unity new file mode 100644 index 0000000..c4b1195 Binary files /dev/null and b/UnityTests.Unity5/Assets/_Tests/PureQuaternionPluginTests.unity differ diff --git a/UnityTests.Unity5/Assets/_Tests/PureQuaternionPluginTests.unity.meta b/UnityTests.Unity5/Assets/_Tests/PureQuaternionPluginTests.unity.meta new file mode 100644 index 0000000..5e5244e --- /dev/null +++ b/UnityTests.Unity5/Assets/_Tests/PureQuaternionPluginTests.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 08a387945eb5d9d4d92b39ae0cdbbc24 +timeCreated: 1444906156 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/_DOTween.Assembly/DOTween/CustomPlugins/PureQuaternionPlugin.cs b/_DOTween.Assembly/DOTween/CustomPlugins/PureQuaternionPlugin.cs new file mode 100644 index 0000000..cf1c365 --- /dev/null +++ b/_DOTween.Assembly/DOTween/CustomPlugins/PureQuaternionPlugin.cs @@ -0,0 +1,88 @@ +// Author: Daniele Giardini - http://www.demigiant.com +// Created: 2015/10/15 12:29 +// License Copyright (c) Daniele Giardini +// This work is subject to the terms at http://dotween.demigiant.com/license.php + +using DG.Tweening.Core; +using DG.Tweening.Core.Easing; +using DG.Tweening.Core.Enums; +using DG.Tweening.Plugins.Core; +using DG.Tweening.Plugins.Options; +using UnityEngine; + +namespace DG.Tweening.CustomPlugins +{ + /// + /// Straight Quaternion plugin. Instead of using Vector3 values accepts Quaternion values directly. + /// Beware: doesn't work with LoopType.Incremental (neither directly nor if inside a LoopType.Incremental Sequence). + /// To use it, call DOTween.To with the plugin parameter overload, passing it PureQuaternionPlugin.Plug() as first parameter + /// (do not use any of the other public PureQuaternionPlugin methods): + /// DOTween.To(PureQuaternionPlugin.Plug(), ()=> myQuaternionProperty, x=> myQuaternionProperty = x, myQuaternionEndValue, duration); + /// + public class PureQuaternionPlugin : ABSTweenPlugin + { + static PureQuaternionPlugin _plug; + /// + /// Plug this plugin inside a DOTween.To call. + /// Example: + /// DOTween.To(PureQuaternionPlugin.Plug(), ()=> myQuaternionProperty, x=> myQuaternionProperty = x, myQuaternionEndValue, duration); + /// + public static PureQuaternionPlugin Plug() + { + if (_plug == null) _plug = new PureQuaternionPlugin(); + return _plug; + } + + /// INTERNAL: do not use + public override void Reset(TweenerCore t) { } + + /// INTERNAL: do not use + public override void SetFrom(TweenerCore t, bool isRelative) + { + Quaternion prevEndVal = t.endValue; + t.endValue = t.getter(); + t.startValue = isRelative ? t.endValue * prevEndVal : prevEndVal; + t.setter(t.startValue); + } + + /// INTERNAL: do not use + public override Quaternion ConvertToStartValue(TweenerCore t, Quaternion value) + { + return value; + } + + /// INTERNAL: do not use + public override void SetRelativeEndValue(TweenerCore t) + { + t.endValue *= t.startValue; + } + + /// INTERNAL: do not use + public override void SetChangeValue(TweenerCore t) + { + t.changeValue = t.endValue * Quaternion.Inverse(t.startValue); + } + + /// INTERNAL: do not use + public override float GetSpeedBasedDuration(NoOptions options, float unitsXSecond, Quaternion changeValue) + { + return changeValue.eulerAngles.magnitude / unitsXSecond; + } + + /// INTERNAL: do not use + public override void EvaluateAndApply(NoOptions options, Tween t, bool isRelative, DOGetter getter, DOSetter setter, float elapsed, Quaternion startValue, Quaternion changeValue, float duration, bool usingInversePosition, UpdateNotice updateNotice) + { +// if (t.loopType == LoopType.Incremental) startValue *= changeValue * (t.isComplete ? t.completedLoops - 1 : t.completedLoops); +// if (t.isSequenced && t.sequenceParent.loopType == LoopType.Incremental) { +// startValue += changeValue * (t.loopType == LoopType.Incremental ? t.loops : 1) +// * (t.sequenceParent.isComplete ? t.sequenceParent.completedLoops - 1 : t.sequenceParent.completedLoops); +// } + float easeVal = EaseManager.Evaluate(t.easeType, t.customEase, elapsed, duration, t.easeOvershootOrAmplitude, t.easePeriod); + startValue.x += changeValue.x * easeVal; + startValue.y += changeValue.y * easeVal; + startValue.z += changeValue.z * easeVal; + startValue.w += changeValue.w * easeVal; + setter(startValue); + } + } +} \ No newline at end of file diff --git a/_DOTween.Assembly/DOTween/DOTween.cs b/_DOTween.Assembly/DOTween/DOTween.cs index 768338a..3a5d4e3 100644 --- a/_DOTween.Assembly/DOTween/DOTween.cs +++ b/_DOTween.Assembly/DOTween/DOTween.cs @@ -32,7 +32,7 @@ namespace DG.Tweening public class DOTween { /// DOTween's version - public static readonly string Version = "1.1.015"; + public static readonly string Version = "1.1.020"; /////////////////////////////////////////////// // Options //////////////////////////////////// diff --git a/_DOTween.Assembly/DOTween/DOTween.csproj b/_DOTween.Assembly/DOTween/DOTween.csproj index 06b1830..0dab61c 100644 --- a/_DOTween.Assembly/DOTween/DOTween.csproj +++ b/_DOTween.Assembly/DOTween/DOTween.csproj @@ -79,6 +79,7 @@ + diff --git a/_DOTween.Assembly/DOTween/ShortcutExtensions.cs b/_DOTween.Assembly/DOTween/ShortcutExtensions.cs index 9cb2f77..e22966f 100644 --- a/_DOTween.Assembly/DOTween/ShortcutExtensions.cs +++ b/_DOTween.Assembly/DOTween/ShortcutExtensions.cs @@ -14,6 +14,7 @@ using DOQuaternion = UnityEngine.Quaternion; #endif using DG.Tweening.Core; using DG.Tweening.Core.Enums; +using DG.Tweening.CustomPlugins; using DG.Tweening.Plugins; using DG.Tweening.Plugins.Core.PathCore; using DG.Tweening.Plugins.Options; @@ -604,6 +605,20 @@ namespace DG.Tweening return t; } + /// Tweens a Transform's rotation to the given value using pure quaternion values. + /// Also stores the transform as the tween's target so it can be used for filtered operations. + /// PLEASE NOTE: DORotate, which takes Vector3 values, is the preferred rotation method. + /// This method was implemented for very special cases, and doesn't support LoopType.Incremental loops + /// (neither for itself nor if placed inside a LoopType.Incremental Sequence) + /// + /// The end value to reachThe duration of the tween + public static Tweener DORotateQuaternion(this Transform target, Quaternion endValue, float duration) + { + TweenerCore t = DOTween.To(PureQuaternionPlugin.Plug(), () => target.rotation, x => target.rotation = x, endValue, duration); + t.SetTarget(target); + return t; + } + /// Tweens a Transform's localRotation to the given value. /// Also stores the transform as the tween's target so it can be used for filtered operations /// The end value to reachThe duration of the tween @@ -616,6 +631,20 @@ namespace DG.Tweening return t; } + /// Tweens a Transform's rotation to the given value using pure quaternion values. + /// Also stores the transform as the tween's target so it can be used for filtered operations. + /// PLEASE NOTE: DOLocalRotate, which takes Vector3 values, is the preferred rotation method. + /// This method was implemented for very special cases, and doesn't support LoopType.Incremental loops + /// (neither for itself nor if placed inside a LoopType.Incremental Sequence) + /// + /// The end value to reachThe duration of the tween + public static Tweener DOLocalRotateQuaternion(this Transform target, Quaternion endValue, float duration) + { + TweenerCore t = DOTween.To(PureQuaternionPlugin.Plug(), () => target.localRotation, x => target.localRotation = x, endValue, duration); + t.SetTarget(target); + return t; + } + /// Tweens a Transform's localScale to the given value. /// Also stores the transform as the tween's target so it can be used for filtered operations /// The end value to reachThe duration of the tween diff --git a/_DOTween.Assembly/bin/DOTween.XML b/_DOTween.Assembly/bin/DOTween.XML index 3d38be9..b4e8e77 100644 --- a/_DOTween.Assembly/bin/DOTween.XML +++ b/_DOTween.Assembly/bin/DOTween.XML @@ -188,6 +188,43 @@ Used for custom and animationCurve-based ease functions. Must return a value between 0 and 1. + + + Straight Quaternion plugin. Instead of using Vector3 values accepts Quaternion values directly. + Beware: doesn't work with LoopType.Incremental (neither directly nor if inside a LoopType.Incremental Sequence). + To use it, call DOTween.To with the plugin parameter overload, passing it PureQuaternionPlugin.Plug() as first parameter + (do not use any of the other public PureQuaternionPlugin methods): + DOTween.To(PureQuaternionPlugin.Plug(), ()=> myQuaternionProperty, x=> myQuaternionProperty = x, myQuaternionEndValue, duration); + + + + + Plug this plugin inside a DOTween.To call. + Example: + DOTween.To(PureQuaternionPlugin.Plug(), ()=> myQuaternionProperty, x=> myQuaternionProperty = x, myQuaternionEndValue, duration); + + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + Main DOTween class. Contains static methods to create and control tweens in a generic way @@ -1419,12 +1456,30 @@ The end value to reachThe duration of the tween Rotation mode + + Tweens a Transform's rotation to the given value using pure quaternion values. + Also stores the transform as the tween's target so it can be used for filtered operations. + PLEASE NOTE: DORotate, which takes Vector3 values, is the preferred rotation method. + This method was implemented for very special cases, and doesn't support LoopType.Incremental loops + (neither for itself nor if placed inside a LoopType.Incremental Sequence) + + The end value to reachThe duration of the tween + Tweens a Transform's localRotation to the given value. Also stores the transform as the tween's target so it can be used for filtered operations The end value to reachThe duration of the tween Rotation mode + + Tweens a Transform's rotation to the given value using pure quaternion values. + Also stores the transform as the tween's target so it can be used for filtered operations. + PLEASE NOTE: DOLocalRotate, which takes Vector3 values, is the preferred rotation method. + This method was implemented for very special cases, and doesn't support LoopType.Incremental loops + (neither for itself nor if placed inside a LoopType.Incremental Sequence) + + The end value to reachThe duration of the tween + Tweens a Transform's localScale to the given value. Also stores the transform as the tween's target so it can be used for filtered operations diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index 31298cd..12cc370 100644 Binary files a/_DOTween.Assembly/bin/DOTween.dll and b/_DOTween.Assembly/bin/DOTween.dll differ diff --git a/_DOTween.Assembly/bin/DOTween.dll.mdb b/_DOTween.Assembly/bin/DOTween.dll.mdb index fb646c7..b0e996f 100644 Binary files a/_DOTween.Assembly/bin/DOTween.dll.mdb and b/_DOTween.Assembly/bin/DOTween.dll.mdb differ