Multiple Changes

- Moved tool logic out of mono behaviour and into own class.

- Added option to use transform values for mesh and wire mesh modes.

- Renamed files.

Author: FrayedFunction

Editor/GizmoDrawer.cs

@@ -9,26 +9,6 @@ public class GizmoDrawer : MonoBehaviour
         [SerializeField] private bool drawOnSelectOnly;
 
         #region Properties
-        [HideInInspector]
-        public enum GizmoType
-        {
-            Sphere,
-            WireSphere,
-
-            Cube,
-            WireCube,
-
-            Mesh,
-            WireMesh,
-
-            Line,
-            LineList,
-            LineStrip,
-
-            Icon,
-            GuiTexture,
-        }
-
         //Shared
         [HideInInspector] public Transform originTransform;
         [HideInInspector] public Vector3 originPos;
@@ -48,7 +28,7 @@ public enum GizmoType
         // Mesh
         [HideInInspector] public Mesh mesh;
         [HideInInspector] public Vector3 meshRotation;
-
+        [HideInInspector] public bool useTransformValues;
         //Line
         [HideInInspector] public Transform targetTransform;
         [HideInInspector] public Vector3 targetPosition;
@@ -79,118 +59,13 @@ public enum GizmoType
         private void OnDrawGizmosSelected()
         {
             if (drawOnSelectOnly)
-                DrawGizmo(this);
+                GizmoTool.DrawGizmo(this);
         }
 
         private void OnDrawGizmos()
         {
             if (!drawOnSelectOnly)
-                DrawGizmo(this);
-        }
-
-        static Vector3 LineTargetPosition(GizmoDrawer drawer)
-        {
-            if (drawer.targetTransform != null)
-            {
-                return drawer.targetTransform.position;
-            }
-
-            return drawer.targetPosition;
-        }
-
-        static Vector3 OriginPosition(GizmoDrawer drawer)
-        {
-            if (drawer.originTransform != null)
-            {
-                return drawer.originTransform.position;
-            }
-            else
-            {
-                return drawer.originPos;
-            }
-        }
-
-        static void SyncPositionArrays(GizmoDrawer drawer, out Vector3[] points, out Transform[] transforms)
-        {
-            points = drawer.points;
-            transforms = drawer.transformPoints;
-
-            if (transforms.Length > 0)
-            {
-                points = new Vector3[transforms.Length];
-
-                for (int i = 0; i < transforms.Length; i++)
-                {
-                    if (transforms[i] != null)
-                    {
-                        points[i] = transforms[i].position;
-                    }
-                }
-            }
-        }
-
-        static void DrawGizmo(GizmoDrawer drawer)
-        {
-            drawer.originPos = OriginPosition(drawer);
-            var origin = drawer.originPos;
-
-            var scale = drawer.scale;
-
-            switch (drawer.gizmoType)
-            {
-                case GizmoType.Sphere:
-                    GizmoUtil.DrawSphere(origin, drawer.floatRadius, drawer.gizmoColor);
-                    break;
-
-                case GizmoType.Cube:
-                    GizmoUtil.DrawCube(origin, scale, drawer.gizmoColor);
-                    break;
-
-                case GizmoType.WireSphere:
-                    GizmoUtil.DrawWireSphere(origin, drawer.floatRadius, drawer.gizmoColor);
-                    break;
-
-                case GizmoType.WireCube:
-                    GizmoUtil.DrawWireCube(origin, scale, drawer.gizmoColor);
-                    break;
-
-                case GizmoType.Icon:
-                    GizmoUtil.DrawIcon(origin, drawer.filePathString, drawer.allowScaling, drawer.gizmoColor);
-                    break;
-
-                case GizmoType.Mesh:
-                    var rotation = Quaternion.Euler(drawer.meshRotation);
-                    GizmoUtil.DrawMesh(drawer.mesh, origin, rotation, scale, drawer.gizmoColor);
-                    break;
-
-                case GizmoType.WireMesh:
-                    rotation = Quaternion.Euler(drawer.meshRotation);
-                    GizmoUtil.DrawWireMesh(drawer.mesh, origin, rotation, scale, drawer.gizmoColor);
-                    break;
-
-                case GizmoType.Line:
-                    drawer.targetPosition = LineTargetPosition(drawer);
-                    GizmoUtil.DrawLine(origin, drawer.targetPosition, drawer.gizmoColor);
-                    break;
-
-                case GizmoType.LineList or GizmoType.LineStrip:
-
-                    if (drawer.useTransformArray)
-                    {
-                        SyncPositionArrays(drawer, out drawer.points, out drawer.transformPoints);
-                    }
-
-                    if (drawer.gizmoType == GizmoType.LineStrip)
-                        GizmoUtil.DrawLineStrip(drawer.points, drawer.gizmoColor, drawer.looped);
-                    else
-                        GizmoUtil.DrawLineList(drawer.points, drawer.gizmoColor);
-                    break;
-
-                case GizmoType.GuiTexture:
-                    if (drawer.texture != null)
-                        GizmoUtil.DrawGuiTexture(drawer.screenRect, drawer.texture, drawer.mat);
-                    break;
-            }
+                GizmoTool.DrawGizmo(this);
         }
     }
 #endif

