Spawn area now aligns with ground, effects scale and rotation

Author: EliCDavis

unity-packages/polyform/Runtime/Scripts/Variants/SpawnAreas/AggregateSpawnArea.cs

@@ -15,7 +15,7 @@ private void Awake()
             areas = spawnAreas.List();
         }
 
-        protected override Vector3 GenerateSpawn()
+        public override SpawnTransform SpawnPoint()
         {
             if (areas.Count == 0)
             {
@@ -24,18 +24,5 @@ protected override Vector3 GenerateSpawn()
 
             return areas.Next().SpawnPoint();
         }
-
-        public override bool InsideArea(Vector3 p)
-        {
-            foreach (var area in areas)
-            {
-                if (area.InsideArea(p))
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
     }
 }

unity-packages/polyform/Runtime/Scripts/Variants/SpawnAreas/BoxSpawnArea.cs

@@ -3,14 +3,14 @@
 namespace EliCDavis.Polyform.Variants.SpawnAreas
 {
     [AddComponentMenu("Polyform/Variant/Spawn Area/Box Spawn Area")]
-    public class BoxSpawnArea : SpawnArea
+    public class BoxSpawnArea : VolumeSpawnArea
     {
         private bool InRange(float v, float min, float max)
         {
             return v >= min && v <= max;
         }
 
-        protected override Vector3 GenerateSpawn()
+        public override Vector3 GenerateSpawn()
         {
             return transform.TransformPoint(new Vector3(
                 Random.Range(-0.5f, 0.5f),

unity-packages/polyform/Runtime/Scripts/Variants/SpawnAreas/GroundSettings.cs

@@ -0,0 +1,54 @@
+using System;
+using UnityEngine;
+
+namespace EliCDavis.Polyform.Variants.SpawnAreas
+{
+    [Serializable]
+    public class GroundSettings
+    {
+        private const int MaxGroundTrys = 100;
+
+        [SerializeField] private bool clampToGround;
+
+        [SerializeField] private float groundInset;
+
+        [SerializeField] private bool alignToGroundNormal;
+
+        public SpawnTransform ModifySpawn(VolumeSpawnArea spawnArea, SpawnTransform spawn)
+        {
+            if (!clampToGround)
+            {
+                return spawn;
+            }
+
+            var p = spawn.Position;
+            var r = spawn.Rotation;
+            for (var i = 0; i < MaxGroundTrys; i++)
+            {
+                if (Physics.Raycast(p, Vector3.down, out var hit))
+                {
+                    if (spawnArea.InsideArea(hit.point))
+                    {
+                        p = hit.point - new Vector3(0, groundInset, 0);
+
+                        if (alignToGroundNormal)
+                        {
+                            Quaternion targetRotation = Quaternion.FromToRotation(Vector3.up, hit.normal);
+                            r = targetRotation * r;
+                        }
+                        
+                        break;
+                    }
+                }
+
+                p = spawnArea.GenerateSpawn();
+            }
+            
+            return new SpawnTransform(
+                p,
+                r,
+                spawn.Scale
+            );
+        }
+    }
+}

unity-packages/polyform/Runtime/Scripts/Variants/SpawnAreas/GroundSettings.cs.meta

@@ -4,37 +4,6 @@ namespace EliCDavis.Polyform.Variants.SpawnAreas
 {
     public abstract class SpawnArea : MonoBehaviour
     {
-        [SerializeField] private bool clampToGround;
-
-        [SerializeField] private float groundInset;
-
-        protected Color GizmoColor = new Color(1, 0, 0, 0.2f);
-        
-        public Vector3 SpawnPoint()
-        {
-            var p = GenerateSpawn();
-            if (!clampToGround)
-            {
-                return p;
-            }
-
-            for (int i = 0; i < 100; i++)
-            {
-                if (Physics.Raycast(p, Vector3.down, out var hit))
-                {
-                    if (InsideArea(hit.point))
-                    {
-                        return hit.point - new Vector3(0, groundInset, 0);
-                    }
-                }
-                p = GenerateSpawn();
-            }
-
-            return p;
-        }
-
-        protected abstract Vector3 GenerateSpawn();
-
-        public abstract bool InsideArea(Vector3 p);
+        public abstract SpawnTransform SpawnPoint();
     }
 }

unity-packages/polyform/Runtime/Scripts/Variants/SpawnAreas/SpawnArea.cs

@@ -0,0 +1,47 @@
+using UnityEngine;
+
+namespace EliCDavis.Polyform.Variants.SpawnAreas
+{
+    [System.Serializable]
+    public class SpawnTransform
+    {
+        
+        public SpawnTransform(Vector3 position)
+        {
+            this.position = position;
+            
+            rotation = Quaternion.identity;
+            scale = Vector3.one;
+        }
+        
+        public SpawnTransform(Vector3 position, Quaternion rotation, Vector3 scale)
+        {
+            this.position = position;
+            this.rotation = rotation;
+            this.scale = scale;
+        }
+
+        public void Set(Transform transform)
+        {
+            transform.position = position;
+            transform.rotation = rotation;
+            transform.localScale = scale;
+        }
+
+        public Vector3 Position => position;
+
+        public Quaternion Rotation => rotation;
+
+        public Vector3 Scale => scale;
+
+        [SerializeField]
+        private Vector3 position;
+        
+        [SerializeField]
+        private Quaternion rotation;
+        
+        [SerializeField]
+        private Vector3 scale;
+        
+    }
+}

unity-packages/polyform/Runtime/Scripts/Variants/SpawnAreas/SpawnTransform.cs

@@ -3,11 +3,11 @@
 namespace EliCDavis.Polyform.Variants.SpawnAreas
 {
     [AddComponentMenu("Polyform/Variant/Spawn Area/Sphere Spawn Area")]
-    public class SphereSpawnArea : SpawnArea
+    public class SphereSpawnArea : VolumeSpawnArea
     {
         [SerializeField] private float radius;
 
-        protected override Vector3 GenerateSpawn()
+        public override Vector3 GenerateSpawn()
         {
             return transform.position + (Random.insideUnitSphere * radius);
         }

unity-packages/polyform/Runtime/Scripts/Variants/SpawnAreas/SpawnTransform.cs.meta

@@ -0,0 +1,49 @@
+using UnityEngine;
+
+namespace EliCDavis.Polyform.Variants.SpawnAreas
+{
+    public abstract class VolumeSpawnArea : SpawnArea
+    {
+        [SerializeField] private GroundSettings groundSettings;
+
+        [SerializeField] private Vector3 minScale = Vector3.one;
+
+        [SerializeField] private Vector3 maxScale = Vector3.one;
+
+        [SerializeField] private Vector3 minRotation = Vector3.zero;
+
+        [SerializeField] private Vector3 maxRotation = Vector3.zero;
+
+        protected Color GizmoColor = new Color(1, 0, 0, 0.2f);
+
+        private Vector3 Random(Vector3 min, Vector3 max)
+        {
+            var range = max - min;
+            return min + new Vector3(
+                UnityEngine.Random.value * range.x,
+                UnityEngine.Random.value * range.y,
+                UnityEngine.Random.value * range.z
+            );
+        }
+
+        public override SpawnTransform SpawnPoint()
+        {
+            var p = GenerateSpawn();
+            var r = Quaternion.Euler(Random(minRotation, maxRotation));
+            var s = Random(minScale, maxScale);
+            var spawn = new SpawnTransform(p, r, s);
+
+            if (groundSettings == null)
+            {
+                return spawn;
+            }
+
+
+            return groundSettings.ModifySpawn(this, spawn);
+        }
+
+        public abstract Vector3 GenerateSpawn();
+
+        public abstract bool InsideArea(Vector3 p);
+    }
+}