com.wallstop-studios.unity-helpers 2.0.0-rc73.19 → 2.0.0-rc73.2

package/Runtime/Utils/TextureScale.cs

@@ -54,8 +54,8 @@
             }
             else
             {
-                ratioX = (float)tex.width / newWidth;
-                ratioY = (float)tex.height / newHeight;
+                ratioX = ((float)tex.width) / newWidth;
+                ratioY = ((float)tex.height) / newHeight;
             }
 
             w = tex.width;
@@ -123,7 +123,7 @@
                 int y2 = (yFloor + 1) * w;
                 int yw = y * w2;
 
-                for (int x = 0; x < w2; x++)
+                for (var x = 0; x < w2; x++)
                 {
                     int xFloor = (int)Mathf.Floor(x * ratioX);
                     float xLerp = x * ratioX - xFloor;
@@ -155,7 +155,7 @@
             {
                 int thisY = (int)(ratioY * y) * w;
                 int yw = y * w2;
-                for (int x = 0; x < w2; x++)
+                for (var x = 0; x < w2; x++)
                 {
                     newColors[yw + x] = texColors[(int)(thisY + ratioX * x)];
                 }

package/Styles/Elements/{Progress/CircularProgressBar.cs → CircularProgressBar.cs}

@@ -1,4 +1,4 @@
-namespace WallstopStudios.UnityHelpers.Styles.Elements.Progress
+namespace WallstopStudios.UnityHelpers.Styles.Elements
 {
     using System.ComponentModel;
     using UnityEngine;
@@ -31,10 +31,6 @@
             get => _progress;
             set
             {
-                if (float.IsNaN(value) || float.IsInfinity(value))
-                {
-                    return;
-                }
                 _progress = Mathf.Clamp01(value);
                 MarkDirtyRepaint();
             }
@@ -46,10 +42,6 @@
             get => _radius;
             set
             {
-                if (float.IsNaN(value) || float.IsInfinity(value))
-                {
-                    return;
-                }
                 _radius = Mathf.Max(1f, value);
                 UpdateSize();
                 MarkDirtyRepaint();
@@ -62,27 +54,19 @@
             get => _thickness;
             set
             {
-                if (float.IsNaN(value) || float.IsInfinity(value))
-                {
-                    return;
-                }
                 _thickness = Mathf.Max(1f, value);
                 UpdateSize();
                 MarkDirtyRepaint();
             }
         }
 
-        private float _startPoint = GetStartAngleInDegrees(StartPointLocation.Top);
-        public float StartAt
+        private StartPointLocation _startPoint = StartPointLocation.Top;
+        public StartPointLocation StartAt
         {
             get => _startPoint;
             set
             {
-                if (float.IsNaN(value) || float.IsInfinity(value))
-                {
-                    return;
-                }
-                _startPoint = value % 360f;
+                _startPoint = value;
                 MarkDirtyRepaint();
             }
         }
@@ -142,11 +126,8 @@
                 defaultValue = 10f,
             };
 
-            private readonly UxmlFloatAttributeDescription _startPointAttribute = new()
-            {
-                name = "start-at",
-                defaultValue = GetStartAngleInDegrees(StartPointLocation.Top),
-            };
+            private readonly UxmlEnumAttributeDescription<StartPointLocation> _startPointAttribute =
+                new() { name = "start-at", defaultValue = StartPointLocation.Top };
 
             private readonly UxmlEnumAttributeDescription<FillDirection> _fillDirectionAttribute =
                 new() { name = "direction", defaultValue = FillDirection.Clockwise };
@@ -241,33 +222,63 @@
             float drawRadius = _radius;
             Vector2 center = rect.center;
 
-            painter.strokeColor = _trackColor;
-            painter.lineWidth = _thickness;
-            painter.BeginPath();
-            painter.Arc(center, drawRadius, 0f, 360f);
-            painter.Stroke();
-
-            if (Mathf.Approximately(_progress, 0))
+            if (_progress <= 0.01f)
             {
+                painter.strokeColor = _trackColor;
+                painter.lineWidth = _thickness;
+                painter.BeginPath();
+                painter.Arc(center, drawRadius, 0f, 360f);
+                painter.Stroke();
                 return;
             }
 
-            ArcDirection direction;
-            float sweepAngleDegrees;
-
             switch (_fillDirection)
             {
-                case FillDirection.Clockwise:
+                case FillDirection.CounterClockwise:
                 {
-                    direction = ArcDirection.Clockwise;
-                    sweepAngleDegrees = _progress * 360f;
-                    break;
+                    painter.strokeColor = _progressColor;
+                    painter.lineWidth = _thickness;
+                    painter.BeginPath();
+                    painter.Arc(center, drawRadius, 0f, 360f);
+                    painter.Stroke();
+
+                    float startAngleDegrees = GetStartAngleInDegrees(_startPoint);
+                    float sweepAngleDegrees = -1 * _progress * 360f;
+
+                    painter.strokeColor = _trackColor;
+                    painter.lineWidth = _thickness;
+                    painter.BeginPath();
+                    painter.Arc(
+                        center,
+                        drawRadius,
+                        startAngleDegrees,
+                        (startAngleDegrees + sweepAngleDegrees)
+                    );
+                    painter.Stroke();
+                    return;
                 }
-                case FillDirection.CounterClockwise:
+                case FillDirection.Clockwise:
                 {
-                    direction = ArcDirection.CounterClockwise;
-                    sweepAngleDegrees = -1 * _progress * 360f;
-                    break;
+                    painter.strokeColor = _trackColor;
+                    painter.lineWidth = _thickness;
+                    painter.BeginPath();
+                    painter.Arc(center, drawRadius, 0f, 360f);
+                    painter.Stroke();
+
+                    float startAngleDegrees = GetStartAngleInDegrees(_startPoint);
+                    float sweepAngleDegrees = _progress * 360f;
+
+                    painter.strokeColor = _progressColor;
+                    painter.lineWidth = _thickness;
+                    painter.BeginPath();
+                    painter.Arc(
+                        center,
+                        drawRadius,
+                        startAngleDegrees,
+                        (startAngleDegrees + sweepAngleDegrees)
+                    );
+                    painter.Stroke();
+                    return;
                 }
                 default:
                 {
@@ -278,21 +289,9 @@
                     );
                 }
             }
-
-            painter.strokeColor = _progressColor;
-            painter.lineWidth = _thickness;
-            painter.BeginPath();
-            painter.Arc(
-                center,
-                drawRadius,
-                _startPoint,
-                _startPoint + sweepAngleDegrees,
-                direction
-            );
-            painter.Stroke();
         }
 
