improved the hasComponent function

untoldengine · Jan 15, 2025 · 150d550 · 150d550
1 parent 52a7ba7
commit 150d550
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/Sources/UntoldEngine/ECS/Scenes.swift b/Sources/UntoldEngine/ECS/Scenes.swift
@@ -150,8 +150,12 @@ func queryEntitiesWithComponentIds(_ componentTypes: [Int], in scene: Scene) ->
     }.map(\.entityId)
 }
 
-func hasComponent(entity: EntityDesc, componentType: (some Any).Type) -> Bool {
+func hasComponent(entityId: EntityID, componentType: (some Any).Type) -> Bool {
+    let entityIndex: EntityIndex = getEntityIndex(entityId)
+
+    let entityMask = scene.entities[Int(entityIndex)].mask
+
     let componentId = getComponentId(for: componentType)
 
-    return entity.mask.test(componentId)
+    return entityMask.test(componentId)
 }
diff --git a/Tests/UntoldEngineTests/ECSTests.swift b/Tests/UntoldEngineTests/ECSTests.swift
@@ -62,4 +62,17 @@ final class ECSTests: XCTestCase {
         let newVersion = getEntityVersion(newEntityId)
         XCTAssertEqual(newVersion, initialVersion + 1, "Entity version should be incremented")
     }
+
+    func testHasComponent() {
+        let entityId = createEntity()
+
+        _ = scene.assign(to: entityId, component: RenderComponent.self)
+
+        XCTAssertTrue(hasComponent(entityId: entityId, componentType: RenderComponent.self), "Should have component")
+
+        // remove component
+        scene.remove(component: RenderComponent.self, from: entityId)
+
+        XCTAssertFalse(hasComponent(entityId: entityId, componentType: RenderComponent.self), "Should not have component")
+    }
 }