net.dreditor.textdisplaying 0.1.6 → 0.1.7

package/SymbolTextModifier.cs

@@ -1,48 +1,48 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.Dialogues;
-using TMPro;
-using UnityEngine;
-
-namespace DREditor.TextDisplaying
-{
-    /// <summary>
-    ///
-    /// </summary>
-    public abstract class SymbolTextModifier : TextDisplayModifier
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected char startingSymbol = '$';
-
-
-        /// <inheritdoc/>
-        public override string ApplyModification(string text, Line currentLine = null, TMP_Text box = null)
-        {
-            if (TextStartsWithSymbol(text))
-            {
-                OnSymbolFound(text, currentLine, box);
-
-                text = text.Remove(text.IndexOf(startingSymbol), 1);
-            }
-
-            return text;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="text"></param>
-        /// <returns></returns>
-        protected virtual bool TextStartsWithSymbol(string text) => text.Split(' ')[0].Contains(startingSymbol);
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="text"></param>
-        /// <param name="currentLine"></param>
-        /// <param name="box"></param>
-        protected abstract void OnSymbolFound(string text, Line currentLine = null, TMP_Text box = null);
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.Dialogues;
+using TMPro;
+using UnityEngine;
+
+namespace DREditor.TextDisplaying
+{
+    /// <summary>
+    ///
+    /// </summary>
+    public abstract class SymbolTextModifier : TextDisplayModifier
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected char startingSymbol = '$';
+
+
+        /// <inheritdoc/>
+        public override string ApplyModification(string text, Line currentLine = null, TMP_Text box = null)
+        {
+            if (TextStartsWithSymbol(text))
+            {
+                OnSymbolFound(text, currentLine, box);
+
+                text = text.Remove(text.IndexOf(startingSymbol), 1);
+            }
+
+            return text;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
+        protected virtual bool TextStartsWithSymbol(string text) => text.Split(' ')[0].Contains(startingSymbol);
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="currentLine"></param>
+        /// <param name="box"></param>
+        protected abstract void OnSymbolFound(string text, Line currentLine = null, TMP_Text box = null);
+    }
 }

package/SymbolTextModifier.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 5587137b550131b4599b2165976968d1
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 5587137b550131b4599b2165976968d1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/TMPMarquee.cs

@@ -1,178 +1,178 @@
-//OG Author: KHeartz. My Magic Man
-//Edited Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using System.Collections;
-using UnityEngine;
-
-namespace DREditor.TextDisplaying
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [ClassHeader(nameof(TMPMarqueeBase) +
-        "\n\n")]
-    public class TMPMarquee : TMPMarqueeBase
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected float scrollDuration = 5;
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected float currentWidth;
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected float startX;
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected float elapsedSeconds;
-
-
-        /// <inheritdoc/>
-        protected override void Initialize()
-        {
-            ResetPosition();
-
-            ForceUpdateWidth();
-
-            ResetCalculatedVariables();
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void ResetPosition() => marqueeTransform.localPosition = new(parentMask.rect.xMax, 0, 0);
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void ForceUpdateWidth()
-        {
-            tmp.ForceMeshUpdate();
-
-            currentWidth = tmp.rectTransform.rect.width;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void ResetCalculatedVariables()
-        {
-            startX = marqueeTransform.localPosition.x;
-
-            elapsedSeconds = 0f;
-        }
-
-
-        /// <inheritdoc/>
-        protected override IEnumerator MarqueeRoutine()
-        {
-            while (true)
-            {
-                Initialize();
-
-                while (MarqueeUpdated())
-                    yield return null;
-            }
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <returns></returns>
-        /// <remarks></remarks>
-        protected virtual bool MarqueeUpdated()
-        {
-            bool result = ShouldBeScrolling();
-
-            if (result)
-                UpdateScroll();
-
-            return result;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <returns></returns>
-        protected virtual bool ShouldBeScrolling() => elapsedSeconds < scrollDuration;
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void UpdateScroll()
-        {
-            CheckWidthChanged();
-
-            TickElapsed();
-
-            UpdatePosition();
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void CheckWidthChanged()
-        {
-            if (WidthHasChanged())
-            {
-                ForceUpdateWidth();
-
-                CalculateElapsedSeconds();
-            }
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <returns></returns>
-        protected virtual bool WidthHasChanged() => Mathf.Abs(tmp.rectTransform.rect.width - currentWidth) > 0.1f;
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void CalculateElapsedSeconds()
-        {
-            float currentX = marqueeTransform.localPosition.x;
-
-            float totalDistance = startX - ScrollEndXPosition();
-
-            float remainingDistance = currentX - ScrollEndXPosition();
-
-            float progress = 1f - (remainingDistance / totalDistance);
-
-            elapsedSeconds = progress * scrollDuration;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <returns></returns>
-        protected virtual float ScrollEndXPosition() => parentMask.rect.xMin - tmp.rectTransform.rect.width;
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void TickElapsed() => elapsedSeconds += Time.deltaTime;
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void UpdatePosition()
-        {
-            float interpolationPercentage = Mathf.Clamp01(elapsedSeconds / scrollDuration);
-
-            float calculatedX = Mathf.Lerp(startX, ScrollEndXPosition(), interpolationPercentage);
-
-            marqueeTransform.localPosition = new Vector3(calculatedX, 0, 0);
-        }
-    }
+//OG Author: KHeartz. My Magic Man
+//Edited Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using System.Collections;
+using UnityEngine;
+
+namespace DREditor.TextDisplaying
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [ClassHeader(nameof(TMPMarqueeBase) +
+        "\n\n")]
+    public class TMPMarquee : TMPMarqueeBase
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected float scrollDuration = 5;
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected float currentWidth;
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected float startX;
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected float elapsedSeconds;
+
+
+        /// <inheritdoc/>
+        protected override void Initialize()
+        {
+            ResetPosition();
+
+            ForceUpdateWidth();
+
+            ResetCalculatedVariables();
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void ResetPosition() => marqueeTransform.localPosition = new(parentMask.rect.xMax, 0, 0);
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void ForceUpdateWidth()
+        {
+            tmp.ForceMeshUpdate();
+
+            currentWidth = tmp.rectTransform.rect.width;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void ResetCalculatedVariables()
+        {
+            startX = marqueeTransform.localPosition.x;
+
+            elapsedSeconds = 0f;
+        }
+
+
+        /// <inheritdoc/>
+        protected override IEnumerator MarqueeRoutine()
+        {
+            while (true)
+            {
+                Initialize();
+
+                while (MarqueeUpdated())
+                    yield return null;
+            }
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks></remarks>
+        protected virtual bool MarqueeUpdated()
+        {
+            bool result = ShouldBeScrolling();
+
+            if (result)
+                UpdateScroll();
+
+            return result;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <returns></returns>
+        protected virtual bool ShouldBeScrolling() => elapsedSeconds < scrollDuration;
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void UpdateScroll()
+        {
+            CheckWidthChanged();
+
+            TickElapsed();
+
+            UpdatePosition();
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void CheckWidthChanged()
+        {
+            if (WidthHasChanged())
+            {
+                ForceUpdateWidth();
+
+                CalculateElapsedSeconds();
+            }
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <returns></returns>
+        protected virtual bool WidthHasChanged() => Mathf.Abs(tmp.rectTransform.rect.width - currentWidth) > 0.1f;
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void CalculateElapsedSeconds()
+        {
+            float currentX = marqueeTransform.localPosition.x;
+
+            float totalDistance = startX - ScrollEndXPosition();
+
+            float remainingDistance = currentX - ScrollEndXPosition();
+
+            float progress = 1f - (remainingDistance / totalDistance);
+
+            elapsedSeconds = progress * scrollDuration;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <returns></returns>
+        protected virtual float ScrollEndXPosition() => parentMask.rect.xMin - tmp.rectTransform.rect.width;
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void TickElapsed() => elapsedSeconds += Time.deltaTime;
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void UpdatePosition()
+        {
+            float interpolationPercentage = Mathf.Clamp01(elapsedSeconds / scrollDuration);
+
+            float calculatedX = Mathf.Lerp(startX, ScrollEndXPosition(), interpolationPercentage);
+
+            marqueeTransform.localPosition = new Vector3(calculatedX, 0, 0);
+        }
+    }
 }

package/TMPMarquee.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 78221e5b1a4c50a44ac3a897b2e6d4a9
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 78221e5b1a4c50a44ac3a897b2e6d4a9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: