From 13dc68dc2625a33a9d9ebb7a6e1e3ee160da3255 Mon Sep 17 00:00:00 2001 From: Christian Treffs Date: Thu, 14 Feb 2019 14:59:27 +0100 Subject: [PATCH] Resolve component collision decission --- Sources/FirebladeECS/Nexus+Component.swift | 5 +---- Tests/FirebladeECSTests/NexusTests.swift | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Sources/FirebladeECS/Nexus+Component.swift b/Sources/FirebladeECS/Nexus+Component.swift index 5ed4bd0..a67ca15 100644 --- a/Sources/FirebladeECS/Nexus+Component.swift +++ b/Sources/FirebladeECS/Nexus+Component.swift @@ -28,11 +28,8 @@ public extension Nexus { /// test if component is already assigned guard !has(componentId: componentId, entityIdx: entityIdx) else { - // FIXME: this is still open to debate - // a) we replace the component - // b) we copy the properties - // c) we assert fail report("ComponentAdd collision: \(entityIdx) already has a component \(component)") + assertionFailure("ComponentAdd collision: \(entityIdx) already has a component \(component)") return } diff --git a/Tests/FirebladeECSTests/NexusTests.swift b/Tests/FirebladeECSTests/NexusTests.swift index 133177e..f074b32 100644 --- a/Tests/FirebladeECSTests/NexusTests.swift +++ b/Tests/FirebladeECSTests/NexusTests.swift @@ -70,7 +70,7 @@ class NexusTests: XCTestCase { let p0 = Position(x: 1, y: 2) e0.assign(p0) - e0.assign(p0) + // component collision: e0.assign(p0) XCTAssert(e0.hasComponents) XCTAssert(e0.numComponents == 1)