Skip to content

Fixed previous state running after next state starts #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Errorbot1122 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fixed previous state running after next state starts #24

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f58789
fix(StateMachine/init): Added `state.OnHeartbeat` to `_stateTrove`
Errorbot1122 Feb 11, 2025
3385cc1
feat(StateMachine/init): Added most `state` methods to `_stateTrove`
Errorbot1122 Feb 11, 2025
7157fb2
style(StateMachine/init): Nitpicked `_trove:Connect` instead of `_tro…
Errorbot1122 Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions src/StateMachine/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ function StateMachine.new(initialState: string, states: {State}, initialData: {[
end

local previousState: State = nil
self._trove:Add(RunService.Heartbeat:Connect(function(deltaTime: number)
self._trove:Connect(RunService.Heartbeat, function(deltaTime: number)
if self._Destroyed then
return
end
Expand All @@ -271,8 +271,8 @@ function StateMachine.new(initialState: string, states: {State}, initialData: {[
return
end

task.spawn(state.OnHeartbeat, state, self:GetData(), deltaTime)
end))
self:_CallMethod(state, false, "OnHeartbeat", self:GetData(), deltaTime)
end)

self._trove:Add(self.StateChanged)
self._trove:Add(self.DataChanged)
Expand Down Expand Up @@ -335,7 +335,7 @@ function StateMachine:ChangeData(index: string, newValue: any): ()
self.Data[index] = newValue

local state: State = self._States[self:GetCurrentState()]
task.spawn(state.OnDataChanged, state, self.Data, index, newValue, oldValue)
self:_CallMethod(state, false, "OnDataChanged", self.Data, index, newValue, oldValue)
self.DataChanged:Fire(self.Data, index, newValue, oldValue)
end

Expand Down Expand Up @@ -525,7 +525,7 @@ function StateMachine:_ChangeState(newState: string): ()
task.defer(function()
self:_CallTransitions(state, "OnEnter", self:GetData())
end)
self._stateTrove:Add(task.defer(state.OnEnter, state, self:GetData()))
self:_CallMethod(state, true, "OnEnter", self:GetData())

self._CurrentState = newState

Expand Down Expand Up @@ -580,6 +580,25 @@ function StateMachine:_CallTransitions(state: State, methodName: string, ...: an
end
end

--[=[
Calls the corresponding method for the given state. (to be cleaned up later)

@param state State
@param methodName string
@param shouldDefer boolean?
@param ... any

@private

@return ()
]=]
function StateMachine:_CallMethod(state: State, shouldDefer: boolean, methodName: string, ...: any): ()
local action = shouldDefer and "defer" or "spawn"

self._stateTrove:Add(
task[action](state[methodName], state, ...)
)
end
export type RobloxStateMachine = typeof(StateMachine)
export type State = State.State
export type Transition = Transition.Transition
Expand Down