From a09675320a4675d64710ebe60c4c374b97a4c5c1 Mon Sep 17 00:00:00 2001 From: unfa Date: Sat, 11 Sep 2021 23:00:53 +0200 Subject: [PATCH] Moving camera management to Player --- Game/Assets/Characters/Player.gd | 2 ++ Game/Assets/Characters/Player.tscn | 7 +------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Game/Assets/Characters/Player.gd b/Game/Assets/Characters/Player.gd index 68602b4..75ee164 100644 --- a/Game/Assets/Characters/Player.gd +++ b/Game/Assets/Characters/Player.gd @@ -116,8 +116,10 @@ func _ready() -> void: if is_network_authority(): # prevent puppets from attempting to steer the authority - this just causes RPC errors input_active = true + $Head/Camera.current = true else: input_active = false + $Head/Camera.current = false func aim(event) -> void: var mouse_motion = event as InputEventMouseMotion diff --git a/Game/Assets/Characters/Player.tscn b/Game/Assets/Characters/Player.tscn index d2f719d..ce4305d 100644 --- a/Game/Assets/Characters/Player.tscn +++ b/Game/Assets/Characters/Player.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://Assets/Characters/Player.gd" id="1"] [ext_resource type="PackedScene" uid="uid://bemrov0tiy08n" path="res://Assets/Weapons/Weapon.tscn" id="3"] -[ext_resource type="Texture2D" uid="uid://pnh872qjk0oy" path="res://Assets/Effects/Flame.png" id="3_jw7jd"] +[ext_resource type="Texture2D" uid="uid://cguy76rs8e220" path="res://Assets/Effects/Flame.png" id="3_jw7jd"] [sub_resource type="StandardMaterial3D" id="4"] albedo_color = Color(0.545098, 0.545098, 0.545098, 1) @@ -90,7 +90,6 @@ script = null [node name="Camera" type="Camera3D" parent="Head"] transform = Transform3D(1, 0, 2.38419e-07, 0, 1, 0, -2.38419e-07, 0, 1, 0, 0, 0) -current = true fov = 90.0 script = null @@ -128,10 +127,6 @@ script = null [node name="ClimbTween" type="Node" parent="."] script = null -[node name="Camera3D" type="Camera3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00117874, 2.00811, 2.99957) -script = null - [node name="Jetpack" type="MeshInstance3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.93832, 0.5022) material_override = SubResource( "StandardMaterial3D_y4s21" )