diff options
| author | nokoe <nokoe@mailbox.org> | 2024-07-08 19:33:02 +0200 |
|---|---|---|
| committer | nokoe <nokoe@mailbox.org> | 2024-07-08 19:33:49 +0200 |
| commit | 1bebf8ade214ce221a1bc8b39f0ed2b09ae147e6 (patch) | |
| tree | 3589a349eca8188d09b0b68c7b1c4be9136b44cf /client/game.gd | |
| parent | aeeb376c1faceacb8856add20a820271cc3254b3 (diff) | |
| download | hurrycurry-1bebf8ade214ce221a1bc8b39f0ed2b09ae147e6.tar hurrycurry-1bebf8ade214ce221a1bc8b39f0ed2b09ae147e6.tar.bz2 hurrycurry-1bebf8ade214ce221a1bc8b39f0ed2b09ae147e6.tar.zst | |
move interact target marker to player
Diffstat (limited to 'client/game.gd')
| -rw-r--r-- | client/game.gd | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/client/game.gd b/client/game.gd index 8fe150e6..401d96bb 100644 --- a/client/game.gd +++ b/client/game.gd @@ -37,13 +37,11 @@ var is_replay := false var is_joined := false var join_sent := false -var marker_target = Vector3(0,0,0) var players := {} @onready var camera: FollowCamera = $FollowCamera @onready var mp: Multiplayer = $Multiplayer @onready var map: Map = $Map -@onready var marker: Marker = $Marker @onready var environment = $WorldEnvironment @onready var debug_label = $Debug @onready var overlay = $Overlay @@ -93,7 +91,7 @@ func _ready(): var player_instance: Player if player == player_id: player_instance = ControllablePlayer.new(player, player_name, pos, character, self) - camera.target = player_instance + camera.target = player_instance.movement_base player_set_input_enabled.connect(player_instance.set_input_enabled) is_joined = true joined.emit() @@ -248,7 +246,6 @@ func join(): mp.send_join(Global.profile["username"], Global.profile["character"]) func _process(delta): - marker.position = Global.interpolate(marker.position, marker_target, delta * 30.) update_center() if is_replay: mp.send_replay_tick(delta) @@ -283,9 +280,9 @@ func update_center(): var p: Player = v if p.character_idx >= 0: player_sum += 1 - player_center += p.position + player_center += p.movement_base.position sum += 1 - center += p.position + center += p.movement_base.position var new_center: Vector3 = Vector3(0., 0., 0.) if player_sum > 0: |