Skip to content

Commit 45e3c17

Browse files
committed
refactor: rename acceleration inputs to throttle
1 parent a39d66b commit 45e3c17

4 files changed

Lines changed: 19 additions & 19 deletions

File tree

src/landvehicle/src/Client/Classes/Controllers/WheelVehicleDigitalControllerClient.luau

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export type WheelVehicleDigitalController = typeof(setmetatable(
4949
_serviceBag: ServiceBag.ServiceBag,
5050
_suspensionController: WheelVehicleSuspensionControllerClient.SuspensionController,
5151
_steeringSpring: Spring.Spring<number>,
52-
_accelerationSpring: Spring.Spring<number>,
52+
_throttleSpring: Spring.Spring<number>,
5353
_brakeSpring: Spring.Spring<number>,
5454
_maid: Maid.Maid,
5555
_vehicleObj: Model,
@@ -74,15 +74,15 @@ function WheelVehicleDigitalController.new(
7474
self._suspensionController = suspensionController
7575
self._vehicleObj = vehicleObj
7676
self._steeringSpring = Spring.new(0)
77-
self._accelerationSpring = Spring.new(0)
77+
self._throttleSpring = Spring.new(0)
7878
self._brakeSpring = Spring.new(0)
7979

8080
-- TODO: Spring damper and speed to be configurable.
8181
self._steeringSpring.Damper = 1
8282
self._steeringSpring.Speed = 6
8383

84-
self._accelerationSpring.Damper = 1
85-
self._accelerationSpring.Speed = 11
84+
self._throttleSpring.Damper = 1
85+
self._throttleSpring.Speed = 11
8686

8787
self._brakeSpring.Damper = 1
8888
self._brakeSpring.Speed = 11
@@ -135,25 +135,25 @@ function WheelVehicleDigitalController.new(
135135
end)
136136
end))
137137

138-
local accelerateKeyMapList = self._driverInputKeyMap:GetInputKeyMapList("ACCELERATE")
139-
self._maid:GiveTask(accelerateKeyMapList:ObserveInputEnumsList():Subscribe(function(...)
140-
ContextActionService:BindAction(accelerateKeyMapList:GetBindingName(), function(_, inputState, _)
138+
local throttleKeyMapList = self._driverInputKeyMap:GetInputKeyMapList("THROTTLE")
139+
self._maid:GiveTask(throttleKeyMapList:ObserveInputEnumsList():Subscribe(function(...)
140+
ContextActionService:BindAction(throttleKeyMapList:GetBindingName(), function(_, inputState, _)
141141
if inputState == Enum.UserInputState.Begin then
142-
self._accelerationSpring.Target = 1
142+
self._throttleSpring.Target = 1
143143
else
144-
self._accelerationSpring.Target = 0
144+
self._throttleSpring.Target = 0
145145
end
146146

147147
assignSpringUpdate(
148-
self._accelerationSpring,
148+
self._throttleSpring,
149149
self._maid,
150-
"acceleration",
150+
"throttle",
151151
self._suspensionController,
152-
"accelerationInput"
152+
"throttleInput"
153153
)
154154
end, false, unpack(...))
155155
self._maid:GiveTask(function()
156-
ContextActionService:UnbindAction(accelerateKeyMapList:GetBindingName())
156+
ContextActionService:UnbindAction(throttleKeyMapList:GetBindingName())
157157
end)
158158
end))
159159

src/landvehicle/src/Client/Classes/Suspensions/WheelVehicleSuspensionControllerClient.luau

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export type SuspensionController = typeof(setmetatable(
3535
_minLongitudinalOffset: number,
3636
wheelBase: number,
3737
steeringInput: number,
38-
accelerationInput: number,
38+
throttleInput: number,
3939
brakeInput: number,
4040
turningRadius: number,
4141
maxSteeringAngle: number, -- radians
@@ -50,7 +50,7 @@ function SuspensionController.new(vehicleObj: Model, suspensions: { WheelVehicle
5050
local self: SuspensionController = setmetatable(BaseObject.new(vehicleObj), SuspensionController)
5151

5252
self.steeringInput = 0
53-
self.accelerationInput = 0
53+
self.throttleInput = 0
5454
self.brakeInput = 0
5555

5656
self.maxSteeringAngle = 0
@@ -128,7 +128,7 @@ function SuspensionController.UpdateStepped(self: SuspensionController, deltaTim
128128
if suspension.wheel.angularVelocity > 0 then
129129
brakeInputScaled *= 3
130130
end
131-
suspension.wheel.baseTorque = (self.accelerationInput - brakeInputScaled) * 300
131+
suspension.wheel.baseTorque = (self.throttleInput - brakeInputScaled) * 300
132132
end
133133
end
134134

src/landvehicle/src/Client/Classes/WheelVehicleSeatClient.luau

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ function Seat._createProximityPrompt(self: Seat)
174174

175175
task.defer(function()
176176
self._suspensionController.steeringInput = 0
177-
self._suspensionController.accelerationInput = 0
177+
self._suspensionController.throttleInput = 0
178178
self._suspensionController.brakeInput = 0
179179
end)
180180
end)

src/landvehicle/src/Shared/InputKeyMaps/WheelVehicleDriverInputKeyMap.luau

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ return InputKeyMapListProvider.new(script.Name, function(self)
2727
rebindable = true,
2828
}))
2929

30-
self:Add(InputKeyMapList.new("ACCELERATE", {
30+
self:Add(InputKeyMapList.new("THROTTLE", {
3131
InputKeyMap.new(InputModeTypes.KeyboardAndMouse, { Enum.KeyCode.W }),
3232
InputKeyMap.new(InputModeTypes.Touch, { SlottedTouchButtonUtils.createSlottedTouchButton("primary3") }),
3333
}, {
34-
bindingName = "Accelerate",
34+
bindingName = "Throttle",
3535
rebindable = true,
3636
}))
3737

0 commit comments

Comments
 (0)