diff --git a/client/player/Player.tscn b/client/player/Player.tscn index e54467b..95f68b1 100644 --- a/client/player/Player.tscn +++ b/client/player/Player.tscn @@ -94,17 +94,6 @@ bone_idx = 12 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.8, 0) shape = SubResource("CapsuleShape3D_2f50n") -[node name="Label" type="Label3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0) -pixel_size = 0.001 -billboard = 1 -render_priority = 1 -outline_modulate = Color(0, 0, 0, 0.498039) -text = "Player" -font = ExtResource("4_76ehj") -font_size = 128 -outline_size = 10 - [node name="Animation" type="Node" parent="." node_paths=PackedStringArray("character", "animation_player")] script = ExtResource("4_i2ybk") character = NodePath("..") @@ -119,4 +108,15 @@ libraries = { } playback_default_blend_time = 0.2 +[node name="Label" type="Label3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0) +pixel_size = 0.001 +billboard = 1 +double_sided = false +alpha_cut = 1 +text = "Player" +font = ExtResource("4_76ehj") +font_size = 128 +outline_size = 32 + [editable path="Model/Female"] diff --git a/client/project.godot b/client/project.godot index 35b4d1b..e502f9b 100644 --- a/client/project.godot +++ b/client/project.godot @@ -25,6 +25,8 @@ gdscript/warnings/integer_division=0 [display] +window/size/viewport_width=1920 +window/size/viewport_height=1080 window/size/mode=3 window/stretch/mode="canvas_items" window/stretch/aspect="expand" diff --git a/client/ui/settings/Settings.tscn b/client/ui/settings/Settings.tscn index b20d4fb..48429d1 100644 --- a/client/ui/settings/Settings.tscn +++ b/client/ui/settings/Settings.tscn @@ -35,7 +35,7 @@ layout_mode = 2 layout_mode = 2 [node name="Render Scale" type="HBoxContainer" parent="TabContainer/Video/VBoxContainer"] -custom_minimum_size = Vector2(0, 28) +custom_minimum_size = Vector2(0, 32) layout_mode = 2 [node name="Label" type="Label" parent="TabContainer/Video/VBoxContainer/Render Scale"] @@ -61,7 +61,7 @@ popup/item_4/id = 4 script = ExtResource("3_o5ei3") [node name="Scale Mode" type="HBoxContainer" parent="TabContainer/Video/VBoxContainer"] -custom_minimum_size = Vector2(0, 28) +custom_minimum_size = Vector2(0, 32) layout_mode = 2 [node name="Label" type="Label" parent="TabContainer/Video/VBoxContainer/Scale Mode"] @@ -83,7 +83,7 @@ popup/item_2/id = 2 script = ExtResource("2_7a2hi") [node name="Glow" type="HBoxContainer" parent="TabContainer/Video/VBoxContainer"] -custom_minimum_size = Vector2(0, 28) +custom_minimum_size = Vector2(0, 32) layout_mode = 2 [node name="Label" type="Label" parent="TabContainer/Video/VBoxContainer/Glow"] @@ -98,7 +98,7 @@ size_flags_horizontal = 3 script = ExtResource("1_vkhbt") [node name="Depth of Field" type="HBoxContainer" parent="TabContainer/Video/VBoxContainer"] -custom_minimum_size = Vector2(0, 28) +custom_minimum_size = Vector2(0, 32) layout_mode = 2 [node name="Label" type="Label" parent="TabContainer/Video/VBoxContainer/Depth of Field"] @@ -113,7 +113,7 @@ size_flags_horizontal = 3 script = ExtResource("5_kjasn") [node name="Brightness" type="HBoxContainer" parent="TabContainer/Video/VBoxContainer"] -custom_minimum_size = Vector2(0, 28) +custom_minimum_size = Vector2(0, 32) layout_mode = 2 [node name="Label" type="Label" parent="TabContainer/Video/VBoxContainer/Brightness"] @@ -131,7 +131,7 @@ value = 0.5 script = ExtResource("7_redsl") [node name="Contrast" type="HBoxContainer" parent="TabContainer/Video/VBoxContainer"] -custom_minimum_size = Vector2(0, 28) +custom_minimum_size = Vector2(0, 32) layout_mode = 2 [node name="Label" type="Label" parent="TabContainer/Video/VBoxContainer/Contrast"] @@ -149,7 +149,7 @@ value = 0.5 script = ExtResource("8_q4hif") [node name="Saturation" type="HBoxContainer" parent="TabContainer/Video/VBoxContainer"] -custom_minimum_size = Vector2(0, 28) +custom_minimum_size = Vector2(0, 32) layout_mode = 2 [node name="Label" type="Label" parent="TabContainer/Video/VBoxContainer/Saturation"] diff --git a/client/ui/theme/theme.tres b/client/ui/theme/theme.tres index 7c5d203..406289d 100644 --- a/client/ui/theme/theme.tres +++ b/client/ui/theme/theme.tres @@ -4,6 +4,7 @@ [resource] default_font = ExtResource("1_1unma") +default_font_size = 20 MarginContainer/constants/margin_bottom = 12 MarginContainer/constants/margin_left = 12 MarginContainer/constants/margin_right = 12 diff --git a/client/world/utils/LookAtCamera.gd b/client/world/utils/LookAtCamera.gd new file mode 100644 index 0000000..a75dbd9 --- /dev/null +++ b/client/world/utils/LookAtCamera.gd @@ -0,0 +1,4 @@ +extends Node3D + +func _process(_delta): + look_at(Global.camera.global_position, Vector3.UP, true) diff --git a/client/world/RotateY.gd b/client/world/utils/RotateY.gd similarity index 100% rename from client/world/RotateY.gd rename to client/world/utils/RotateY.gd