Archetype: Store relations as EntityType instead of List

MineInAbyss · Dec 9, 2023 · 04799b2 · 04799b2
1 parent 243908c
commit 04799b2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 25 deletions.
diff --git a/...arks/src/main/kotlin/com/mineinabyss/geary/benchmarks/instantiation/ArchetypeBenchmark.kt b/...arks/src/main/kotlin/com/mineinabyss/geary/benchmarks/instantiation/ArchetypeBenchmark.kt
diff --git a/...-core/src/commonMain/kotlin/com/mineinabyss/geary/datatypes/maps/Family2ObjectArrayMap.kt b/...-core/src/commonMain/kotlin/com/mineinabyss/geary/datatypes/maps/Family2ObjectArrayMap.kt
@@ -1,10 +1,10 @@
 package com.mineinabyss.geary.datatypes.maps
 
-import com.mineinabyss.geary.modules.geary
 import com.mineinabyss.geary.datatypes.*
 import com.mineinabyss.geary.datatypes.family.Family
 import com.mineinabyss.geary.helpers.hasRelationKind
 import com.mineinabyss.geary.helpers.hasRelationTarget
+import com.mineinabyss.geary.modules.geary
 
 /**
  * A map of [ComponentId]s to Arrays of objects with the ability to make fast queries based on component IDs.
@@ -32,7 +32,7 @@ internal class Family2ObjectArrayMap<T> {
 
             // See componentMap definition for relations
             if (id.isRelation()) {
-                val relation = id.toRelation()!!
+                val relation = Relation.of(id)
                 set(Relation.of(relation.kind, geary.components.any).id)
                 set(Relation.of(geary.components.any, relation.target).id)
             }

diff --git a/geary-core/src/commonMain/kotlin/com/mineinabyss/geary/engine/archetypes/Archetype.kt b/geary-core/src/commonMain/kotlin/com/mineinabyss/geary/engine/archetypes/Archetype.kt
@@ -16,15 +16,14 @@ import com.mineinabyss.geary.systems.accessors.RelationWithData
  * An example use case: If a query matches an archetype, it will also match all entities inside which
  * gives a large performance boost to system iteration.
  */
-data class Archetype(
+data class Archetype internal constructor(
     val type: EntityType,
     val id: Int
 ) {
     private val records get() = archetypes.records
     private val archetypeProvider get() = archetypes.archetypeProvider
     private val eventRunner get() = archetypes.eventRunner
 
-
     val entities: Sequence<Entity> get() = ids.getEntities()
 
     /** The entity ids in this archetype. Indices are the same as [componentData]'s sub-lists. */
@@ -47,15 +46,15 @@ data class Archetype(
     /** Edges to other archetypes where a single component has been removed. */
     internal val componentRemoveEdges = CompId2ArchetypeMap()
 
-    internal val relations = type.inner.mapNotNull { it.toRelation() }
-    internal val relationsWithData = relations.filter { it.id.holdsData() }
+    internal val relations: EntityType = type.filter { it.isRelation() }
+    internal val relationsWithData: EntityType = relations.filter { it.holdsData() }
 
     fun getRelationsByTarget(target: EntityId): List<Relation> {
-        return relations.filter { it.target.toLong() == target.toLong() }
+        return relations.filter { Relation.of(it).target.toLong() == target.toLong() }.map { Relation.of(it) }
     }
 
     fun getRelationsByKind(kind: ComponentId): List<Relation> {
-        return relations.filter { it.kind.toLong() == kind.toLong() }
+        return relations.filter { Relation.of(it).kind.toLong() == kind.toLong() }.map { Relation.of(it) }
     }
 
     /** The amount of entities stored in this archetype. */
@@ -342,7 +341,7 @@ data class Archetype(
             specificKind && specificTarget -> listOf(Relation.of(kind, target))
             specificTarget -> getRelationsByTarget(target)
             specificKind -> getRelationsByKind(kind)
-            else -> relations
+            else -> relations.map { Relation.of(it) }
         }.run { //TODO this technically doesnt need to run when specificKind is set
             if (kind.hasRole(HOLDS_DATA)) filter { it.hasRole(HOLDS_DATA) } else this
         }.run {

diff --git a/...Main/kotlin/com/mineinabyss/geary/engine/archetypes/operations/ArchetypeReadOperations.kt b/...Main/kotlin/com/mineinabyss/geary/engine/archetypes/operations/ArchetypeReadOperations.kt
@@ -17,9 +17,9 @@ class ArchetypeReadOperations : EntityReadOperations {
     override fun getComponentsFor(entity: Entity): Array<Component> {
         val (archetype, row) = records[entity]
         return archetype.getComponents(row).also { array ->
-            for (relation in archetype.relationsWithData) {
-                val i = archetype.indexOf(relation.id)
-                array[i] = RelationWithData(array[i], null, relation)
+            archetype.relationsWithData.forEach { relation ->
+                val i = archetype.indexOf(relation)
+                array[i] = RelationWithData(array[i], null, Relation.of(relation))
             }
         }
     }