badhouseplants/killbox
4
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Activity

WIP: Some updates

Browse Source
This commit is contained in:
Nikolai Rodionov 2025-02-09 22:21:42 +01:00
parent 6528957ce1
commit fb05bc4dd1
Signed by: allanger
GPG Key ID: 09F8B434D0FDD99B
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
godot/scenes/characters/character_wrapper.gd
View File

@ -6,7 +6,9 @@ class_name CharacterWrapper
@export var interpolation_speed: float = 50.0 # How quickly the model corrects position @export var interpolation_speed: float = 50.0 # How quickly the model corrects position
@export var velocity_influence: float = 1.0 # How much velocity is used for smoothing @export var velocity_influence: float = 1.0 # How much velocity is used for smoothing
@export var snap_threshold: float = 2.0 # If desync is larger than this, snap faster
var previous_server_pos: Vector3 = Vector3.ZERO
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready() -> void: func _ready() -> void:
set_multiplayer_authority(multiplayer.get_unique_id()) set_multiplayer_authority(multiplayer.get_unique_id())
@ -18,12 +20,26 @@ func _physics_process(delta: float) -> void:
#global_position = owner_placeholder.global_position #global_position = owner_placeholder.global_position
var server_pos = owner_placeholder.global_transform.origin var server_pos = owner_placeholder.global_transform.origin
var server_velocity = (server_pos - owner_placeholder.global_transform.origin) / delta var server_velocity = (server_pos - previous_server_pos) / delta
velocity = owner_placeholder.velocity if server_velocity.length() < 0.1:
global_transform.origin = global_transform.origin.lerp(server_pos, interpolation_speed * delta) velocity = Vector3.ZERO # Stop predicting movement when nearly still
var distance_to_server = global_transform.origin.distance_to(server_pos)
if distance_to_server > snap_threshold:
# If the desync is too large, quickly correct it
global_transform.origin = server_pos
else:
# Otherwise, smoothly adjust position
global_transform.origin = global_transform.origin.lerp(server_pos, interpolation_speed * delta)
global_transform.origin += velocity * velocity_influence * delta global_transform.origin += velocity * velocity_influence * delta
# Update stored velocity
velocity = velocity.lerp(server_velocity, delta * interpolation_speed) velocity = velocity.lerp(server_velocity, delta * interpolation_speed)
previous_server_pos = server_pos
#velocity = owner_placeholder.velocity
#global_transform.origin = global_transform.origin.lerp(server_pos, interpolation_speed * delta)
#global_transform.origin += velocity * velocity_influence * delta
#velocity = velocity.lerp(server_velocity, delta * interpolation_speed)
#move_and_slide() #move_and_slide()
# Set the owner placeholder, so the characters can send the requests to a node # Set the owner placeholder, so the characters can send the requests to a node

3
godot/scenes/player/server_node.tscn
View File

@ -22,9 +22,6 @@ script = ExtResource("1_bau14")
[node name="SharedNode" parent="." instance=ExtResource("1_ybp5y")] [node name="SharedNode" parent="." instance=ExtResource("1_ybp5y")]
[node name="CSGBox3D" type="CSGBox3D" parent="SharedNode"]
transform = Transform3D(0.190118, 0, 0, 0, 0.190118, 0, 0, 0, 0.190118, 0, 1.62415, -2.41805)
[node name="MainSynchronizer" type="MultiplayerSynchronizer" parent="."] [node name="MainSynchronizer" type="MultiplayerSynchronizer" parent="."]
replication_config = SubResource("SceneReplicationConfig_2dhi2") replication_config = SubResource("SceneReplicationConfig_2dhi2")
visibility_update_mode = 1 visibility_update_mode = 1