mirror
/
fireblade-ecs
mirror of https://github.com/fireblade-engine/ecs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleanup typealiases

This commit is contained in:
Christian Treffs 2019-08-20 16:49:56 +02:00
parent b62cf7464b
commit d68b935e2e
8 changed files with 32 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Sources/FirebladeECS/FamilyTraitSet.swift
View File

@ -6,14 +6,14 @@
//
public struct FamilyTraitSet {
public let requiresAll: ComponentSet
public let excludesAll: ComponentSet
public let requiresAll: Set<ComponentIdentifier>
public let excludesAll: Set<ComponentIdentifier>
public let setHash: Int
public init(requiresAll: [Component.Type], excludesAll: [Component.Type]) {
let requiresAll = ComponentSet(requiresAll.map { $0.identifier })
let excludesAll = ComponentSet(excludesAll.map { $0.identifier })
let requiresAll = Set<ComponentIdentifier>(requiresAll.map { $0.identifier })
let excludesAll = Set<ComponentIdentifier>(excludesAll.map { $0.identifier })
let valid: Bool = FamilyTraitSet.isValid(requiresAll: requiresAll, excludesAll: excludesAll)
precondition(valid, "invalid family trait created - requiresAll: \(requiresAll), excludesAll: \(excludesAll)")
@ -25,23 +25,23 @@ public struct FamilyTraitSet {
// MARK: - match
@inlinable
public func isMatch(components: ComponentSet) -> Bool {
public func isMatch(components: Set<ComponentIdentifier>) -> Bool {
return hasAll(components) && hasNone(components)
}
@inlinable
public func hasAll(_ components: ComponentSet) -> Bool {
public func hasAll(_ components: Set<ComponentIdentifier>) -> Bool {
return requiresAll.isSubset(of: components)
}
@inlinable
public func hasNone(_ components: ComponentSet) -> Bool {
public func hasNone(_ components: Set<ComponentIdentifier>) -> Bool {
return excludesAll.isDisjoint(with: components)
}
// MARK: - valid
@inlinable
public static func isValid(requiresAll: ComponentSet, excludesAll: ComponentSet) -> Bool {
public static func isValid(requiresAll: Set<ComponentIdentifier>, excludesAll: Set<ComponentIdentifier>) -> Bool {
return !requiresAll.isEmpty &&
requiresAll.isDisjoint(with: excludesAll)
}

6
Sources/FirebladeECS/Hashing.swift
View File

@ -13,6 +13,12 @@ private let kFibA: UInt = 0x9e3779b9 // = 2654435769 aka Fibonacci Hash a value
#error("unsupported architecture")
#endif
/// entity id ^ component identifier hash
public typealias EntityComponentHash = Int
/// component object identifier hash value
public typealias ComponentTypeHash = Int
// MARK: - hash combine
/// Calculates the combined hash of two values. This implementation is based on boost::hash_combine.
/// Will always produce the same result for the same combination of seed and value during the single run of a program.

14
Sources/FirebladeECS/Nexus+Component.swift
View File

@ -11,7 +11,7 @@ public extension Nexus {
}
final func has(componentId: ComponentIdentifier, entityId: EntityIdentifier) -> Bool {
guard let uniforms: UniformComponents = componentsByType[componentId] else {
guard let uniforms = componentsByType[componentId] else {
return false
}
return uniforms.contains(entityId.index)
@ -34,13 +34,13 @@ public extension Nexus {
// add component instances to uniform component stores
if componentsByType[componentId] == nil {
componentsByType[componentId] = UniformComponents()
componentsByType[componentId] = ManagedContiguousArray<Component>()
}
componentsByType[componentId]?.insert(component, at: entityId.index)
// assigns the component id to the entity id
if componentIdsByEntity[entityId] == nil {
componentIdsByEntity[entityId] = ComponentSet()
componentIdsByEntity[entityId] = Set<ComponentIdentifier>()
}
componentIdsByEntity[entityId]?.insert(componentId) //, at: componentId.hashValue)
@ -54,14 +54,14 @@ public extension Nexus {
}
final func get(component componentId: ComponentIdentifier, for entityId: EntityIdentifier) -> Component? {
guard let uniformComponents: UniformComponents = componentsByType[componentId] else {
guard let uniformComponents = componentsByType[componentId] else {
return nil
}
return uniformComponents.get(at: entityId.index)
}
final func get(unsafeComponent componentId: ComponentIdentifier, for entityId: EntityIdentifier) -> Component {
let uniformComponents: UniformComponents = componentsByType[componentId].unsafelyUnwrapped
let uniformComponents = componentsByType[componentId].unsafelyUnwrapped
return uniformComponents.get(unsafeAt: entityId.index)
}
@ -76,7 +76,7 @@ public extension Nexus {
return unsafeDowncast(component, to: C.self)
}
final func get(components entityId: EntityIdentifier) -> ComponentSet? {
final func get(components entityId: EntityIdentifier) -> Set<ComponentIdentifier>? {
return componentIdsByEntity[entityId]
}
@ -110,7 +110,7 @@ public extension Nexus {
private extension Nexus {
final func get<C>(componentId: ComponentIdentifier, entityId: EntityIdentifier) -> C? where C: Component {
guard let uniformComponents: UniformComponents = componentsByType[componentId] else {
guard let uniformComponents = componentsByType[componentId] else {
return nil
}
return uniformComponents.get(at: entityId.index) as? C

4
Sources/FirebladeECS/Nexus+Family.swift
View File

@ -19,8 +19,8 @@ public extension Nexus {
return traits.isMatch(components: componentIds)
}
func members(withFamilyTraits traits: FamilyTraitSet) -> UniformEntityIdentifiers {
return familyMembersByTraits[traits] ?? UniformEntityIdentifiers()
func members(withFamilyTraits traits: FamilyTraitSet) -> UnorderedSparseSet<EntityIdentifier> {
return familyMembersByTraits[traits] ?? UnorderedSparseSet<EntityIdentifier>()
}
func isMember(_ entity: Entity, in family: FamilyTraitSet) -> Bool {

2
Sources/FirebladeECS/Nexus+FamilyUpdate.swift
View File

@ -12,7 +12,7 @@ extension Nexus {
return
}
familyMembersByTraits[traits] = UniformEntityIdentifiers()
familyMembersByTraits[traits] = UnorderedSparseSet<EntityIdentifier>()
update(familyMembership: traits)
}

11
Sources/FirebladeECS/Nexus.swift
View File

@ -10,24 +10,23 @@ public class Nexus {
/// - Index: index value matching entity identifier shifted to Int
/// - Value: each element is a entity instance
@usableFromInline internal var entityStorage: Entities
@usableFromInline var entityStorage: UnorderedSparseSet<Entity>
/// - Key: component type identifier
/// - Value: each element is a component instance of the same type (uniform). New component instances are appended.
@usableFromInline internal var componentsByType: [ComponentIdentifier: UniformComponents]
@usableFromInline internal var componentsByType: [ComponentIdentifier: ManagedContiguousArray<Component>]
/// - Key: entity id as index
/// - Value: each element is a component identifier associated with this entity
@usableFromInline internal var componentIdsByEntity: [EntityIdentifier: ComponentSet]
@usableFromInline internal var componentIdsByEntity: [EntityIdentifier: Set<ComponentIdentifier>]
/// - Values: entity ids that are currently not used
@usableFromInline internal var freeEntities: ContiguousArray<EntityIdentifier>
//var familiesByTraitHash: [FamilyTraitSetHash: Family]
@usableFromInline internal var familyMembersByTraits: [FamilyTraitSet: UniformEntityIdentifiers]
@usableFromInline internal var familyMembersByTraits: [FamilyTraitSet: UnorderedSparseSet<EntityIdentifier>]
public init() {
entityStorage = Entities()
entityStorage = UnorderedSparseSet<Entity>()
componentsByType = [:]
componentIdsByEntity = [:]
freeEntities = ContiguousArray<EntityIdentifier>()

21
Sources/FirebladeECS/Typealiases.swift
View File

@ -1,21 +0,0 @@
//
// Typealiases.swift
//
//
// Created by Christian Treffs on 20.08.19.
//
/// entity id ^ component identifier hash
public typealias EntityComponentHash = Int
public typealias ComponentIdsByEntityIndex = Int
public typealias ComponentTypeHash = Int // component object identifier hash value
public typealias UniformComponents = ManagedContiguousArray<Component>
public typealias UniformEntityIdentifiers = UnorderedSparseSet<EntityIdentifier>
public typealias ComponentIdentifiers = ContiguousArray<ComponentIdentifier>
public typealias ComponentSet = Set<ComponentIdentifier>
public typealias Entities = UnorderedSparseSet<Entity>
public typealias EntityIdSet = Set<EntityIdentifier>
public typealias FamilyTraitSetHash = Int
public typealias TraitEntityIdHash = Int
public typealias EntityIdInFamilyIndex = Int
public typealias TraitEntityIdHashSet = [TraitEntityIdHash: EntityIdInFamilyIndex]

6
Sources/FirebladeECS/TypedFamily.swift
View File

@ -19,7 +19,7 @@ public protocol TypedFamilyProtocol: Equatable, Sequence {
var count: Int { get }
var isEmpty: Bool { get }
var memberIds: UniformEntityIdentifiers { get }
var memberIds: UnorderedSparseSet<EntityIdentifier> { get }
var entities: FamilyEntities { get }
var entityAndComponents: EntityComponentsSequence { get }
@ -38,7 +38,7 @@ public extension TypedFamilyProtocol {
return nexus.isMember(entity, in: traits)
}
@inlinable var memberIds: UniformEntityIdentifiers {
@inlinable var memberIds: UnorderedSparseSet<EntityIdentifier> {
return nexus.members(withFamilyTraits: traits)
}
@ -79,7 +79,7 @@ public struct FamilyEntities: LazySequenceProtocol, IteratorProtocol {
public let nexus: Nexus
public var memberIdsIterator: UnorderedSparseSetIterator<EntityIdentifier>
public init(_ nexus: Nexus, _ memberIds: UniformEntityIdentifiers) {
public init(_ nexus: Nexus, _ memberIds: UnorderedSparseSet<EntityIdentifier>) {
self.nexus = nexus
memberIdsIterator = memberIds.makeIterator()
}