Skip to content

SuperCustomProperties and their Unity effects persist over object prefab replacement #210

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
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

SuperCustomProperties and their Unity effects persist over object prefab replacement #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c74edaf
SuperCustomProperties and their Unity effects persist over object pre…
vvnurmi Apr 13, 2022
442f9db
Fixed null reference in previous commit
vvnurmi Apr 15, 2022
39bcd04
Fixed unwanted layer inheritance for prefab replacements
vvnurmi Apr 15, 2022
ac6867c
Removed unnecessary addition of SuperCustomProperties.CopyFrom
vvnurmi Apr 18, 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
6 changes: 3 additions & 3 deletions SuperTiled2Unity/Assets/SuperTiled2Unity/Scripts/Editor/Importers/TiledAssetImporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public void AddSuperCustomProperties(GameObject go, XElement xProperties, SuperT
component.m_Properties = properties.OrderBy(p => p.m_Name).ToList();

AssignUnityTag(component);
AssignUnityLayer(component);
AssignUnityLayer(component, defaultInheritFromParent: true);
}

public void AssignTilemapSorting(TilemapRenderer renderer)
Expand Down Expand Up @@ -146,7 +146,7 @@ protected void AssignUnityTag(SuperCustomProperties properties)
}
}

protected void AssignUnityLayer(SuperCustomProperties properties)
protected void AssignUnityLayer(SuperCustomProperties properties, bool defaultInheritFromParent)
{
// Do we have a 'unity:layer' property?
CustomProperty prop;
Expand All @@ -163,7 +163,7 @@ protected void AssignUnityLayer(SuperCustomProperties properties)
properties.gameObject.layer = LayerMask.NameToLayer(layer);
}
}
else
else if (defaultInheritFromParent)
{
// Inherit the layer of our parent
var parent = properties.gameObject.transform.parent;
Expand Down
11 changes: 11 additions & 0 deletions SuperTiled2Unity/Assets/SuperTiled2Unity/Scripts/Editor/Importers/TmxAssetImporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,17 @@ private void DoPrefabReplacements()
// Keep the name from Tiled.
instance.name = so.gameObject.name;

// Transfer and reapply custom property magic on the instantiated prefab.
var soComponent = so.gameObject.GetComponent<SuperCustomProperties>();
if (soComponent != null && !soComponent.m_Properties.IsEmpty())
{
var component = instance.AddComponent<SuperCustomProperties>();
component.m_Properties = new List<CustomProperty>();
component.m_Properties.CombineFromSource(soComponent.m_Properties);
AssignUnityTag(component);
AssignUnityLayer(component, defaultInheritFromParent: false);
}

// Update bookkeeping for later custom property replacement.
goToDestroy.Add(so.gameObject);
objectsById[so.m_Id] = instance;
Expand Down