-        public static float GetStartAngleInDegrees(StartPointLocation location)
+        private static float GetStartAngleInDegrees(StartPointLocation location)
         {
             return location switch
             {

package/Styles/Elements/{Progress/RegularProgressBar.cs → RegularProgressBar.cs}

@@ -1,4 +1,4 @@
-namespace WallstopStudios.UnityHelpers.Styles.Elements.Progress
+namespace WallstopStudios.UnityHelpers.Styles.Elements
 {
     using System.ComponentModel;
     using UnityEngine;
@@ -18,7 +18,7 @@
         private readonly VisualElement _trackElement;
         private readonly VisualElement _fillElement;
 
-        public enum OrientationType
+        public enum BarOrientation
         {
             Horizontal = 0,
             Vertical = 1,
@@ -36,10 +36,6 @@
             get => _progress;
             set
             {
-                if (float.IsNaN(value) || float.IsInfinity(value))
-                {
-                    return;
-                }
                 _progress = Mathf.Clamp01(value);
                 UpdateFillVisuals();
             }
@@ -73,8 +69,8 @@
             }
         }
 
-        private OrientationType _orientation = OrientationType.Horizontal;
-        public OrientationType Orientation
+        private BarOrientation _orientation = BarOrientation.Horizontal;
+        public BarOrientation Orientation
         {
             get => _orientation;
             set
@@ -104,10 +100,6 @@
             get => _borderRadius;
             set
             {
-                if (float.IsNaN(value) || float.IsInfinity(value))
-                {
-                    return;
-                }
                 _borderRadius = Mathf.Max(0, value);
                 ApplyBorderRadius();
             }
@@ -119,10 +111,6 @@
             get => _thickness;
             set
             {
-                if (float.IsNaN(value) || float.IsInfinity(value))
-                {
-                    return;
-                }
                 _thickness = Mathf.Max(1, value);
                 UpdateThicknessVisuals();
             }
@@ -150,8 +138,8 @@
                 defaultValue = new Color(0.2f, 0.7f, 0.2f, 1f),
             };
 
-            private readonly UxmlEnumAttributeDescription<OrientationType> _orientationAttribute =
-                new() { name = "orientation", defaultValue = OrientationType.Horizontal };
+            private readonly UxmlEnumAttributeDescription<BarOrientation> _orientationAttribute =
+                new() { name = "orientation", defaultValue = BarOrientation.Horizontal };
 
             private readonly UxmlEnumAttributeDescription<FillDirection> _fillAttribute = new()
             {
@@ -179,6 +167,7 @@
                     Debug.LogError(
                         $"Initialization failed, expected {nameof(RegularProgressBar)}, found {ve?.GetType()}.)"
                     );
+
                     return;
                 }
 
@@ -271,7 +260,7 @@
 
             switch (_orientation)
             {
-                case OrientationType.Horizontal:
+                case BarOrientation.Horizontal:
                 {
                     switch (_fillDirection)
                     {
@@ -305,7 +294,7 @@
 
                     break;
                 }
-                case OrientationType.Vertical:
+                case BarOrientation.Vertical:
                 {
                     switch (_fillDirection)
                     {
@@ -344,7 +333,7 @@
                     throw new InvalidEnumArgumentException(
                         nameof(_orientation),
                         (int)_orientation,
-                        typeof(OrientationType)
+                        typeof(BarOrientation)
                     );
                 }
             }
@@ -379,13 +368,13 @@
 
             switch (_orientation)
             {
-                case OrientationType.Horizontal:
+                case BarOrientation.Horizontal:
                 {
                     _fillElement.style.width = Length.Percent(clampedProgress * 100f);
                     _fillElement.style.height = Length.Percent(100);
                     break;
                 }
-                case OrientationType.Vertical:
+                case BarOrientation.Vertical:
                 {
                     _fillElement.style.height = Length.Percent(clampedProgress * 100f);
                     _fillElement.style.width = Length.Percent(100);
@@ -396,7 +385,7 @@
                     throw new InvalidEnumArgumentException(
                         nameof(_orientation),
                         (int)_orientation,
-                        typeof(OrientationType)
+                        typeof(BarOrientation)
                     );
                 }
             }

package/Styles/UXML/CircularProgressBar.uxml

@@ -0,0 +1,11 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:custom="WallstopStudios.UnityHelpers.Styles.Elements">
+    <ui:VisualElement style="flex-grow: 1; align-items: center; justify-content: space-around;">
+        <custom:CircularProgressBar radius="60" thickness="12" progress="0.75"
+                                    start-at="Top" direction="Clockwise"
+                                    progress-color-attr="blue" track-color-attr="lightgrey" />
+        <custom:CircularProgressBar progress="0.3" radius="40" />
+        <custom:CircularProgressBar class="warning" progress="0.9" radius="50" start-at="Bottom"
+                                    direction="CounterClockwise" />
+        <custom:CircularProgressBar class="slim" progress="0.5" radius="70" start-at="Left" direction="Clockwise" />
+    </ui:VisualElement>
+</ui:UXML>

package/Styles/UXML/CircularProgressBar.uxml.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 30396d1b727a20a469166139b7d733d0
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}

package/Styles/UXML/RegularProgressBar.uxml

@@ -0,0 +1,22 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements"
+         xmlns:custom="WallstopStudios.UnityHelpers.Styles.Elements">
+    <ui:VisualElement style="flex-direction: column; align-items: stretch; padding: 20px; width: 300px;">
+        <ui:Label text="Horizontal Progress Bars" />
+        <custom:RegularProgressBar progress="0.65" orientation="Horizontal"
+                                   thickness="20" border-radius="5"
+                                   progress-color-attr="#FFC107" track-color-attr="#424242" />
+        <custom:RegularProgressBar progress="0.3" orientation="Horizontal" />
+        <custom:RegularProgressBar class="slim-style" progress="0.8" orientation="Horizontal" />
+        <ui:Label text="Vertical Progress Bars" style="margin-top: 20px;" />
+        <ui:VisualElement
+            style="flex-direction: row; height: 150px; justify-content: space-around; align-items: stretch;">
+            <custom:RegularProgressBar progress="0.75" orientation="Vertical"
+                                       thickness="25" border-radius="8"
+                                       style="height: 120px;" />
+            <custom:RegularProgressBar class="warning-state" progress="0.5"
+                                       orientation="Vertical"
+                                       thickness="18"
+                                       style="height: 100px;" />
+        </ui:VisualElement>
+    </ui:VisualElement>
+</ui:UXML>

package/Styles/UXML/RegularProgressBar.uxml.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: b087d78ca899c3f4aa3acff6f2761a5b
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}

package/Styles/UXML.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 176a185ae21b4235b9add846132baa56
+timeCreated: 1746656378

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.unity-helpers",
-  "version": "2.0.0-rc73.19",
+  "version": "2.0.0-rc73.2",
   "displayName": "Unity Helpers",
   "description": "Various Unity Helper Library",
   "dependencies": {},
@@ -38,20 +38,3 @@
 }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-