Skip to content

Always check if entity exists #25

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
ragoune merged 1 commit into from
Mar 18, 2025
Merged

Always check if entity exists #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 22 additions & 8 deletions component.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@ func ConfigureComponent[T ComponentInterface](world *World, conf any) T {
// - the entity has the component
// - an internal error occurs
func AddComponent[T ComponentInterface](world *World, entityId EntityId, component T) error {
componentId := component.GetComponentId()
if world.HasComponents(entityId, componentId) {
return fmt.Errorf("the entity %d already owns the component %d", entityId, componentId)
}

entityRecord, ok := world.entities[entityId]
if !ok {
return fmt.Errorf("entity %v does not exist", entityId)
}

componentId := component.GetComponentId()
if world.hasComponents(entityRecord, componentId) {
return fmt.Errorf("the entity %d already owns the component %d", entityId, componentId)
}

archetype := world.getNextArchetype(entityRecord, world.getComponentsIds(component)...)
err := addComponentsToArchetype1(world, entityRecord, archetype, component)
if err != nil {
Expand Down Expand Up @@ -354,7 +354,12 @@ func addComponents8[A, B, C, D, E, F, G, H ComponentInterface](world *World, ent
// - the componentId is not registered in the World
// - an internal error occurs
func (world *World) AddComponent(entityId EntityId, componentId ComponentId, conf any) error {
if world.HasComponents(entityId, componentId) {
entityRecord, ok := world.entities[entityId]
if !ok {
return fmt.Errorf("entity %v does not exist", entityId)
}

if world.hasComponents(entityRecord, componentId) {
return fmt.Errorf("the entity %d already owns the component %d", entityId, componentId)
}

Expand All @@ -380,12 +385,17 @@ func (world *World) AddComponent(entityId EntityId, componentId ComponentId, con
// - the componentsIds are not registered in the World
// - an internal error occurs
func (world *World) AddComponents(entityId EntityId, componentsIdsConfs ...ComponentIdConf) error {
entityRecord, ok := world.entities[entityId]
if !ok {
return fmt.Errorf("entity %v does not exist", entityId)
}

var componentsIds []ComponentId
for _, componentIdConf := range componentsIdsConfs {
componentsIds = append(componentsIds, componentIdConf.ComponentId)
}

if world.HasComponents(entityId, componentsIds...) {
if world.hasComponents(entityRecord, componentsIds...) {
return fmt.Errorf("the entity %d already owns the components %v", entityId, componentsIds)
}

Expand All @@ -412,7 +422,11 @@ func (world *World) AddComponents(entityId EntityId, componentsIdsConfs ...Compo
func RemoveComponent[T ComponentInterface](world *World, entityId EntityId) error {
var t T
componentId := t.GetComponentId()
entityRecord := world.entities[entityId]

entityRecord, ok := world.entities[entityId]
if !ok {
return fmt.Errorf("entity %v does not exist", entityId)
}

if !world.hasComponents(entityRecord, componentId) {
return fmt.Errorf("the entity %d doesn't own the component %d", entityId, componentId)
Expand Down
Loading