Skip to content

fix: add empty transforms to the list of objects for making instances #903

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
sindharta-tanuwijaya merged 4 commits into from
Apr 6, 2023
Merged

fix: add empty transforms to the list of objects for making instances #903

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a9a5f1
Ensure parent objects are added when an object is created in a hierar…
Mar 30, 2023
699a501
Fix for compiler error in yamato
Mar 31, 2023
29fc485
Refactoring to make the code more complicated
Apr 4, 2023
75a63f9
Using existing method instead of new one
Apr 5, 2023
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
43 changes: 29 additions & 14 deletions Runtime/Scripts/BaseMeshSync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1746,6 +1746,24 @@ private EntityRecord UpdatePointsEntity(PointsData data, MeshSyncPlayerConfig co
return rec;
}

void AddClientObject(string path, out EntityRecord rec, ref Transform trans) {
Comment thread
sindharta-tanuwijaya marked this conversation as resolved.
Outdated
if (m_clientObjects.TryGetValue(path, out rec))
if (rec.go == null) {
m_clientObjects.Remove(path);
rec = null;
}

if (rec == null) {
trans = FilmInternalUtilities.GameObjectUtility.FindOrCreateByPath(m_rootObject, path, false);
rec = new EntityRecord {
go = trans.gameObject,
trans = trans,
recved = true
};
m_clientObjects.Add(path, rec);
}
}

private EntityRecord UpdateTransformEntity(TransformData data, MeshSyncPlayerConfig config) {
string path = data.path;
int hostID = data.hostID;
Expand All @@ -1765,20 +1783,17 @@ private EntityRecord UpdateTransformEntity(TransformData data, MeshSyncPlayerCon
return null;
}
else {
if (m_clientObjects.TryGetValue(path, out rec))
if (rec.go == null) {
m_clientObjects.Remove(path);
rec = null;
}

if (rec == null) {
trans = FilmInternalUtilities.GameObjectUtility.FindOrCreateByPath(m_rootObject, path, false);
rec = new EntityRecord {
go = trans.gameObject,
trans = trans,
recved = true
};
m_clientObjects.Add(path, rec);
AddClientObject(path, out rec, ref trans);

// Ensure any objects that were created as parent of this object are also added to m_clientObjects:
var names = path.Split('/');
Comment thread
sindharta-tanuwijaya marked this conversation as resolved.
Outdated
for (int i = names.Length - 1; i > 1; i--) {
var parentPath = String.Join("/", names.Take(i));
Transform parentTrans = null;
EntityRecord parentRec = null;
AddClientObject(parentPath, out parentRec, ref parentTrans);
if (parentRec.dataType == EntityType.Unknown)
parentRec.dataType = EntityType.Transform;
}
}

Expand Down