Tweak mapper methods (#427)

Author: mlange-42

ecs/internal/generate/maps.go.template

@@ -182,7 +182,7 @@ func (m *Map{{.}}{{$genericsShort}}) NewBatchFn(count int, fn func(Entity, {{$fn
 //
 // ⚠️ Do not store the obtained pointers outside of the current context!
 func (m *Map{{.}}{{$genericsShort}}) Get(entity Entity) {{$returnTypes}} {
-	if !m.world.Alive(entity) {
+	if !m.world.storage.entityPool.Alive(entity) {
 		panic("can't get components of a dead entity")
 	}
 	index := &m.world.storage.entities[entity.id]
@@ -211,9 +211,9 @@ func (m *Map{{.}}{{$genericsShort}}) HasAll(entity Entity) bool {
 	if !m.world.Alive(entity) {
 		panic("can't check components of a dead entity")
 	}
-	index := m.world.storage.entities[entity.id]
+	table := m.world.storage.entities[entity.id].table
 	return {{range $i, $v := $upper}}{{if $i}} &&
-		{{end}}m.storage{{$v}}.columns[index.table] != nil{{end}}
+		{{end}}m.storage{{$v}}.columns[table] != nil{{end}}
 }
 
 // Add the mapped components to the given entity.
@@ -339,7 +339,7 @@ func (m *Map{{.}}{{$genericsShort}}) RemoveBatch(batch Batch, fn func(entity Ent
 
 // GetRelation returns the relation target of an entity for the component at the given index.
 func (m *Map{{.}}{{$genericsShort}}) GetRelation(entity Entity, index int) Entity {
-	if !m.world.Alive(entity) {
+	if !m.world.storage.entityPool.Alive(entity) {
 		panic("can't get entity relation target for a dead entity")
 	}
 	return m.GetRelationUnchecked(entity, index)

ecs/map.go

@@ -140,7 +140,7 @@ func (m *Map[T]) NewBatchFn(count int, fn func(Entity, *T), target ...Entity) {
 //
 // ⚠️ Do not store the obtained pointer outside of the current context!
 func (m *Map[T]) Get(entity Entity) *T {
-	if !m.world.Alive(entity) {
+	if !m.world.storage.entityPool.Alive(entity) {
 		panic("can't get a component of a dead entity")
 	}
 	index := &m.world.storage.entities[entity.id]
@@ -164,7 +164,7 @@ func (m *Map[T]) GetUnchecked(entity Entity) *T {
 // Using [Map.Get] and checking for nil pointer may be faster
 // than calling [Map.Has] and [Map.Get] subsequently.
 func (m *Map[T]) Has(entity Entity) bool {
-	if !m.world.Alive(entity) {
+	if !m.world.storage.entityPool.Alive(entity) {
 		panic("can't get a component of a dead entity")
 	}
 	return m.HasUnchecked(entity)
@@ -174,8 +174,7 @@ func (m *Map[T]) Has(entity Entity) bool {
 // In contrast to [Map.Has], it does not check whether the entity is alive.
 // Can be used as an optimization when it is certain that the entity is alive.
 func (m *Map[T]) HasUnchecked(entity Entity) bool {
-	index := m.world.storage.entities[entity.id]
-	return m.storage.columns[index.table] != nil
+	return m.storage.columns[m.world.storage.entities[entity.id].table] != nil
 }
 
 // Add the mapped component to the given entity.
@@ -196,7 +195,7 @@ func (m *Map[T]) Add(entity Entity, comp *T, target ...Entity) {
 //
 // ⚠️ Do not store the obtained pointer outside of the current context!
 func (m *Map[T]) AddFn(entity Entity, fn func(*T), target ...Entity) {
-	if !m.world.Alive(entity) {
+	if !m.world.storage.entityPool.Alive(entity) {
 		panic("can't add a component to a dead entity")
 	}
 	m.relations = relationEntities(target).ToRelation(m.world, m.id, m.relations)
@@ -220,7 +219,7 @@ func (m *Map[T]) AddFn(entity Entity, fn func(*T), target ...Entity) {
 //
 // This is not a component operation, so it can be performed on a locked world.
 func (m *Map[T]) Set(entity Entity, comp *T) {
-	if !m.world.Alive(entity) {
+	if !m.world.storage.entityPool.Alive(entity) {
 		panic("can't set component of a dead entity")
 	}
 	m.world.storage.checkHasComponent(entity, m.ids[0])
@@ -274,7 +273,7 @@ func (m *Map[T]) AddBatchFn(batch Batch, fn func(Entity, *T), target ...Entity)
 
 // Remove the mapped component from the given entity.
 func (m *Map[T]) Remove(entity Entity) {
-	if !m.world.Alive(entity) {
+	if !m.world.storage.entityPool.Alive(entity) {
 		panic("can't remove a component from a dead entity")
 	}
 	m.world.remove(entity, m.ids[:])