Skip to content

Fixed component init not happening with multiple required #3

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 2 commits into from
Feb 10, 2022
Merged

Fixed component init not happening with multiple required #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84ba9ba
Fixed component init not happening with multiple required
zaucy Feb 10, 2022
056bf54
init on remove
zaucy Feb 10, 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
2 changes: 1 addition & 1 deletion packages/com.seaube.ecsact/Editor/EcsactUnitySyncDebugWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public static EcsactUnitySyncGameObjectPreview CreateInstance() {
protected override void OnEnable() {
base.OnEnable();
scene = EditorSceneManager.NewPreviewScene();
pool = EntityGameObjectPool.CreateInstance();
pool = EntityGameObjectPool.CreateInstance(null!);
pool.targetScene = scene;

if(Camera.main != null) {
Expand Down
42 changes: 33 additions & 9 deletions packages/com.seaube.ecsact/Runtime/EcsactUnitySync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,39 @@ public static IEnumerable<Type> GetInterfaces
}
}

public static IEnumerable<System.Int32> GetInitComponentIds
( System.Type type
)
{
if(onInitComponentsMap.TryGetValue(type, out var compIds)) {
foreach(var compId in compIds) {
yield return compId;
}
}
}

public static IEnumerable<System.Int32> GetRemoveComponentIds
( System.Type type
)
{
if(onInitComponentsMap.TryGetValue(type, out var compIds)) {
foreach(var compId in compIds) {
yield return compId;
}
}
}

public static IEnumerable<System.Int32> GetRequiredComponentIds
( System.Type type
)
{
if(requiredComponentsMap.TryGetValue(type, out var compIds)) {
foreach(var compId in compIds) {
yield return compId;
}
}
}

public static void ClearRegisteredMonoBehaviourTypes() {
knownComponentIds.Clear();
knownComponentTypes.Clear();
Expand Down Expand Up @@ -474,15 +507,6 @@ private static void EndMonoBehaviourRegistration
( Type monoBehaviourType
)
{
var compIds = new ComponentIdsList();
var reqCompIds = new ComponentIdsList();

reqCompIds.UnionWith(requiredComponentsMap[monoBehaviourType]);
compIds.UnionWith(onInitComponentsMap[monoBehaviourType]);
compIds.UnionWith(onUpdateComponentsMap[monoBehaviourType]);
compIds.UnionWith(onRemoveComponentsMap[monoBehaviourType]);


}

private static void RegisterRequiredInterface
Expand Down
112 changes: 83 additions & 29 deletions packages/com.seaube.ecsact/Runtime/EntityGameObjectPool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,42 @@

namespace Ecsact.UnitySync {
public class EntityGameObjectPool : ScriptableObject {
public abstract class EntitySource {
public abstract object GetComponent
( System.Int32 entityId
, System.Int32 componentId
);
public abstract bool HasComponent
( System.Int32 entityId
, System.Int32 componentId
);
}

public static EntityGameObjectPool CreateInstance() {
return (EntityGameObjectPool)ScriptableObject.CreateInstance(
public static EntityGameObjectPool CreateInstance
( EntitySource entitySource
)
{
var pool = (EntityGameObjectPool)ScriptableObject.CreateInstance(
typeof(EntityGameObjectPool)
);

pool._entitySource = entitySource;

return pool;
}

private EntitySource? _entitySource;
private EntitySource entitySource {
get {
UnityEngine.Debug.Assert(
_entitySource != null,
"entitySource is unset. Please use " +
"EntityGameObjectPool.CreateInstance when creating an " +
"EntityGameObjectPool instance.",
this
);
return _entitySource!;
}
}

private List<ComponentIdsList> entityComponentIds;
Expand Down Expand Up @@ -155,11 +186,26 @@ public void InitComponent
if(onInitEntity != null) {
onInitEntity.OnInitEntity(entityId);
}
var initCompIds = UnitySyncMonoBehaviours.GetInitComponentIds(type);
foreach(var initCompId in initCompIds) {
if(initCompId == componentId) continue;
if(!entitySource.HasComponent(entityId, initCompId)) continue;

var initComponent = entitySource.GetComponent(
entityId,
initCompId
);
UnitySyncMonoBehaviours.InvokeOnInit(
newMonoBehaviour,
initCompId,
in initComponent
);
}
}
}

gameObject = gameObject ?? GetEntityGameObject(entityId);

if(gameObject != null) {
UnitySyncMonoBehaviours.InvokeOnInit(
gameObject,
Expand Down Expand Up @@ -188,18 +234,13 @@ public void UpdateComponent
)
{
var gameObject = GetEntityGameObject(entityId);
if(gameObject == null) {
throw new System.ArgumentException(
$"EntityGameObjectPool.UpdateComponent called before " +
$"EntityGameObjectPool.InitComponent. entityId={entityId}"
if(gameObject != null) {
UnitySyncMonoBehaviours.InvokeOnUpdate(
gameObject,
componentId,
in component
);
}

UnitySyncMonoBehaviours.InvokeOnUpdate(
gameObject,
componentId,
in component
);
}

public void RemoveComponent<T>
Expand Down Expand Up @@ -237,6 +278,35 @@ public void RemoveComponent
);

var gameObject = entityGameObjects[entityId]!;

var allMonoBehaviourTypes = UnitySyncMonoBehaviours.GetTypes(
nextCompIds
);

foreach(var type in addedTypes) {
var newMonoBehaviour = (MonoBehaviour)gameObject.AddComponent(type);
IOnInitEntity? onInitEntity = newMonoBehaviour as IOnInitEntity;
if(onInitEntity != null) {
onInitEntity.OnInitEntity(entityId);
}

var initCompIds = UnitySyncMonoBehaviours.GetInitComponentIds(type);
foreach(var initCompId in initCompIds) {
if(initCompId == componentId) continue;
if(!entitySource.HasComponent(entityId, initCompId)) continue;

var initComponent = entitySource.GetComponent(
entityId,
initCompId
);
UnitySyncMonoBehaviours.InvokeOnInit(
newMonoBehaviour,
initCompId,
in initComponent
);
}
}

UnitySyncMonoBehaviours.InvokeOnRemove(
gameObject,
componentId,
Expand All @@ -253,22 +323,6 @@ in component
}
}

foreach(var type in addedTypes) {
var newMonoBehaviour = (MonoBehaviour)gameObject.AddComponent(type);
IOnInitEntity? onInitEntity = newMonoBehaviour as IOnInitEntity;
if(onInitEntity != null) {
onInitEntity.OnInitEntity(entityId);
}
UnitySyncMonoBehaviours.InvokeOnInit(
newMonoBehaviour,
componentId,
in component
);
}

var allMonoBehaviourTypes = UnitySyncMonoBehaviours.GetTypes(
nextCompIds
);
if(!allMonoBehaviourTypes.Any()) {
gameObject.SetActive(false);
gameObject.name = $"entity ({entityId})";
Expand Down