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

update changeState

This commit is contained in:
Igor Kravchenko 2020-10-01 20:25:49 +03:00
parent 4995b16c43
commit 1aae190fc1
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Sources/FirebladeECS/FSM.swift
View File

@ -203,14 +203,13 @@ public class StateComponentMapping {
/// Used internally, the initializer creates a component mapping. The constructor /// Used internally, the initializer creates a component mapping. The constructor
/// creates a ComponentTypeProvider as the default mapping, which will be replaced /// creates a ComponentTypeProvider as the default mapping, which will be replaced
/// by more specific mappings if other methods are called. /// by more specific mappings if other methods are called.
/// - Parameter creatingState: The EntityState that the mapping will belong to /// - Parameter creatingState: The EntityState that the mapping will belong to
/// - Parameter type: The component type for the mapping /// - Parameter type: The component type for the mapping
internal init(creatingState: EntityState, type: ComponentInitializable.Type) { internal init(creatingState: EntityState, type: ComponentInitializable.Type) {
self.creatingState = creatingState self.creatingState = creatingState
componentType = type componentType = type
provider = ComponentTypeProvider(type: type) provider = ComponentTypeProvider(type: type)
creatingState.providers[componentType.identifier] = provider setProvider(provider)
} }
/// Creates a mapping for the component type to a specific component instance. A /// Creates a mapping for the component type to a specific component instance. A
@ -286,7 +285,6 @@ public class StateComponentMapping {
/// This is a state machine for an entity. The state machine manages a set of states, /// This is a state machine for an entity. The state machine manages a set of states,
/// each of which has a set of component providers. When the state machine changes the state, it removes /// each of which has a set of component providers. When the state machine changes the state, it removes
/// components associated with the previous state and adds components associated with the new state. /// components associated with the previous state and adds components associated with the new state.
/// - Parameter StateName: Generic hashable state name type /// - Parameter StateName: Generic hashable state name type
public class EntityStateMachine<StateName: Hashable> { public class EntityStateMachine<StateName: Hashable> {
private var states: [StateName: EntityState] private var states: [StateName: EntityState]
@ -356,11 +354,8 @@ public class EntityStateMachine<StateName: Hashable> {
toAdd = newState.providers toAdd = newState.providers
} }
for (identifier, _) in toAdd { for (_, provider) in toAdd {
guard let component = toAdd[identifier]?.getComponent() else { entity.assign(provider.getComponent())
continue
}
entity.assign(component)
} }
currentState = newState currentState = newState
} }