Refactoring

[frog-ninja.git] / player / player.gd

diff --git a/player/player.gd b/player/player.gd
index ea89487ec1f06e238059f87e75db972c6089d1d9..5964f1bbb8f7e09b44e35fce54fc2a1d0ab92b13 100644 (file)
--- a/player/player.gd
+++ b/player/player.gd
@@ -3,21 +3,51 @@ class_name Player
 
 
 @export_group("Movement")
 
 
 @export_group("Movement")

-@export var walk_speed := 8.0
+@export var walk_speed := 10.0

 @export var dash_length := 10.0
 @export var dash_length := 10.0

-@export var air_speed := 3.0
-@export var acceleration := 30.0
+@export var acceleration := 20.0

 @export var rotation_speed := 10.0
 @export var idle_timeout := 5.0
 
 @export var rotation_speed := 10.0
 @export var idle_timeout := 5.0
 

-var idle_time := 0.0
+
+var idle_time := 0.00
+var last_movement_direction := rotation

 var floor_normal := Vector3.ZERO
 var ground_slope_input := 0.0
 var floor_normal := Vector3.ZERO
 var ground_slope_input := 0.0

+var state := ""
+
+@onready var input: InputHandler = $Input
+@onready var model: PlayerModel = $Model
+@onready var skin: SkeletonSkin3D = $Visual
+@onready var cameraHandler: PlayerCameraHandler = $CameraHandler
+@onready var camera: Camera3D = $CameraHandler/SpringArm3D/Camera3D
+

 
 

-@onready var _input: InputHandler = %Input
-@onready var _model: PlayerModel = %Model
+func _ready() -> void:
+       skin.assign_skeleton(model.skeleton)

 
 
 func _physics_process(delta: float) -> void:
 
 
 func _physics_process(delta: float) -> void:

-       var input_pkt := _input.get_player_input()
-       _model.update(input_pkt, delta)
+       var input_pkt := input.get_player_input()
+       cameraHandler.update(input_pkt, delta)
+       
+       input_pkt.player_movement_direction = get_movement_relative_to_camera(
+               input_pkt.player_movement_direction
+               )
+       model.update(input_pkt, delta)
+       
+       # TODO: this is bad!!
+       model.skeleton.global_transform = skin.global_transform
+
+
+# Get the XZ input direction based on player's input relative to the camera
+func get_movement_relative_to_camera(movement_direction: Vector2) -> Vector2:
+       if camera:
+               var forward := camera.global_basis.z
+               var right := camera.global_basis.x
+               var dir := (
+                       forward * movement_direction.y + right * movement_direction.x
+                       ).normalized()
+               return Vector2(dir.x, dir.z).normalized()
+       else:
+               return Vector2.ZERO