caleb-brown/unity-atoms
1
0
Fork 0
mirror of https://github.com/unity-atoms/unity-atoms.git synced 2025-01-21 23:58:49 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

FIX: Using TextField in AssetGenerator does not work as expected (#409)

Browse Source 
* fix: pasting FullQualifiedName in the generators text field, not picking up the actual type

* fix: replaced TryAdd call to support lower .NET versions
This commit is contained in:
Soraphis 2023-07-19 19:40:38 +02:00 committed by GitHub
parent f75215adba
commit b225290b48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Packages/Core/Editor/Editors/AtomGeneratorEditor.cs
View File

@ -16,8 +16,6 @@ namespace UnityAtoms.Editor
private TypeSelectorDropdown typeSelectorDropdown;
private SerializedProperty fullQualifiedName;
private SerializedProperty typeNamespace;
private SerializedProperty baseType;
private SerializedProperty generatedOptions;
private static bool safeSearch = true;
@ -26,8 +24,6 @@ namespace UnityAtoms.Editor
{
// Find Properties.
fullQualifiedName = serializedObject.FindProperty(nameof(AtomGenerator.FullQualifiedName));
typeNamespace = serializedObject.FindProperty(nameof(AtomGenerator.Namespace));
baseType = serializedObject.FindProperty(nameof(AtomGenerator.BaseType));
generatedOptions = serializedObject.FindProperty(nameof(AtomGenerator.GenerationOptions));
// Check if the current type is unsafe.
@ -90,8 +86,6 @@ namespace UnityAtoms.Editor
serializedObject.Update();
fullQualifiedName.stringValue = selectedType.AssemblyQualifiedName;
typeNamespace.stringValue = selectedType.Namespace;
baseType.stringValue = selectedType.Name;
serializedObject.ApplyModifiedProperties();
});
@ -251,7 +245,14 @@ namespace UnityAtoms.Editor
parent.AddChild(dropdownItem);
// Use Hash instead of id! If 2 AdvancedDropdownItems have the same name, they will generate the same id (stupid, I know). To ensure searching for a unique identifier, we use the hash instead.
idTypePairs.Add(dropdownItem.GetHashCode(), type);
if(!idTypePairs.TryGetValue(dropdownItem.GetHashCode(), out var preExistingType))
{
idTypePairs.Add(dropdownItem.GetHashCode(), type);
}
else if(preExistingType.FullName != type.FullName) // type already exists, but it might be just the type itself (e.g. happens for me when using a ECS project)
{
Debug.LogError($"Could not add '{type.FullName}' to list, because it had a hash collision with: {idTypePairs[dropdownItem.GetHashCode()].FullName}");
}
}
}

4
Packages/Core/Editor/Generator/AtomGenerator.cs
View File

@ -11,8 +11,8 @@ namespace UnityAtoms.Editor
public class AtomGenerator : ScriptableObject
{
[TextArea] public string FullQualifiedName;
public string Namespace;
public string BaseType;
public string Namespace => string.IsNullOrWhiteSpace(FullQualifiedName) ? "" : Type.GetType(FullQualifiedName)?.Namespace;
public string BaseType => string.IsNullOrWhiteSpace(FullQualifiedName) ? "" : Type.GetType(FullQualifiedName)?.Name;
public int GenerationOptions;