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

Refine multiple component creation

This commit is contained in:
Christian Treffs 2020-07-30 21:35:44 +02:00
parent 242f7993d6
commit 96ef53cf6d
No known key found for this signature in database
GPG Key ID: 49A4B4B460BE3ED4
4 changed files with 140 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,31 +22,9 @@ extension Nexus {
}
public final func assign(component: Component, to entity: Entity) {
let componentId: ComponentIdentifier = component.identifier
let entityId: EntityIdentifier = entity.identifier
// test if component is already assigned
guard !has(componentId: componentId, entityId: entityId) else {
delegate?.nexusNonFatalError("ComponentAdd collision: \(entityId) already has a component \(component)")
assertionFailure("ComponentAdd collision: \(entityId) already has a component \(component)")
return
}
// add component instances to uniform component stores
if componentsByType[componentId] == nil {
componentsByType[componentId] = ManagedContiguousArray<Component>()
}
componentsByType[componentId]?.insert(component, at: entityId.id)
// assigns the component id to the entity id
if componentIdsByEntity[entityId] == nil {
componentIdsByEntity[entityId] = Set<ComponentIdentifier>()
}
componentIdsByEntity[entityId]?.insert(componentId) //, at: componentId.hashValue)
update(familyMembership: entityId)
delegate?.nexusEvent(ComponentAdded(component: componentId, toEntity: entity.identifier))
assign(component: component, entityId: entityId)
delegate?.nexusEvent(ComponentAdded(component: component.identifier, toEntity: entity.identifier))
}
public final func assign<C>(component: C, to entity: Entity) where C: Component {

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

@ -17,14 +17,14 @@ extension Nexus {
@discardableResult
public func createEntity(with components: Component...) -> Entity {
let newEntity = createEntity()
components.forEach { newEntity.assign($0) }
assign(components: components, to: newEntity.identifier)
return newEntity
}
@discardableResult
public func createEntity<C>(with components: C) -> Entity where C: Collection, C.Element == Component {
let entity = self.createEntity()
components.forEach { entity.assign($0) }
assign(components: components, to: entity.identifier)
return entity
}

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

@ -1,70 +0,0 @@
//
// Nexus+FamilyUpdate.swift
// FirebladeECS
//
// Created by Christian Treffs on 14.02.19.
//
extension Nexus {
/// will be called on family init
final func onFamilyInit(traits: FamilyTraitSet) {
guard familyMembersByTraits[traits] == nil else {
return
}
familyMembersByTraits[traits] = UnorderedSparseSet<EntityIdentifier, EntityIdentifier.Id>()
update(familyMembership: traits)
}
final func update(familyMembership traits: FamilyTraitSet) {
// FIXME: iterating all entities is costly for many entities
var iter = entityStorage.makeIterator()
while let entityId = iter.next() {
update(membership: traits, for: entityId)
}
}
final func update(familyMembership entityId: EntityIdentifier) {
// FIXME: iterating all families is costly for many families
var iter = familyMembersByTraits.keys.makeIterator()
while let traits = iter.next() {
update(membership: traits, for: entityId)
}
}
final func update(membership traits: FamilyTraitSet, for entityId: EntityIdentifier) {
guard let componentIds = componentIdsByEntity[entityId] else {
// no components - so skip
return
}
let isMember: Bool = self.isMember(entity: entityId, inFamilyWithTraits: traits)
if !exists(entity: entityId) && isMember {
remove(entityWithId: entityId, fromFamilyWithTraits: traits)
return
}
let isMatch: Bool = traits.isMatch(components: componentIds)
switch (isMatch, isMember) {
case (true, false):
add(entityWithId: entityId, toFamilyWithTraits: traits)
delegate?.nexusEvent(FamilyMemberAdded(member: entityId, toFamily: traits))
case (false, true):
remove(entityWithId: entityId, fromFamilyWithTraits: traits)
delegate?.nexusEvent(FamilyMemberRemoved(member: entityId, from: traits))
default:
break
}
}
final func add(entityWithId entityId: EntityIdentifier, toFamilyWithTraits traits: FamilyTraitSet) {
familyMembersByTraits[traits]!.insert(entityId, at: entityId.id)
}
final func remove(entityWithId entityId: EntityIdentifier, fromFamilyWithTraits traits: FamilyTraitSet) {
familyMembersByTraits[traits]!.remove(at: entityId.id)
}
}

136
Sources/FirebladeECS/Nexus+Internal.swift Normal file
View File

@ -0,0 +1,136 @@
//
// Nexus+Internal.swift
// FirebladeECS
//
// Created by Christian Treffs on 14.02.19.
//
extension Nexus {
func assign<C>(components: C, to entityId: EntityIdentifier) where C: Collection, C.Element == Component {
var iter = components.makeIterator()
while let component = iter.next() {
let componentId = component.identifier
// test if component is already assigned
guard !has(componentId: componentId, entityId: entityId) else {
delegate?.nexusNonFatalError("ComponentAdd collision: \(entityId) already has a component \(component)")
assertionFailure("ComponentAdd collision: \(entityId) already has a component \(component)")
return
}
// add component instances to uniform component stores
insertComponentInstance(component, componentId, entityId)
// assigns the component id to the entity id
assign(componentId, entityId)
}
// Update entity membership
update(familyMembership: entityId)
}
func assign(component: Component, entityId: EntityIdentifier) {
let componentId = component.identifier
// test if component is already assigned
guard !has(componentId: componentId, entityId: entityId) else {
delegate?.nexusNonFatalError("ComponentAdd collision: \(entityId) already has a component \(component)")
assertionFailure("ComponentAdd collision: \(entityId) already has a component \(component)")
return
}
// add component instances to uniform component stores
insertComponentInstance(component, componentId, entityId)
// assigns the component id to the entity id
assign(componentId, entityId)
// Update entity membership
update(familyMembership: entityId)
}
func insertComponentInstance(_ component: Component, _ componentId: ComponentIdentifier, _ entityId: EntityIdentifier) {
if componentsByType[componentId] == nil {
componentsByType[componentId] = ManagedContiguousArray<Component>()
}
componentsByType[componentId]?.insert(component, at: entityId.id)
}
func assign(_ componentId: ComponentIdentifier, _ entityId: EntityIdentifier) {
if componentIdsByEntity[entityId] == nil {
componentIdsByEntity[entityId] = Set<ComponentIdentifier>(arrayLiteral: componentId)
} else {
componentIdsByEntity[entityId]?.insert(componentId)
}
}
func assign(_ componentIds: Set<ComponentIdentifier>, _ entityId: EntityIdentifier) {
if componentIdsByEntity[entityId] == nil {
componentIdsByEntity[entityId] = componentIds
} else {
componentIdsByEntity[entityId]?.formUnion(componentIds)
}
}
func update(familyMembership entityId: EntityIdentifier) {
// FIXME: iterating all families is costly for many families
// FIXME: this could be parallelized
var iter = familyMembersByTraits.keys.makeIterator()
while let traits = iter.next() {
update(membership: traits, for: entityId)
}
}
/// will be called on family init
func onFamilyInit(traits: FamilyTraitSet) {
guard familyMembersByTraits[traits] == nil else {
return
}
familyMembersByTraits[traits] = UnorderedSparseSet<EntityIdentifier, EntityIdentifier.Id>()
update(familyMembership: traits)
}
func update(familyMembership traits: FamilyTraitSet) {
// FIXME: iterating all entities is costly for many entities
var iter = entityStorage.makeIterator()
while let entityId = iter.next() {
update(membership: traits, for: entityId)
}
}
func update(membership traits: FamilyTraitSet, for entityId: EntityIdentifier) {
guard let componentIds = componentIdsByEntity[entityId] else {
// no components - so skip
return
}
let isMember: Bool = self.isMember(entity: entityId, inFamilyWithTraits: traits)
if !exists(entity: entityId) && isMember {
remove(entityWithId: entityId, fromFamilyWithTraits: traits)
return
}
let isMatch: Bool = traits.isMatch(components: componentIds)
switch (isMatch, isMember) {
case (true, false):
add(entityWithId: entityId, toFamilyWithTraits: traits)
delegate?.nexusEvent(FamilyMemberAdded(member: entityId, toFamily: traits))
case (false, true):
remove(entityWithId: entityId, fromFamilyWithTraits: traits)
delegate?.nexusEvent(FamilyMemberRemoved(member: entityId, from: traits))
default:
break
}
}
func add(entityWithId entityId: EntityIdentifier, toFamilyWithTraits traits: FamilyTraitSet) {
familyMembersByTraits[traits]!.insert(entityId, at: entityId.id)
}
func remove(entityWithId entityId: EntityIdentifier, fromFamilyWithTraits traits: FamilyTraitSet) {
familyMembersByTraits[traits]!.remove(at: entityId.id)
}
}