com.kyrylokuzyk.primetween 1.3.8 → 1.4.0

package/Documentation/material_prop_block.png.meta

@@ -0,0 +1,130 @@
+fileFormatVersion: 2
+guid: 07eb16170b8675a4692a02dbb545b790
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Documentation/tween_animation_component.png.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: cf8e292b60ba47e48d4ad5a2f4dd5d2b
+timeCreated: 1776251272

package/Documentation/tween_animation_inspector.png.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9f3490f0a436403fb7a391ad91c61017
+timeCreated: 1776176273

package/Editor/Icons/d_state.png.meta

@@ -0,0 +1,130 @@
+fileFormatVersion: 2
+guid: 65e62c88b7b0740439a7c4c5811cb5e7
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 64
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/Icons/state.png.meta

@@ -0,0 +1,130 @@
+fileFormatVersion: 2
+guid: 60130589774ea9b44a3400de50c16e83
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 64
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/Icons.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6383b357c77ff864d84e884e06759ac1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/PrimeTween.Editor.asmdef

@@ -26,7 +26,7 @@
         },
         {
           "name": "com.kyrylokuzyk.primetween",
-          "expression": "[1.3.8-pro]",
+          "expression": "[1.4.0-pro]",
           "define": "PRIME_TWEEN_PRO"
         }
     ],

package/Editor/Tests/PrimeTween.Tests.Editor.asmdef

@@ -29,7 +29,7 @@
         },
         {
           "name": "com.kyrylokuzyk.primetween",
-          "expression": "[1.3.8-pro]",
+          "expression": "[1.4.0-pro]",
           "define": "PRIME_TWEEN_PRO"
         }
     ],

package/Editor/ValueContainerStartEndPropDrawer.cs

@@ -69,10 +69,10 @@ public class ValueContainerStartEndPropDrawer : PropertyDrawer {
         prop.Next(true);
         var tweenType = (TweenType)prop.enumValueIndex;
         prop.Next(false);
-        Draw(ref pos, prop, tweenType, true, true, _startValueGuiContent, _endValueGuiContent);
+        Draw(ref pos, prop, tweenType, true, true, _startValueGuiContent, _endValueGuiContent, null);
     }
 
