Merge branch 'develop' into feature/serialization
This commit is contained in:
Christian Treffs
commit
6b128a9923
13
README.md
13
README.md
|
|
@ -1,12 +1,11 @@
|
|||
# Fireblade ECS (Entity-Component System)
|
||||
[](https://github.com/fireblade-engine/ecs/actions?query=workflow%3ACI)
|
||||
[](LICENSE)
|
||||
[](https://swift.org)
|
||||
[](#)
|
||||
[](#)
|
||||
[](https://github.com/swiftwasm/swift#swiftwasm)
|
||||
[](https://github.com/fireblade-engine/ecs/actions?query=workflow%3ACI)
|
||||
[](https://codecov.io/gh/fireblade-engine/ecs)
|
||||
[](https://github.com/fireblade-engine/ecs/wiki)
|
||||
[](https://github.com/fireblade-engine/ecs/wiki)
|
||||
[](https://swiftpackageindex.com/fireblade-engine/ecs)
|
||||
[](https://swiftpackageindex.com/fireblade-engine/ecs)
|
||||
[](https://github.com/swiftwasm/swift#swiftwasm)
|
||||
|
||||
This is a **dependency free**, **lightweight**, **fast** and **easy to use** [Entity-Component System](https://en.wikipedia.org/wiki/Entity_component_system) implementation in Swift. It is developed and maintained as part of the [Fireblade Game Engine project](https://github.com/fireblade-engine).
|
||||
|
||||
|
|
@ -36,7 +35,7 @@ import PackageDescription
|
|||
let package = Package(
|
||||
name: "YourPackageName",
|
||||
dependencies: [
|
||||
.package(url: "https://github.com/fireblade-engine/ecs.git", from: "0.15.4")
|
||||
.package(url: "https://github.com/fireblade-engine/ecs.git", from: "0.16.0")
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
|
|
|
|||
|
|
@ -65,12 +65,11 @@ public struct LinearIncrementingEntityIdGenerator: EntityIdentifierGenerator {
|
|||
|
||||
@usableFromInline
|
||||
func nextId() -> EntityIdentifier {
|
||||
if stack.count == 1 {
|
||||
defer { stack[0] += 1 }
|
||||
return EntityIdentifier(stack[0])
|
||||
} else {
|
||||
guard stack.count == 1 else {
|
||||
return EntityIdentifier(stack.removeLast())
|
||||
}
|
||||
defer { stack[0] += 1 }
|
||||
return EntityIdentifier(stack[0])
|
||||
}
|
||||
|
||||
@usableFromInline
|
||||
|
|
|
|||
|
|
@ -45,15 +45,6 @@ public func hash(combine seed: Int, _ value: Int) -> Int {
|
|||
return Int(bitPattern: uSeed)
|
||||
}
|
||||
|
||||
/// Calculates the combined hash value of the elements. This implementation is based on boost::hash_range.
|
||||
/// Is sensitive to the order of the elements.
|
||||
/// - Parameter hashValues: sequence of hash values to combine.
|
||||
/// - Returns: combined hash value.
|
||||
public func hash<S: Sequence>(combine hashValues: S) -> Int where S.Element == Int {
|
||||
/// http://www.boost.org/doc/libs/1_65_1/doc/html/hash/reference.html#boost.hash_range_idp517643120
|
||||
hashValues.reduce(0) { hash(combine: $0, $1) }
|
||||
}
|
||||
|
||||
/// Calculates the combined hash value of the elements. This implementation is based on boost::hash_range.
|
||||
/// Is sensitive to the order of the elements.
|
||||
/// - Parameter hashValues: sequence of hash values to combine.
|
||||
|
|
|
|||
|
|
@ -59,10 +59,6 @@ extension Nexus {
|
|||
componentIdsByEntity[entityId]!.insert(componentId)
|
||||
}
|
||||
|
||||
func assign(_ componentIds: Set<ComponentIdentifier>, _ entityId: EntityIdentifier) {
|
||||
componentIdsByEntity[entityId]!.formUnion(componentIds)
|
||||
}
|
||||
|
||||
func update(familyMembership entityId: EntityIdentifier) {
|
||||
// FIXME: iterating all families is costly for many families
|
||||
// FIXME: this could be parallelized
|
||||
|
|
|
|||
|
|
@ -75,10 +75,7 @@ public struct UnorderedSparseSet<Element, Key: Hashable & Codable> {
|
|||
return nil
|
||||
}
|
||||
let entry = self.dense[denseIndex]
|
||||
guard entry.key == key else {
|
||||
return nil
|
||||
}
|
||||
|
||||
assert(entry.key == key, "entry.key and findIndex(at: key) must be equal!")
|
||||
return entry.element
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,12 @@ final class EntityIdGenTests: XCTestCase {
|
|||
XCTAssertEqual(gen.nextId(), 0)
|
||||
}
|
||||
|
||||
func testGeneratorWithDefaultEmptyCollection() {
|
||||
gen = DefaultEntityIdGenerator(startProviding: [])
|
||||
XCTAssertEqual(gen.nextId(), 0)
|
||||
XCTAssertEqual(gen.nextId(), 1)
|
||||
}
|
||||
|
||||
func testLinearIncrement() {
|
||||
for i in 0..<1_000_000 {
|
||||
XCTAssertEqual(gen.nextId(), EntityIdentifier(EntityIdentifier.Identifier(i)))
|
||||
|
|
|
|||
|
|
@ -35,6 +35,8 @@ class FamilyTests: XCTestCase {
|
|||
XCTAssertEqual(nexus.numFamilies, 1)
|
||||
XCTAssertEqual(nexus.numComponents, 0)
|
||||
XCTAssertEqual(nexus.numEntities, 0)
|
||||
XCTAssertFalse(family.traits.description.isEmpty)
|
||||
XCTAssertFalse(family.traits.debugDescription.isEmpty)
|
||||
|
||||
let traits = FamilyTraitSet(requiresAll: [Position.self], excludesAll: [Name.self])
|
||||
XCTAssertEqual(family.traits, traits)
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ class NexusTests: XCTestCase {
|
|||
|
||||
XCTAssert(e1.identifier.id == 1)
|
||||
XCTAssert(nexus.numEntities == 2)
|
||||
XCTAssertFalse(nexus.debugDescription.isEmpty)
|
||||
}
|
||||
|
||||
func testEntityDestroy() {
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ extension EntityIdGenTests {
|
|||
("testGenerateWithInitialIds", testGenerateWithInitialIds),
|
||||
("testGeneratorDefaultInit", testGeneratorDefaultInit),
|
||||
("testGeneratorMarkUnused", testGeneratorMarkUnused),
|
||||
("testGeneratorWithDefaultEmptyCollection", testGeneratorWithDefaultEmptyCollection),
|
||||
("testLinearIncrement", testLinearIncrement)
|
||||
]
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue