Skip to content

Commit 41bf4c2

Browse files
Squashed commit of the following:
commit 2fbc2f5 Author: Jon McCreadie <[email protected]> Date: Tue Mar 19 14:10:36 2024 +0000 Update GizmoDrawerInspector.cs add bool method that hides the origin options if useAttachedTransformValues is set to true; commit 408cc6b Author: Jon McCreadie <[email protected]> Date: Tue Mar 19 14:09:14 2024 +0000 Update GizmoTool.cs Set the origin transform to the one the script is on in relevant gizmo types. commit d232b67 Author: Jon McCreadie <[email protected]> Date: Tue Mar 19 11:32:40 2024 +0000 Set Origin Transform Automatically * Automatically sets the origin transform to the attached transform if Use Attached Transform Values is set to true in the inspector. * Renamed Use Transform Values bool to Use Attached Transform Values.
1 parent fdba852 commit 41bf4c2

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed

Editor/GizmoDrawer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class GizmoDrawer : MonoBehaviour
2828
// Mesh
2929
[HideInInspector] public Mesh mesh;
3030
[HideInInspector] public Vector3 meshRotation;
31-
[HideInInspector] public bool useTransformValues;
31+
[HideInInspector] public bool useAttachedTransformValues;
3232
//Line
3333
[HideInInspector] public Transform targetTransform;
3434
[HideInInspector] public Vector3 targetPosition;

Editor/GizmoDrawerInspector.cs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private void OnEnable()
6767
serProp_texture = serializedObject.FindProperty("texture");
6868
serProp_mat = serializedObject.FindProperty("mat");
6969

70-
serProp_useTransfromVals = serializedObject.FindProperty("useTransformValues");
70+
serProp_useTransfromVals = serializedObject.FindProperty("useAttachedTransformValues");
7171
}
7272

7373
public override void OnInspectorGUI()
@@ -82,7 +82,7 @@ public override void OnInspectorGUI()
8282
EditorGUILayout.PropertyField(serProp_gizmoType, true);
8383
EditorGUILayout.Space();
8484

85-
if (_showSingleOrigin)
85+
if (_showSingleOrigin && ShowOriginOptions(gizmoDrawer))
8686
{
8787
// Transform
8888
EditorGUILayout.PropertyField(serProp_originTrans);
@@ -194,6 +194,17 @@ static void DrawInspector(GizmoType type, GizmoDrawerInspector editor, out bool
194194
break;
195195
}
196196
}
197+
198+
static bool ShowOriginOptions(GizmoDrawer drawer)
199+
{
200+
if (drawer.gizmoType == GizmoType.Mesh || drawer.gizmoType == GizmoType.WireMesh)
201+
{
202+
if (drawer.useAttachedTransformValues)
203+
return false;
204+
}
205+
206+
return true;
207+
}
197208
}
198209
#endif
199210
}

Editor/GizmoTool.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,16 @@ internal static void DrawGizmo(GizmoDrawer drawer)
5353
break;
5454

5555
case GizmoType.Mesh:
56+
if (drawer.useAttachedTransformValues)
57+
drawer.originTransform = drawer.transform;
58+
5659
Gizmos.DrawMesh(drawer.mesh, OriginPosition(drawer), MeshRotation(drawer), MeshScale(drawer), drawer.gizmoColor);
5760
break;
5861

5962
case GizmoType.WireMesh:
63+
if (drawer.useAttachedTransformValues)
64+
drawer.originTransform = drawer.transform;
65+
6066
Gizmos.DrawWireMesh(drawer.mesh, OriginPosition(drawer), MeshRotation(drawer), MeshScale(drawer), drawer.gizmoColor);
6167
break;
6268

@@ -125,7 +131,7 @@ static void SyncPositionArrays(GizmoDrawer drawer, out Vector3[] points, out Tra
125131

126132
static Quaternion MeshRotation(GizmoDrawer drawer)
127133
{
128-
if (drawer.useTransformValues)
134+
if (drawer.useAttachedTransformValues)
129135
{
130136
if (drawer.originTransform != null)
131137
return drawer.originTransform.rotation;
@@ -138,7 +144,7 @@ static Quaternion MeshRotation(GizmoDrawer drawer)
138144

139145
static Vector3 MeshScale(GizmoDrawer drawer)
140146
{
141-
if (drawer.useTransformValues)
147+
if (drawer.useAttachedTransformValues)
142148
{
143149
if (drawer.originTransform != null)
144150
return drawer.originTransform.localScale;

0 commit comments

Comments
 (0)