From 16689983fd950c7473c048be0e0592188c2aee7a Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sat, 7 Jan 2023 18:38:31 +0100 Subject: [PATCH] Rename things for consistency --- island/Island.tscn | 1 - player/{player.gd => Player.gd} | 0 player/Player.tscn | 13 ++++++++++--- project.godot | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) rename player/{player.gd => Player.gd} (100%) diff --git a/island/Island.tscn b/island/Island.tscn index 3315d5a..a9f0be3 100644 --- a/island/Island.tscn +++ b/island/Island.tscn @@ -52,7 +52,6 @@ sky = SubResource("Sky_j6hso") script = SubResource("GDScript_78lo3") [node name="Sea" type="MeshInstance3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) mesh = SubResource("PlaneMesh_4ibso") [node name="Island" type="MeshInstance3D" parent="."] diff --git a/player/player.gd b/player/Player.gd similarity index 100% rename from player/player.gd rename to player/Player.gd diff --git a/player/Player.tscn b/player/Player.tscn index 9d82622..ea0eca8 100644 --- a/player/Player.tscn +++ b/player/Player.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=16 format=3 uid="uid://dnrl0uycbw3lp"] +[gd_scene load_steps=16 format=3] -[ext_resource type="Script" path="res://player/player.gd" id="1_rujcr"] +[ext_resource type="Script" path="res://player/Player.gd" id="1_rujcr"] [ext_resource type="Script" path="res://player/Head.gd" id="2_ohlgu"] [ext_resource type="Script" path="res://player/OnHand.gd" id="3_3rcjl"] [ext_resource type="Shader" path="res://player/crosshair.gdshader" id="4_dut1p"] @@ -140,6 +140,7 @@ grow_horizontal = 2 grow_vertical = 2 [node name="CameraViewportContainer" type="SubViewportContainer" parent="Head/Viewport"] +layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -149,6 +150,7 @@ stretch = true [node name="GameViewport" type="SubViewport" parent="Head/Viewport/CameraViewportContainer"] handle_input_locally = false +size = Vector2i(284, 160) render_target_update_mode = 4 [node name="Camera" type="Camera3D" parent="Head/Viewport/CameraViewportContainer/GameViewport"] @@ -172,6 +174,7 @@ skeleton = NodePath("../..") shape = SubResource("CylinderShape3D_otair") [node name="HUD" type="Control" parent="."] +texture_filter = 1 layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 @@ -182,6 +185,7 @@ theme = SubResource("Theme_smyke") [node name="FPS_Label" type="Label" parent="HUD"] visible = false +layout_mode = 1 anchors_preset = 1 anchor_left = 1.0 anchor_right = 1.0 @@ -194,7 +198,7 @@ horizontal_alignment = 2 script = SubResource("GDScript_iiadi") [node name="PointsSpawner" type="Control" parent="HUD"] -layout_mode = 3 +layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -206,6 +210,7 @@ script = SubResource("GDScript_5d122") [node name="Speed_Label" type="Label" parent="HUD"] visible = false +layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -228,6 +233,7 @@ copy_mode = 2 [node name="SubViewportContainer" type="SubViewportContainer" parent="HUD"] visible = false show_behind_parent = true +layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -250,6 +256,7 @@ MainCamera = NodePath("../../../../Head/Viewport/CameraViewportContainer/GameVie [node name="Crosshair" type="ColorRect" parent="HUD"] material = SubResource("ShaderMaterial_2p6rt") +layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 diff --git a/project.godot b/project.godot index 35760dc..e5d43dc 100644 --- a/project.godot +++ b/project.godot @@ -17,7 +17,7 @@ _global_script_classes=[{ "base": "CharacterBody3D", "class": &"Player", "language": &"GDScript", -"path": "res://player/player.gd" +"path": "res://player/Player.gd" }, { "base": "Object", "class": &"PlayerInputData",