-    internal static void Draw(ref Rect pos, SerializedProperty prop, TweenType tweenType, bool drawStartFromCurrentToggle, bool invert, GUIContent startValueLabel, GUIContent endValueLabel) {
+    internal static (int, TweenAnimation.ValueWrapper)? Draw(ref Rect pos, SerializedProperty prop, TweenType tweenType, bool drawStartFromCurrentToggle, bool invert, GUIContent startValueLabel, GUIContent endValueLabel, int? highlightId) {
         var propType = Utils.TweenTypeToTweenData(tweenType).Item1;
         Assert.AreNotEqual(PropType.None, propType);
 
@@ -113,19 +113,20 @@ public class ValueContainerStartEndPropDrawer : PropertyDrawer {
         }
         float height = GetSingleItemHeight(propType, startValueLabel);
         using (new EditorGUI.DisabledScope(disableGui)) {
-            DrawValueContainer(ref pos, prop, propType, startValueLabel, height);
+            DrawValueContainer(ref pos, prop, propType, startValueLabel, height, null);
             prop.Next(false);
         }
 
         pos.y += pos.height + EditorGUIUtility.standardVerticalSpacing;
-        DrawValueContainer(ref pos, prop, propType, endValueLabel, height);
+        var endValueIfFocused = DrawValueContainer(ref pos, prop, propType, endValueLabel, height, highlightId);
         pos.y += pos.height + EditorGUIUtility.standardVerticalSpacing;
 
         pos.x -= toggleWidth;
         pos.width += toggleWidth;
+        return endValueIfFocused;
     }
 
-    static void DrawValueContainer(ref Rect pos, SerializedProperty prop, PropType propType, GUIContent guiContent, float height) {
+    static (int, TweenAnimation.ValueWrapper)? DrawValueContainer(ref Rect pos, SerializedProperty prop, PropType propType, GUIContent guiContent, float height, int? highlightId) {
         Assert.IsNotNull(guiContent);
         var root = prop.Copy();
         prop.Next(true);
@@ -140,7 +141,18 @@ public class ValueContainerStartEndPropDrawer : PropertyDrawer {
         pos.height = height;
 
         using (var scope = new CustomPropertyScope(pos, guiContent, root)) {
+            Color origColor = GUI.backgroundColor;
+            int idBefore = GUIUtility.GetControlID(FocusType.Keyboard);
+            if (highlightId == idBefore) {
+                GUI.backgroundColor = EditorGUIUtility.isProSkin ? new Color(2f, 0.9f, 0.9f, 1f) : new Color(1f, 0.9f, 0.9f, 1f);
+            }
             TweenAnimation.ValueWrapper newVal = DrawField(pos);
+            int idAfter = GUIUtility.GetControlID(FocusType.Keyboard);
+            GUI.backgroundColor = origColor;
+
+            bool isFocused = GUIUtility.keyboardControl > idBefore
+                             && GUIUtility.keyboardControl < idAfter;
+
             TweenAnimation.ValueWrapper DrawField(Rect position) {
                 switch (propType) {
                     case PropType.Float:
@@ -179,6 +191,7 @@ public class ValueContainerStartEndPropDrawer : PropertyDrawer {
                     }
                 }
             }
+            return isFocused ? (idBefore, newVal) : ((int, TweenAnimation.ValueWrapper)?)null;
         }
     }
 }

package/Runtime/Internal/Constants.cs

@@ -61,5 +61,7 @@ namespace PrimeTween {
                                                          "NOTE: PrimeTween doesn't clear the MaterialPropertyBlock after animation completion to preserve the animated property at its endValue.\n" +
                                                          "As a result, directly modifying the Material property will have no effect since the MaterialPropertyBlock takes precedence.\n" +
                                                          "To modify the sharedMaterial property after animation completion, call 'renderer.SetPropertyBlock(null)' to clear the override.";
+        internal const string coroutineFinishedError = "IEnumerator.MoveNext() was called after animation coroutine has finished. This is not allowed.";
+
     }
 }

package/Runtime/Internal/CoroutinesSupport.cs

@@ -1,10 +1,13 @@
 using System;
 using System.Collections;
 using JetBrains.Annotations;
+using UnityEngine;
 
 namespace PrimeTween {
     public partial struct Tween : IEnumerator {
-        /// <summary>Use this method to wait for a Tween in coroutines.</summary>
+        /// <summary>Use this method to wait for an animation in coroutines.<br/>
+        /// NOTE: stopping a coroutine early with StopCoroutine() (or destroying the parent MonoBehaviour) will prevent PrimeTween from reusing the returned IEnumerator and will leave it to GC to clean.<br/>
+        /// This means that stopping the coroutine while it's waiting for an animation will produce a small amount of GC garbage. Consider using `while (animation.isAlive) yield return null;` instead to prevent allocations in this case.</summary>
         /// <example><code>
         /// IEnumerator Coroutine() {
         ///     yield return Tween.Delay(1).ToYieldInstruction();
@@ -15,12 +18,18 @@ namespace PrimeTween {
             if (!isAlive || !TryManipulate()) {
                 return Array.Empty<object>().GetEnumerator();
             }
-            if (tween.data.isInCoroutine) {
-                Assert.LogErrorWithStackTrace($"{nameof(ToYieldInstruction)} can't be called on a tween that's already being waited for in a coroutine.", tween.id, tween.managedData.target);
-                return Array.Empty<object>().GetEnumerator();
+
+            CoroutineIterator result;
+            var pool = PrimeTweenManager.Instance._coroutineIterators;
+            if (pool.Count > 0) {
+                result = pool[pool.Count - 1];
+                pool.RemoveAt(pool.Count - 1);
+            } else {
+                result = new CoroutineIterator();
             }
-            tween.data.isInCoroutine = true;
-            return tween;
+            Assert.IsFalse(result._tween.IsCreated);
+            result._tween = this;
+            return result;
         }
 
         bool IEnumerator.MoveNext() {
@@ -38,25 +47,26 @@ namespace PrimeTween {
         void IEnumerator.Reset() => throw new NotSupportedException();
     }
 
-    public partial struct Sequence : IEnumerator {
-        /// <summary>Use this method to wait for a Sequence in coroutines.</summary>
-        /// <example><code>
-        /// IEnumerator Coroutine() {
-        ///     var sequence = Sequence.Create(Tween.Delay(1)).ChainCallback(() =&gt; Debug.Log("Done!"));
-        ///     yield return sequence.ToYieldInstruction();
-        /// }
-        /// </code></example>
-        [NotNull]
-        public IEnumerator ToYieldInstruction() => root.ToYieldInstruction();
+    internal class CoroutineIterator : IEnumerator {
+        internal Tween _tween;
 
         bool IEnumerator.MoveNext() {
-            PrimeTweenManager.Instance.WarnStructBoxingInCoroutineOnce(id, root.tween);
-            return isAlive;
+            if (!_tween.IsCreated) {
+                Debug.LogError(Constants.coroutineFinishedError);
+                return false;
+            }
+            if (_tween.isAlive) {
+                return true;
+            }
+            // Return to pool only when a coroutine is iterated to the end. Else, leave the CoroutineIterator to be cleaned by GC
+            _tween = default;
+            PrimeTweenManager.Instance._coroutineIterators.Add(this);
+            return false;
         }
 
         object IEnumerator.Current {
             get {
-                Assert.IsTrue(isAlive);
+                Assert.IsTrue(_tween.isAlive);
                 return null;
             }
         }
@@ -64,27 +74,25 @@ namespace PrimeTween {
         void IEnumerator.Reset() => throw new NotSupportedException();
     }
 
-    internal partial class ColdData : IEnumerator {
-        bool IEnumerator.MoveNext() {
-            var result = data.isAlive;
-            if (!result) {
-                ResetCoroutineEnumerator();
-            }
-            return result;
-        }
+    public partial struct Sequence : IEnumerator {
+        /// <inheritdoc cref="Tween.ToYieldInstruction"/>
+        /// <example><code>
+        /// IEnumerator Coroutine() {
+        ///     var sequence = Sequence.Create(Tween.Delay(1)).ChainCallback(() =&gt; Debug.Log("Done!"));
+        ///     yield return sequence.ToYieldInstruction();
+        /// }
+        /// </code></example>
+        [NotNull]
+        public IEnumerator ToYieldInstruction() => root.ToYieldInstruction();
 
-        internal bool ResetCoroutineEnumerator() {
-            if (data.isInCoroutine) {
-                data.isInCoroutine = false;
-                return true;
-            }
-            return false;
+        bool IEnumerator.MoveNext() {
+            PrimeTweenManager.Instance.WarnStructBoxingInCoroutineOnce(id, root.tween);
+            return isAlive;
         }
 
         object IEnumerator.Current {
             get {
-                Assert.IsTrue(data.isAlive); // p2 todo throws if debugger is attached
-                Assert.IsTrue(data.isInCoroutine);
+                Assert.IsTrue(isAlive);
                 return null;
             }
         }