Skip to content

6.5 Fixes #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nnra6864 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

6.5 Fixes #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bec8bfc
6.5 Fixes
nnra6864 Mar 31, 2026
4ca1b59
Fixed a remaining warning
nnra6864 Mar 31, 2026
e302ebf
Lowered min ver for entity id to 6.4 to avoid obsolete warnings
nnra6864 Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Alchemy/Assets/Alchemy/Editor/Hierarchy/HierarchyDrawer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,22 @@ namespace Alchemy.Editor
/// </summary>
public abstract class HierarchyDrawer
{
#if UNITY_6000_4_OR_NEWER
public abstract void OnGUI(EntityId instanceID, Rect selectionRect);
#else
public abstract void OnGUI(int instanceID, Rect selectionRect);
#endif

protected static Rect GetBackgroundRect(Rect selectionRect)
{
return selectionRect.AddXMax(20f);
}

#if UNITY_6000_4_OR_NEWER
protected static void DrawBackground(EntityId instanceID, Rect selectionRect)
#else
protected static void DrawBackground(int instanceID, Rect selectionRect)
#endif
{
var backgroundRect = GetBackgroundRect(selectionRect);

Expand All @@ -39,4 +47,4 @@ protected static void DrawBackground(int instanceID, Rect selectionRect)
EditorGUI.DrawRect(backgroundRect, backgroundColor);
}
}
}
}
6 changes: 5 additions & 1 deletion Alchemy/Assets/Alchemy/Editor/Hierarchy/HierarchyDrawerInitializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@ static void Init()

foreach (var drawer in drawers)
{
#if UNITY_6000_4_OR_NEWER
EditorApplication.hierarchyWindowItemByEntityIdOnGUI += drawer.OnGUI;
#else
EditorApplication.hierarchyWindowItemOnGUI += drawer.OnGUI;
#endif
}
}
}
}
}
10 changes: 9 additions & 1 deletion Alchemy/Assets/Alchemy/Editor/Hierarchy/HierarchyHeaderDrawer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ public sealed class HierarchyHeaderDrawer : HierarchyDrawer
static Color HeaderColor => EditorGUIUtility.isProSkin ? new(0.45f, 0.45f, 0.45f, 0.5f) : new(0.55f, 0.55f, 0.55f, 0.5f);
static GUIStyle labelStyle;

#if UNITY_6000_4_OR_NEWER
public override void OnGUI(EntityId instanceID, Rect selectionRect)
#else
public override void OnGUI(int instanceID, Rect selectionRect)
#endif
{
if (labelStyle == null)
{
Expand All @@ -20,7 +24,11 @@ public override void OnGUI(int instanceID, Rect selectionRect)
};
}

#if UNITY_6000_4_OR_NEWER
var gameObject = EditorUtility.EntityIdToObject(instanceID) as GameObject;
#else
var gameObject = EditorUtility.InstanceIDToObject(instanceID) as GameObject;
#endif
if (gameObject == null) return;
if (!gameObject.TryGetComponent<HierarchyHeader>(out _)) return;

