diff --git a/main/player_spawner.gd b/main/player_spawner.gd index 1210a42..fc40338 100644 --- a/main/player_spawner.gd +++ b/main/player_spawner.gd @@ -44,8 +44,8 @@ func custom_spawn(vars) -> Node: var p: Player = player_scene.instantiate() p.set_multiplayer_authority(id) + p.call_deferred("set_position", pos) p.name = str(id) - p.position = pos player_spawned.emit(id, p) return p diff --git a/player/model/materials/face_mat.tres b/player/model/materials/face_mat.tres index 9dc0ee1..d9d3e32 100644 --- a/player/model/materials/face_mat.tres +++ b/player/model/materials/face_mat.tres @@ -1,7 +1,6 @@ -[gd_resource type="ShaderMaterial" load_steps=3 format=3 uid="uid://dh42cdejchkr3"] +[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://dh42cdejchkr3"] -[ext_resource type="Shader" path="res://player/model/materials/face_mat.gdshader" id="1_u8nh3"] -[ext_resource type="Texture2D" uid="uid://dbag7f8i27ub1" path="res://player/model/faces/open.png" id="2_ymnw0"] +[ext_resource type="Shader" uid="uid://cn2hf5o4glv8b" path="res://player/model/materials/face_mat.gdshader" id="1_u8nh3"] [resource] render_priority = 0 @@ -12,4 +11,3 @@ shader_parameter/screen_red_offset = Vector2(0, 0) shader_parameter/screen_green_offset = Vector2(0, 0) shader_parameter/screen_blue_offset = Vector2(0, 0) shader_parameter/pixel_size = 44.0 -shader_parameter/face_texture = ExtResource("2_ymnw0") diff --git a/player/model/materials/heart_core_mat.tres b/player/model/materials/heart_core_mat.tres index 367bb10..aafd819 100644 --- a/player/model/materials/heart_core_mat.tres +++ b/player/model/materials/heart_core_mat.tres @@ -4,4 +4,4 @@ albedo_color = Color(0, 0, 0, 1) emission_enabled = true emission = Color(0, 1, 0.392157, 1) -emission_energy_multiplier = 2.82816 +emission_energy_multiplier = 2.8583288 diff --git a/player/player.tscn b/player/player.tscn index ef8e6bf..b48f10b 100644 --- a/player/player.tscn +++ b/player/player.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=19 format=3 uid="uid://ciqrpd5675boy"] -[ext_resource type="Script" path="res://player/player.gd" id="1_pdbxc"] -[ext_resource type="Script" path="res://player/camera_controller.gd" id="2_2fob2"] -[ext_resource type="Script" path="res://player/audio_listener.gd" id="2_4csdy"] -[ext_resource type="Script" path="res://player/camera.gd" id="3_qxleh"] +[ext_resource type="Script" uid="uid://cwobjcper4xpu" path="res://player/player.gd" id="1_pdbxc"] +[ext_resource type="Script" uid="uid://sv0oi6kpr4re" path="res://player/camera_controller.gd" id="2_2fob2"] +[ext_resource type="Script" uid="uid://dqe82lcpxosaq" path="res://player/audio_listener.gd" id="2_4csdy"] +[ext_resource type="Script" uid="uid://c54m6p83hnjyl" path="res://player/camera.gd" id="3_qxleh"] [ext_resource type="PackedScene" uid="uid://c0mo8tek77du4" path="res://player/model/character_skin.tscn" id="3_ufinh"] -[ext_resource type="Script" path="res://ui/floating_nickname.gd" id="6_f61mk"] +[ext_resource type="Script" uid="uid://faj0ngyg1v7q" path="res://ui/floating_nickname.gd" id="6_f61mk"] [ext_resource type="Resource" uid="uid://rclnl7v8k722" path="res://user_data/user_data_events.res" id="7_bgpps"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_8x2xm"] @@ -83,6 +83,7 @@ visible = false mesh = SubResource("BoxMesh_kin6n") [node name="CameraController" type="Node3D" parent="."] +top_level = true script = ExtResource("2_2fob2") invert_mouse_y = true tilt_upper_limit = 0.48 @@ -97,7 +98,8 @@ spring_length = 6.0 transform = Transform3D(1, 0, -7.10543e-15, 0, 1, 0, 0, 0, 1, 1.42109e-14, 2.38419e-07, 10) [node name="PlayerCamera" type="Camera3D" parent="CameraController"] -transform = Transform3D(-1, -3.71248e-14, -8.74228e-08, -3.23484e-08, 0.929023, 0.370022, 8.12178e-08, 0.370022, -0.929023, -8.74228e-07, 6.04006, -9.29023) +transform = Transform3D(-1, -3.71248e-14, -8.7422826e-08, -3.23484e-08, 0.929023, 0.370022, 8.12178e-08, 0.370022, -0.929023, -8.74228e-07, 6.04006, -9.29023) +top_level = true attributes = SubResource("CameraAttributesPractical_2ooex") fov = 50.0 script = ExtResource("3_qxleh")