A bit of cleanup

MineInAbyss · Sep 14, 2023 · 56d8c58 · 56d8c58
1 parent aa4eb48
commit 56d8c58
Show file tree

Hide file tree

Showing 20 changed files with 28 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -38,10 +38,10 @@ data class Velocity(var x: Double, var y: Double)
 
 class UpdatePositionSystem : TickingSystem(interval = 20.milliseconds) {
     // Specify all components we want (Geary also supports branched AND/OR/NOT statements for selection)
-    val TargetScope.position by get<Position>()
-    val TargetScope.velocity by get<Velocity>()
+    val Pointer.position by get<Position>()
+    val Pointer.velocity by get<Velocity>()
 
-    override fun TargetScope.tick() {
+    override fun Pointer.tick() {
         // We can access our components like regular variables!
         position.x += velocity.x
         position.y += velocity.y

diff --git a/...on-features/src/main/kotlin/com/mineinabyss/geary/game/systems/ExpiringComponentSystem.kt b/...on-features/src/main/kotlin/com/mineinabyss/geary/game/systems/ExpiringComponentSystem.kt
@@ -1,6 +1,6 @@
 package com.mineinabyss.geary.game.systems
 
-import com.mineinabyss.geary.datatypes.UnsafeAccessors
+import com.mineinabyss.geary.annotations.optin.UnsafeAccessors
 import com.mineinabyss.geary.game.components.Expiry
 import com.mineinabyss.geary.systems.RepeatingSystem
 import com.mineinabyss.geary.systems.accessors.Pointer

diff --git a/...mmonMain/kotlin/com/mineinabyss/geary/prefabs/configuration/systems/ParseChildOnPrefab.kt b/...mmonMain/kotlin/com/mineinabyss/geary/prefabs/configuration/systems/ParseChildOnPrefab.kt
@@ -2,7 +2,7 @@ package com.mineinabyss.geary.prefabs.configuration.systems
 
 import com.mineinabyss.geary.components.EntityName
 import com.mineinabyss.geary.components.relations.NoInherit
-import com.mineinabyss.geary.datatypes.UnsafeAccessors
+import com.mineinabyss.geary.annotations.optin.UnsafeAccessors
 import com.mineinabyss.geary.helpers.addParent
 import com.mineinabyss.geary.helpers.entity
 import com.mineinabyss.geary.prefabs.configuration.components.ChildOnPrefab

diff --git a/...kotlin/com/mineinabyss/geary/prefabs/configuration/systems/ParseRelationWithDataSystem.kt b/...kotlin/com/mineinabyss/geary/prefabs/configuration/systems/ParseRelationWithDataSystem.kt
@@ -1,7 +1,7 @@
 package com.mineinabyss.geary.prefabs.configuration.systems
 
 import com.mineinabyss.geary.datatypes.Records
-import com.mineinabyss.geary.datatypes.UnsafeAccessors
+import com.mineinabyss.geary.annotations.optin.UnsafeAccessors
 import com.mineinabyss.geary.systems.Listener
 import com.mineinabyss.geary.systems.accessors.Pointers
 import com.mineinabyss.geary.systems.accessors.RelationWithData

diff --git a/...efabs/src/commonMain/kotlin/com/mineinabyss/geary/prefabs/systems/InheritPrefabsOnLoad.kt b/...efabs/src/commonMain/kotlin/com/mineinabyss/geary/prefabs/systems/InheritPrefabsOnLoad.kt
@@ -1,7 +1,6 @@
 package com.mineinabyss.geary.prefabs.systems
 
-import com.mineinabyss.geary.datatypes.Records
-import com.mineinabyss.geary.datatypes.UnsafeAccessors
+import com.mineinabyss.geary.annotations.optin.UnsafeAccessors
 import com.mineinabyss.geary.datatypes.family.family
 import com.mineinabyss.geary.prefabs.events.PrefabLoaded
 import com.mineinabyss.geary.prefabs.helpers.inheritPrefabs

diff --git a/...bs/src/commonMain/kotlin/com/mineinabyss/geary/prefabs/systems/TrackPrefabsByKeySystem.kt b/...bs/src/commonMain/kotlin/com/mineinabyss/geary/prefabs/systems/TrackPrefabsByKeySystem.kt
@@ -2,7 +2,7 @@ package com.mineinabyss.geary.prefabs.systems
 
 import com.mineinabyss.geary.components.relations.NoInherit
 import com.mineinabyss.geary.datatypes.Records
-import com.mineinabyss.geary.datatypes.UnsafeAccessors
+import com.mineinabyss.geary.annotations.optin.UnsafeAccessors
 import com.mineinabyss.geary.prefabs.PrefabKey
 import com.mineinabyss.geary.prefabs.prefabs
 import com.mineinabyss.geary.systems.Listener

diff --git a/addons/geary-uuid/src/commonMain/kotlin/com/mineinabyss/geary/uuid/systems/TrackUuidOnAdd.kt b/addons/geary-uuid/src/commonMain/kotlin/com/mineinabyss/geary/uuid/systems/TrackUuidOnAdd.kt
@@ -2,8 +2,7 @@ package com.mineinabyss.geary.uuid.systems
 
 import com.benasher44.uuid.Uuid
 import com.benasher44.uuid.uuid4
-import com.mineinabyss.geary.datatypes.Records
-import com.mineinabyss.geary.datatypes.UnsafeAccessors
+import com.mineinabyss.geary.annotations.optin.UnsafeAccessors
 import com.mineinabyss.geary.systems.GearyListener
 import com.mineinabyss.geary.systems.accessors.Pointers
 

diff --git a/...arks/src/main/kotlin/com/mineinabyss/geary/benchmarks/instantiation/NewEntityBenchmark.kt b/...arks/src/main/kotlin/com/mineinabyss/geary/benchmarks/instantiation/NewEntityBenchmark.kt
@@ -90,5 +90,5 @@ class NewEntityBenchmark {
 
 fun main() {
     geary(TestEngineModule)
-    NewEntityBenchmark().create1MilEntitiesWith6Components()
+    NewEntityBenchmark().create1MilEntitiesWith0Components()
 }
diff --git a/geary-core/src/commonMain/kotlin/com/mineinabyss/geary/annotations/optin/UnsafeAccessors.kt b/geary-core/src/commonMain/kotlin/com/mineinabyss/geary/annotations/optin/UnsafeAccessors.kt
@@ -0,0 +1,8 @@
+package com.mineinabyss.geary.annotations.optin
+
+@RequiresOptIn(
+    level = RequiresOptIn.Level.ERROR,
+    message = "Reading and writing entity data without an accessor reduces speed and does not enforce null safety for accessors." +
+            " Be careful when manually removing components used by other accessors."
+)
+annotation class UnsafeAccessors
diff --git a/geary-core/src/commonMain/kotlin/com/mineinabyss/geary/datatypes/EntityType.kt b/geary-core/src/commonMain/kotlin/com/mineinabyss/geary/datatypes/EntityType.kt
@@ -23,11 +23,6 @@ class EntityType private constructor(
 
     fun indexOf(id: ComponentId): Int {
         return inner.indexOf(id)
-//        for (i in 0 until size) {
-//            if (inner[i] == id) return i
-//        }
-//        return -1
-//        return binarySearch(id).coerceAtLeast(-1)
     }
 
     tailrec fun binarySearch(id: ComponentId, fromIndex: Int = 0, toIndex: Int = size - 1): Int {
@@ -95,11 +90,4 @@ class EntityType private constructor(
 
     override fun toString(): String =
         inner.joinToString(", ", prefix = "[", postfix = "]") { it.readableString() }
-
-    companion object {
-        internal fun fromMutableArray(array: ULongArray): EntityType {
-            array.sort()
-            return EntityType(array)
-        }
-    }
 }
diff --git a/geary-core/src/commonMain/kotlin/com/mineinabyss/geary/datatypes/RecordPointer.kt b/geary-core/src/commonMain/kotlin/com/mineinabyss/geary/datatypes/RecordPointer.kt
@@ -1,15 +1,9 @@
 package com.mineinabyss.geary.datatypes
 
+import com.mineinabyss.geary.annotations.optin.UnsafeAccessors
 import com.mineinabyss.geary.engine.archetypes.Archetype
 import com.mineinabyss.geary.modules.archetypes
 
-@RequiresOptIn(
-    level = RequiresOptIn.Level.ERROR,
-    message = "Reading and writing entity data without an accessor reduces speed and does not enforce null safety for accessors." +
-            " Be careful when manually removing components used by other accessors."
-)
-annotation class UnsafeAccessors
-
 /** A record created in place that delegates to the real entity pointer the first time [entity] gets accessed. */
 class RecordPointer @PublishedApi internal constructor(
     archetype: Archetype,

diff --git a/...e/src/commonMain/kotlin/com/mineinabyss/geary/systems/accessors/type/ComponentAccessor.kt b/...e/src/commonMain/kotlin/com/mineinabyss/geary/systems/accessors/type/ComponentAccessor.kt
@@ -1,7 +1,7 @@
 package com.mineinabyss.geary.systems.accessors.type
 
 import com.mineinabyss.geary.datatypes.ComponentId
-import com.mineinabyss.geary.datatypes.UnsafeAccessors
+import com.mineinabyss.geary.annotations.optin.UnsafeAccessors
 import com.mineinabyss.geary.datatypes.family.Family
 import com.mineinabyss.geary.datatypes.family.family
 import com.mineinabyss.geary.engine.archetypes.Archetype

diff --git a/...monMain/kotlin/com/mineinabyss/geary/systems/accessors/type/ComponentOrDefaultAccessor.kt b/...monMain/kotlin/com/mineinabyss/geary/systems/accessors/type/ComponentOrDefaultAccessor.kt
@@ -1,7 +1,7 @@
 package com.mineinabyss.geary.systems.accessors.type
 
 import com.mineinabyss.geary.datatypes.ComponentId
-import com.mineinabyss.geary.datatypes.UnsafeAccessors
+import com.mineinabyss.geary.annotations.optin.UnsafeAccessors
 import com.mineinabyss.geary.engine.archetypes.Archetype
 import com.mineinabyss.geary.systems.accessors.Pointer
 import com.mineinabyss.geary.systems.accessors.ReadOnlyAccessor

diff --git a/...ommonMain/kotlin/com/mineinabyss/geary/systems/accessors/type/NonNullComponentAccessor.kt b/...ommonMain/kotlin/com/mineinabyss/geary/systems/accessors/type/NonNullComponentAccessor.kt
@@ -1,7 +1,7 @@
 package com.mineinabyss.geary.systems.accessors.type
 
 import com.mineinabyss.geary.datatypes.ComponentId
-import com.mineinabyss.geary.datatypes.UnsafeAccessors
+import com.mineinabyss.geary.annotations.optin.UnsafeAccessors
 import com.mineinabyss.geary.systems.accessors.Pointer
 
 @OptIn(UnsafeAccessors::class)

diff --git a/...e/src/commonMain/kotlin/com/mineinabyss/geary/systems/accessors/type/RelationsAccessor.kt b/...e/src/commonMain/kotlin/com/mineinabyss/geary/systems/accessors/type/RelationsAccessor.kt
@@ -3,7 +3,7 @@ package com.mineinabyss.geary.systems.accessors.type
 import com.mineinabyss.geary.datatypes.ComponentId
 import com.mineinabyss.geary.datatypes.EntityId
 import com.mineinabyss.geary.datatypes.Relation
-import com.mineinabyss.geary.datatypes.UnsafeAccessors
+import com.mineinabyss.geary.annotations.optin.UnsafeAccessors
 import com.mineinabyss.geary.datatypes.family.Family
 import com.mineinabyss.geary.datatypes.family.family
 import com.mineinabyss.geary.engine.archetypes.Archetype

diff --git a/...mmonMain/kotlin/com/mineinabyss/geary/systems/accessors/type/RelationsWithDataAccessor.kt b/...mmonMain/kotlin/com/mineinabyss/geary/systems/accessors/type/RelationsWithDataAccessor.kt
@@ -3,7 +3,7 @@ package com.mineinabyss.geary.systems.accessors.type
 import com.mineinabyss.geary.datatypes.ComponentId
 import com.mineinabyss.geary.datatypes.EntityId
 import com.mineinabyss.geary.datatypes.Relation
-import com.mineinabyss.geary.datatypes.UnsafeAccessors
+import com.mineinabyss.geary.annotations.optin.UnsafeAccessors
 import com.mineinabyss.geary.datatypes.family.Family
 import com.mineinabyss.geary.datatypes.family.family
 import com.mineinabyss.geary.engine.archetypes.Archetype

diff --git a/...monMain/kotlin/com/mineinabyss/geary/systems/accessors/type/RemovableComponentAccessor.kt b/...monMain/kotlin/com/mineinabyss/geary/systems/accessors/type/RemovableComponentAccessor.kt
@@ -1,7 +1,7 @@
 package com.mineinabyss.geary.systems.accessors.type
 
 import com.mineinabyss.geary.datatypes.ComponentId
-import com.mineinabyss.geary.datatypes.UnsafeAccessors
+import com.mineinabyss.geary.annotations.optin.UnsafeAccessors
 import com.mineinabyss.geary.systems.accessors.Pointer
 
 @OptIn(UnsafeAccessors::class)

diff --git a/geary-core/src/jvmTest/kotlin/com/mineinabyss/geary/systems/FamilyMatchingTest.kt b/geary-core/src/jvmTest/kotlin/com/mineinabyss/geary/systems/FamilyMatchingTest.kt
@@ -1,7 +1,7 @@
 package com.mineinabyss.geary.systems
 
 import com.mineinabyss.geary.datatypes.HOLDS_DATA
-import com.mineinabyss.geary.datatypes.UnsafeAccessors
+import com.mineinabyss.geary.annotations.optin.UnsafeAccessors
 import com.mineinabyss.geary.helpers.componentId
 import com.mineinabyss.geary.helpers.entity
 import com.mineinabyss.geary.helpers.tests.GearyTest

diff --git a/...-core/src/jvmTest/kotlin/com/mineinabyss/geary/systems/accessors/RemovableAccessorTest.kt b/...-core/src/jvmTest/kotlin/com/mineinabyss/geary/systems/accessors/RemovableAccessorTest.kt
@@ -1,6 +1,6 @@
 package com.mineinabyss.geary.systems.accessors
 
-import com.mineinabyss.geary.datatypes.UnsafeAccessors
+import com.mineinabyss.geary.annotations.optin.UnsafeAccessors
 import com.mineinabyss.geary.helpers.Comp1
 import com.mineinabyss.geary.helpers.entity
 import com.mineinabyss.geary.helpers.tests.GearyTest

diff --git a/...core/src/jvmTest/kotlin/com/mineinabyss/geary/systems/accessors/UnsafeQueryAccessTests.kt b/...core/src/jvmTest/kotlin/com/mineinabyss/geary/systems/accessors/UnsafeQueryAccessTests.kt
@@ -1,6 +1,6 @@
 package com.mineinabyss.geary.systems.accessors
 
-import com.mineinabyss.geary.datatypes.UnsafeAccessors
+import com.mineinabyss.geary.annotations.optin.UnsafeAccessors
 import com.mineinabyss.geary.helpers.Comp1
 import com.mineinabyss.geary.helpers.entity
 import com.mineinabyss.geary.helpers.tests.GearyTest