thayol/instructions-clear
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor to state machine

Browse Source
This commit is contained in:
Thayol
2025-02-02 01:08:44 +09:00
parent c8c5c08b4d
commit be682b2813
18 changed files with 379 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/runner.gd
+29 -34
View File
@@ -1,11 +1,11 @@
extends CharacterBody3D
const _gravity := -30.0
@export var player_id := 69:
set(id):
player_id = id
%RunnerInput.set_multiplayer_authority(id)
%Input.set_multiplayer_authority(id)
@export var state_machine: Node
@export_group("Camera")
@export_range(0.0, 1.0) var mouse_sensitivity := 0.2
@@ -13,8 +13,10 @@ const _gravity := -30.0
@export var smooth_camera := false
@export_group("Movement")
@export var move_speed := 8.0
@export var acceleration := 30.0
@export var run_speed := 8.0
@export var walk_speed := 4.0
@export var acceleration := 45.0
@export var air_deceleration := 5.0
@export var rotation_speed := 20.0
@export_group("Client Tweening")
@@ -23,25 +25,26 @@ const _gravity := -30.0
@export var client_smoothing_rotation_speed := 10.0
@onready var _camera_pivot: Node3D = %CameraPivot
@onready var _camera_target: Node3D = %RunnerCameraTarget
@onready var _camera: Node3D = %RunnerCamera
@onready var _skin: Node3D = %RunnerSkin
@onready var _camera_target: Node3D = %CameraTarget
@onready var _camera: Node3D = %Camera
@onready var skin: Node3D = %Skin
var _camera_input_direction := Vector2.ZERO
var _last_direction := Vector3.FORWARD
var _on_ground := false
var camera_input_direction := Vector2.ZERO
var last_direction := Vector3.FORWARD
@export_group("Server variables")
@export var server_position := Vector3.ZERO
@export var server_rotation := Vector3.ZERO
func _ready() -> void:
state_machine.set_subject(self)
if multiplayer.is_server():
return
if multiplayer.get_unique_id() == player_id:
%RunnerCamera.make_current()
%Camera.make_current()
else:
%RunnerCamera.clear_current(false)
%Camera.clear_current(false)
func _input(event: InputEvent) -> void:
if multiplayer.get_unique_id() != player_id:
@@ -54,17 +57,18 @@ func _input(event: InputEvent) -> void:
if event is InputEventMouseMotion:
if Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED:
_camera_input_direction += event.screen_relative * mouse_sensitivity
camera_input_direction += event.screen_relative * mouse_sensitivity
func _physics_process(delta: float) -> void:
state_machine.process_physics(delta)
if multiplayer.get_unique_id() == player_id:
_camera_pivot.rotation.x = clamp(
_camera_pivot.rotation.x - _camera_input_direction.y * delta,
_camera_pivot.rotation.x - camera_input_direction.y * delta,
-PI / 3.0,
PI / 6.0,
)
_camera_pivot.rotation.y -= _camera_input_direction.x * delta
_camera_pivot.rotation.y -= camera_input_direction.x * delta
_camera.global_rotation = _camera_pivot.global_rotation
if smooth_camera:
@@ -72,26 +76,17 @@ func _physics_process(delta: float) -> void:
else:
_camera.global_position = _camera_target.global_position
_camera_input_direction = Vector2.ZERO
camera_input_direction = Vector2.ZERO
if multiplayer.is_server():
var move_direction = Vector3(%RunnerInput.move_direction.x, 0, %RunnerInput.move_direction.y)
var y_velocity := velocity.y
velocity = velocity.move_toward(move_direction * move_speed, acceleration * delta)
velocity.y = y_velocity + (_gravity * delta)
move_and_slide()
if move_direction.length() >= 0.1:
_last_direction = move_direction
var target_angle := Vector3.FORWARD.signed_angle_to(_last_direction, Vector3.UP)
_skin.global_rotation.y = lerp_angle(_skin.rotation.y, target_angle, rotation_speed * delta)
server_position = position
server_rotation = _skin.global_rotation
else:
if not multiplayer.is_server():
if client_smoothing:
position = lerp(position, server_position, client_smoothing_speed * delta)
_skin.global_rotation.y = lerp_angle(_skin.global_rotation.y, server_rotation.y, client_smoothing_rotation_speed * delta)
skin.global_rotation.y = lerp_angle(skin.global_rotation.y, server_rotation.y, client_smoothing_rotation_speed * delta)
else:
position = server_position
_skin.global_rotation.y = server_rotation.y
skin.global_rotation.y = server_rotation.y
if multiplayer.is_server():
server_position = position
server_rotation = skin.global_rotation
#print("Velocity: %s" % velocity)