Busted impulse.

This commit is contained in:
Dustin 2025-05-25 19:17:14 -07:00
parent 8960fddef2
commit e7f08fd351
6 changed files with 10 additions and 10 deletions

View File

@ -10,8 +10,8 @@ extends State
const RELATIVE_DIRECTION = 0
# Movement Speed in Pixels Per Second
export(Vector2) var speed_start
export(Vector2) var speed_end = Vector2(0,1000)
export(Vector2) var speed_start = Vector2(0,0)
export(Vector2) var speed_end = Vector2(0,1000) ## Terminal velocity
export(Vector2) var min_acceleration = Vector2(0,0)
export(Vector2) var acceleration = Vector2(0,280)
export(Vector2) var max_acceleration = Vector2(0,0)

View File

@ -9,10 +9,10 @@ script = ExtResource( 1 )
debug_state = false
timeout_seconds = 0.0
name = "fall"
speed_start = Vector2( 90, 1.36422e-12 )
speed_end = Vector2( 90, 1000 )
speed_start = Vector2( 60, 1.36422e-12 )
speed_end = Vector2( 60, 1000 )
min_acceleration = Vector2( 0, 0 )
acceleration = Vector2( 0, 280 )
acceleration = Vector2( 1.36422e-12, 480 )
max_acceleration = Vector2( 0, 0 )
jerk_factor = Vector2( 1, 1 )
horizontal_speed = 90.0

View File

@ -9,7 +9,7 @@ script = ExtResource( 1 )
debug_state = false
timeout_seconds = 0.0
name = "idle"
speed_start = Vector2( 0, 0 )
speed_start = Vector2( 1.36422e-12, 1.36422e-12 )
speed_end = Vector2( 0, 1000 )
min_acceleration = Vector2( 0, 0 )
acceleration = Vector2( 0, 280 )

View File

@ -12,7 +12,7 @@ name = "jump"
speed_start = Vector2( 90, 200 )
speed_end = Vector2( 90, -8 )
min_acceleration = Vector2( 0, 0 )
acceleration = Vector2( 0, 280 )
acceleration = Vector2( 1.36422e-12, 320 )
max_acceleration = Vector2( 0, 0 )
jerk_factor = Vector2( 1, 1 )
horizontal_speed = 90.0

View File

@ -12,7 +12,7 @@ name = "move"
speed_start = Vector2( 10, 1.36422e-12 )
speed_end = Vector2( 90, 1000 )
min_acceleration = Vector2( 0, 0 )
acceleration = Vector2( 70, 280 )
acceleration = Vector2( 1000, 280 )
max_acceleration = Vector2( 0, 0 )
jerk_factor = Vector2( 1, 1 )
horizontal_speed = 10.0

View File

@ -283,10 +283,10 @@ func resolve_inertia(range_placement :int,
elif inertia != 0.0 and delta_acceleration != 0.0: ## We still have inertia but no difference in movement
var clamped_speed = speed_range.x
if speed_range.x < speed_range.y:
clamped_speed.x = clamp(speed_range.x,0.0,speed_range.y)
clamped_speed = clamp(speed_range.x,0.0,speed_range.y)
## Move back towards the base speed
inertia = move_toward(inertia, clamped_speed.x, delta_acceleration)
inertia = move_toward(inertia, clamped_speed, delta_acceleration)
else:
## inertia is just base speed