Expand All @@ -31,4 +39,4 @@ public override void OnGUI(int instanceID, Rect selectionRect)
EditorGUI.LabelField(headerRect, gameObject.name, labelStyle);
}
}
}
}
6 changes: 5 additions & 1 deletion Alchemy/Assets/Alchemy/Editor/Hierarchy/HierarchyRowSeparatorDrawer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ namespace Alchemy.Editor
{
public class HierarchyRowSeparatorDrawer : HierarchyDrawer
{
#if UNITY_6000_4_OR_NEWER
public override void OnGUI(EntityId instanceID, Rect selectionRect)
#else
public override void OnGUI(int instanceID, Rect selectionRect)
#endif
{
var settings = AlchemySettings.GetOrCreateSettings();
if (!settings.ShowSeparator) return;
Expand All @@ -21,4 +25,4 @@ public override void OnGUI(int instanceID, Rect selectionRect)
EditorGUI.DrawRect(selectionRect, Mathf.FloorToInt((selectionRect.y - 4) / 16 % 2) == 0 ? settings.EvenRowColor : settings.OddRowColor);
}
}
}
}
10 changes: 9 additions & 1 deletion Alchemy/Assets/Alchemy/Editor/Hierarchy/HierarchySeparatorDrawer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,17 @@ public sealed class HierarchySeparatorDrawer : HierarchyDrawer
{
static Color SeparatorColor => new(0.5f, 0.5f, 0.5f);

#if UNITY_6000_4_OR_NEWER
public override void OnGUI(EntityId instanceID, Rect selectionRect)
#else
public override void OnGUI(int instanceID, Rect selectionRect)
#endif
{
#if UNITY_6000_4_OR_NEWER
var gameObject = EditorUtility.EntityIdToObject(instanceID) as GameObject;
#else
var gameObject = EditorUtility.InstanceIDToObject(instanceID) as GameObject;
#endif
if (gameObject == null) return;
if (!gameObject.TryGetComponent<HierarchySeparator>(out _)) return;

Expand All @@ -20,4 +28,4 @@ public override void OnGUI(int instanceID, Rect selectionRect)
EditorGUI.DrawRect(lineRect, SeparatorColor);
}
}
}
}
10 changes: 9 additions & 1 deletion Alchemy/Assets/Alchemy/Editor/Hierarchy/HierarchyToggleDrawer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,17 @@ namespace Alchemy.Editor
{
public sealed class HierarchyToggleDrawer : HierarchyDrawer
{
#if UNITY_6000_4_OR_NEWER
public override void OnGUI(EntityId instanceID, Rect selectionRect)
#else
public override void OnGUI(int instanceID, Rect selectionRect)
#endif
{
#if UNITY_6000_4_OR_NEWER
var gameObject = EditorUtility.EntityIdToObject(instanceID) as GameObject;
#else
var gameObject = EditorUtility.InstanceIDToObject(instanceID) as GameObject;
#endif
if (gameObject == null) return;
if (gameObject.TryGetComponent<HierarchyObject>(out _)) return;

Expand Down Expand Up @@ -100,4 +108,4 @@ private static bool IsNewPrefabWorkflow()
}
}

}
}
10 changes: 9 additions & 1 deletion Alchemy/Assets/Alchemy/Editor/Hierarchy/HierarchyTreeMapDrawer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,17 @@ public static Texture2D TreeMapLine
}
}

#if UNITY_6000_4_OR_NEWER
public override void OnGUI(EntityId instanceID, Rect selectionRect)
#else
public override void OnGUI(int instanceID, Rect selectionRect)
#endif
{
#if UNITY_6000_4_OR_NEWER
var gameObject = EditorUtility.EntityIdToObject(instanceID) as GameObject;
#else
var gameObject = EditorUtility.InstanceIDToObject(instanceID) as GameObject;
#endif
if (gameObject == null) return;

var settings = AlchemySettings.GetOrCreateSettings();
Expand Down Expand Up @@ -137,4 +145,4 @@ public override void OnGUI(int instanceID, Rect selectionRect)
}
}
}
}
}
6 changes: 5 additions & 1 deletion Alchemy/Assets/Alchemy/Editor/Internal/SerializeReferenceDropdown.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,11 @@ public static void AddTo(AdvancedDropdownItem root, IEnumerable<Type> types)

static AdvancedDropdownItem GetItem(AdvancedDropdownItem parent, string name)
{
#if UNITY_6000_5_OR_NEWER
foreach (AdvancedDropdownItem item in parent.childList)
#else
foreach (AdvancedDropdownItem item in parent.children)
#endif
{
if (item.name == name) return item;
}
Expand Down Expand Up @@ -150,4 +154,4 @@ static string[] GetSplittedTypePath(Type type)
}

}
}
}