aleajactaest/bazar_alea
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/bazar_alea.git synced 2024-11-25 16:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

reactivate animation

Browse source
This commit is contained in:
AleaJactaEst 2023-11-20 23:18:02 +01:00
parent 367eea75aa
commit 6b07896f39
9 changed files with 130 additions and 7240 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/player/AnimationTree.gd
View file

@ -2,6 +2,7 @@ extends AnimationTree
class_name AnimBlend class_name AnimBlend
@export var movement_script : CharacterMovementComponent @export var movement_script : CharacterMovementComponent
func _physics_process(_delta): func _physics_process(_delta):
if !movement_script: if !movement_script:
return return
@ -14,12 +15,9 @@ func _physics_process(_delta):
set("parameters/InAir/blend_amount" , 0.0) set("parameters/InAir/blend_amount" , 0.0)
#set("parameters/TimeSeek/seek_request", 0.0) #set("parameters/TimeSeek/seek_request", 0.0)
#set("parameters/Transition/transition_request","Idle") #set("parameters/Transition/transition_request","Idle")
#print("Idle")
Global.MOVEMENT_STATE.in_air: # Air Global.MOVEMENT_STATE.in_air: # Air
pass
set("parameters/InAir/blend_amount" , 1.0) set("parameters/InAir/blend_amount" , 1.0)
#set("parameters/InAir/transition_request","Failling") #set("parameters/InAir/transition_request","Failling")
#print("Falling")
Global.MOVEMENT_STATE.mantling: # couverture Global.MOVEMENT_STATE.mantling: # couverture
pass pass
Global.MOVEMENT_STATE.ragdoll: Global.MOVEMENT_STATE.ragdoll:

1
client/player/CameraComponent.gd
View file

@ -126,7 +126,6 @@ func reset_camera_transition(smooth_transition: bool = true):
tween.tween_property(Camera,"position",Vector3(0,0,SpringArm.spring_length),1.0) tween.tween_property(Camera,"position",Vector3(0,0,SpringArm.spring_length),1.0)
tween.tween_property(Camera,"rotation",Vector3.ZERO,1.0) tween.tween_property(Camera,"rotation",Vector3.ZERO,1.0)
tween.tween_callback(func(): reseting=false) tween.tween_callback(func(): reseting=false)
else: else:
Camera.rotation = Vector3.ZERO Camera.rotation = Vector3.ZERO
Camera.top_level = false Camera.top_level = false

4
client/player/Global.gd
View file

@ -1,8 +1,8 @@
extends Node extends Node
#------------------ Player Enums ------------------# #------------------ Player Enums ------------------#
# Demarche (Attendre, Marcher, Courir, Pic de vitesse # Demarche (Marcher, Courir, Pic de vitesse
enum GAIT {waiting, walking , running , sprinting} enum GAIT {walking , running , sprinting}
# Sol, Air, Couverture, poupee de chiffon # Sol, Air, Couverture, poupee de chiffon
enum MOVEMENT_STATE {none , grounded , in_air , mantling, ragdoll} enum MOVEMENT_STATE {none , grounded , in_air , mantling, ragdoll}
# #

2
client/player/PlayerNetworkingComponent.gd
View file

@ -36,7 +36,7 @@ func _ready():
pass pass
func set_id(value:int): func set_id(value:int) -> void:
id = value id = value

25
client/player/character.gd
View file

@ -27,17 +27,28 @@ func set_otherplayer(value:bool):
func _ready(): func _ready():
$SpringArm3D/Camera3D.set_current(false) $SpringArm3D/Camera3D.set_current(false)
$PlayerGameplayComponent.update_animations() #$PlayerGameplayComponent.update_animations()
func set_current_camera(): func set_current_camera() -> void:
$SpringArm3D/Camera3D.set_current(true) $SpringArm3D/Camera3D.set_current(true)
func set_id(value:int): func set_id(value:int) -> void:
$PlayerNetworkingComponent.set_id(value) $PlayerNetworkingComponent.set_id(value)
func set_activate() -> void:
#$AnimationTree.set_active(true)
#$AnimationTree.set("parameters/Transition/transition_request","Idle")
pass
#func set_animation_tree_blend_positions(input_vector: Vector2) -> void:
# #print("Blend Position: ", input_vector)
# $AnimationTree.set("parameters/Idle/blend_position", input_vector)
# $AnimationTree.set("parameters/Walk/blend_position", input_vector)
func get_animation() -> String: func get_animation() -> String:
return $AnimationTree.get("parameters/Transition/current_state") + \ return $AnimationTree.get("parameters/Transition/current_state") + \
", " + str($AnimationTree.get("parameters/InAir/blend_amount")) + \ ", " + str($AnimationTree.get("parameters/InAir/blend_amount")) + \
@ -51,16 +62,16 @@ func get_animation() -> String:
func get_gait() -> String: func get_gait() -> String:
return Global.GAIT.keys()[$PlayerGameplayComponent.gait] return Global.GAIT.keys()[$CharacterMovementComponent.gait]
func get_stance() -> String: func get_stance() -> String:
return Global.STANCE.keys()[$PlayerGameplayComponent.stance] return Global.STANCE.keys()[$CharacterMovementComponent.stance]
func get_rotation_mode() -> String: func get_rotation_mode() -> String:
return Global.ROTATION_MODE.keys()[$PlayerGameplayComponent.rotation_mode] return Global.ROTATION_MODE.keys()[$CharacterMovementComponent.rotation_mode]
func get_movement_state() -> String: func get_movement_state() -> String:
return Global.MOVEMENT_STATE.keys()[$PlayerGameplayComponent.movement_state] return Global.MOVEMENT_STATE.keys()[$CharacterMovementComponent.movement_state]

7329
client/player/character.tscn
View file

File diff suppressed because one or more lines are too long

1
client/scenes/main.gd
View file

@ -74,6 +74,7 @@ func _on_connexion_updated(new_state:Multi.Connexion):
$PlayerSpawnLocation.get_child(0).set_current_camera() $PlayerSpawnLocation.get_child(0).set_current_camera()
$PlayerSpawnLocation.get_child(0).set_name(str(Multi.get_id())) $PlayerSpawnLocation.get_child(0).set_name(str(Multi.get_id()))
$PlayerSpawnLocation.get_child(0).set_id(Multi.get_id()) $PlayerSpawnLocation.get_child(0).set_id(Multi.get_id())
$PlayerSpawnLocation.get_child(0).set_activate()
$PlayerSpawnLocation.set_visible(true) $PlayerSpawnLocation.set_visible(true)
$CameraStarting.set_current(false) $CameraStarting.set_current(false)
else: else: