Skip to content

#34 add prefabs assets item builder #35

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

Merged
merged 12 commits into from
Jul 22, 2022
Merged

#34 add prefabs assets item builder #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b3a5ccb
Merge branch '#24-Add-None-Option-CustomDrawers' into Merging
marc-antoine-girard Jul 12, 2022
b92d5ae
Merge branch '#21-Fix-NullReferenceException-RawReferenceDrawer' into…
marc-antoine-girard Jul 12, 2022
e3ecc45
Merge branch '#25-Fix-Setter-ReferenceDrawer' into Merging
marc-antoine-girard Jul 12, 2022
2199452
Merge branch '#22-Fix-DragAndDrop-ReferenceDrawer' into Merging
marc-antoine-girard Jul 12, 2022
693da10
Update RawReferenceDrawer.cs
marc-antoine-girard Jul 12, 2022
64c42a4
Update ReferenceDrawer.cs
marc-antoine-girard Jul 12, 2022
5c45251
Forgot to set a ModeValue
marc-antoine-girard Jul 12, 2022
a400f57
Update ReferenceDrawer.cs PropertyValue setter
marc-antoine-girard Jul 14, 2022
1610d5f
Update AssetsItemBuilder.cs
marc-antoine-girard Jul 14, 2022
bee1446
Merge remote-tracking branch 'upstream/main' into #34-Add-Prefabs-Ass…
marc-antoine-girard Jul 22, 2022
cbd6194
Fix issues during merge
marc-antoine-girard Jul 22, 2022
b7799d5
Merge remote-tracking branch 'upstream/main' into #34-Add-Prefabs-Ass…
marc-antoine-girard Jul 22, 2022
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
7 changes: 7 additions & 0 deletions Editor/Builders/AssetsItemBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using TNRD.Utilities;
using UnityEditor;
using UnityEditor.IMGUI.Controls;
using UnityEngine;
using UnityEngine.Assertions;

namespace TNRD.Builders
Expand Down Expand Up @@ -37,6 +38,12 @@ public AdvancedDropdownItem Build()
{
CreateItemForPath(root, assetPath);
}
else if (assetType == typeof(GameObject))
{
GameObject gameObject = AssetDatabase.LoadAssetAtPath<GameObject>(assetPath);
Copy link
Owner

@Thundernerd Thundernerd Jul 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. I have a feeling that this might become very slow for larger projects

Copy link
Contributor

@lordubbe lordubbe Nov 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, so much so that I ended up making this: #57
If this is to remain I think it would be very nice with a setting to exclude this behaviour, as it is very painful for me to wait like 5 seconds for the dropdown to open haha

Copy link
Owner

@Thundernerd Thundernerd Nov 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oof yeah that is pretty bad! I'll have a look at your PR!

Copy link
Contributor Author

@marc-antoine-girard marc-antoine-girard Nov 9, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, sorry about that! It became so slow in our project that we had to comment it out. We were looking in a way to stream the assets instead of loading them. I believe the new Search package in Unity does that, but I'm not sure how to use their API yet.

Edit: Had we had the Preference window, I think it would've made sense to have Prefab lookup disabled by default. In small project, I'm sure it can have value, but it sure doesn't scale well.

if (gameObject.GetComponent(interfaceType) != null)
CreateItemForPath(root, assetPath);
}
}

return root;
Expand Down
6 changes: 1 addition & 5 deletions Editor/Drawers/RawReferenceDrawer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,13 @@ private void AvoidDuplicateReferencesInArray()
if (previousPropertyPath == Property.propertyPath)
return;

SerializedProperty rawReferenceProperty = Property.FindPropertyRelative("rawReference");
object currentReferenceValue = RawReferenceValue;

if (currentReferenceValue == null)
return;

if (previousReferenceValue == currentReferenceValue)
{
RawReferenceValue = CreateInstance(currentReferenceValue);
rawReferenceProperty.serializedObject.ApplyModifiedProperties();
}
PropertyValue = CreateInstance(currentReferenceValue);

previousReferenceValue = currentReferenceValue;
}
Expand Down
12 changes: 10 additions & 2 deletions Editor/Drawers/ReferenceDrawer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ protected object PropertyValue
UnityReferenceProperty.objectReferenceValue = null;
break;
case ReferenceMode.Unity:
UnityReferenceProperty.objectReferenceValue = (Object)value;
UnityReferenceProperty.objectReferenceValue = GetUnityObject((Object)value);
RawReferenceValue = null;
break;
default:
Expand Down Expand Up @@ -138,6 +138,7 @@ private void OnClicked()

private void OnDeletePressed()
{
ModeValue = default;
PropertyValue = null;
}

Expand Down Expand Up @@ -199,7 +200,7 @@ private void HandleDragUpdated()
{
Type scriptType = monoScript.GetClass();

if (scriptType.IsSubclassOf(typeof(UnityEngine.Object)))
if (scriptType.IsSubclassOf(typeof(Object)))
{
SetDragAndDropMode(false);
return;
Expand Down Expand Up @@ -238,6 +239,13 @@ private void HandleDragPerform()
}
}

private Object GetUnityObject(Object objectReference)
{
if(objectReference is GameObject gameObject)
return gameObject.GetComponent(GenericType);
return objectReference;
}

protected abstract void PingObject();
}
}