Editor/GizmoDrawerInspector.cs

@@ -30,7 +30,8 @@ public class GizmoDrawerInspector : Editor
             serProp_lineLoopedBool,
             serProp_screenRect,
             serProp_texture,
-            serProp_mat;
+            serProp_mat,
+            serProp_useTransfromVals;
         #endregion
 
         GizmoDrawer gizmoDrawer;
@@ -65,6 +66,8 @@ private void OnEnable()
             serProp_screenRect = serializedObject.FindProperty("screenRect");
             serProp_texture = serializedObject.FindProperty("texture");
             serProp_mat = serializedObject.FindProperty("mat");
+
+            serProp_useTransfromVals = serializedObject.FindProperty("useTransformValues");
         }
 
         public override void OnInspectorGUI()
@@ -106,45 +109,49 @@ public override void OnInspectorGUI()
                 SceneView.RepaintAll();
         }
 
-        static void DrawInspector(GizmoDrawer.GizmoType type, GizmoDrawerInspector editor, out bool showColour, out bool showSingleOrigin)
+        static void DrawInspector(GizmoType type, GizmoDrawerInspector editor, out bool showColour, out bool showSingleOrigin)
         {
             showSingleOrigin = false;
             showColour = false;
 
             switch (type)
             {
-                case GizmoDrawer.GizmoType.Sphere or GizmoDrawer.GizmoType.WireSphere:
+                case GizmoType.Sphere or GizmoType.WireSphere:
                     showSingleOrigin = true;
 
                     showColour = true;
                     EditorGUILayout.PropertyField(editor.serProp_floatRadius);
                     break;
 
-                case GizmoDrawer.GizmoType.Cube or GizmoDrawer.GizmoType.WireCube:
+                case GizmoType.Cube or GizmoType.WireCube:
                     showSingleOrigin = true;
 
                     showColour = true;
                     EditorGUILayout.PropertyField(editor.serProp_vec3Scale);
                     break;
 
-                case GizmoDrawer.GizmoType.Icon:
+                case GizmoType.Icon:
                     showSingleOrigin = true;
                     showColour = true;
 
                     EditorGUILayout.PropertyField(editor.serProp_filePathString);
                     EditorGUILayout.PropertyField(editor.serProp_allowScalingBool);
                     break;
 
-                case GizmoDrawer.GizmoType.Mesh or GizmoDrawer.GizmoType.WireMesh:
+                case GizmoType.Mesh or GizmoType.WireMesh:
                     showSingleOrigin = true;
                     showColour = true;
 
                     EditorGUILayout.PropertyField(editor.serProp_mesh);
+                    EditorGUILayout.PropertyField(editor.serProp_useTransfromVals);
+
+                    if (editor.serProp_useTransfromVals.boolValue == true) return;
+
                     EditorGUILayout.PropertyField(editor.serProp_meshRot);
                     EditorGUILayout.PropertyField(editor.serProp_vec3Scale);
                     break;
 
-                case GizmoDrawer.GizmoType.Line:
+                case GizmoType.Line:
                     showSingleOrigin = true;
                     showColour = true;
 
@@ -157,13 +164,13 @@ static void DrawInspector(GizmoDrawer.GizmoType type, GizmoDrawerInspector edito
                     }
                     break;
 
-                case GizmoDrawer.GizmoType.LineList or GizmoDrawer.GizmoType.LineStrip:
+                case GizmoType.LineList or GizmoType.LineStrip:
                     showSingleOrigin = false;
                     showColour = true;
 
                     EditorGUILayout.PropertyField(editor.serProp_useTransformArrayBool);
 
-                    if (type == GizmoDrawer.GizmoType.LineStrip)
+                    if (type == GizmoType.LineStrip)
                         EditorGUILayout.PropertyField(editor.serProp_lineLoopedBool);
 
                     if (editor.gizmoDrawer.useTransformArray)
@@ -176,7 +183,7 @@ static void DrawInspector(GizmoDrawer.GizmoType type, GizmoDrawerInspector edito
                     }
                     break;
 
-                case GizmoDrawer.GizmoType.GuiTexture:
+                case GizmoType.GuiTexture:
                     showSingleOrigin = true;
                     showColour = false;
                     EditorGUILayout.PropertyField(editor.serProp_texture);