diff --git a/island/Island.tscn b/island/Island.tscn index b517991..3315d5a 100644 --- a/island/Island.tscn +++ b/island/Island.tscn @@ -11,7 +11,7 @@ script/source = "extends Node3D # Called when the node enters the scene tree for the first time. func _ready() -> void: - $Island.get_active_material(0).set(\"texture_filter\", BaseMaterial3D.TextureFilter.TEXTURE_FILTER_NEAREST) + $Island.get_active_material(0).texture_filter = BaseMaterial3D.TextureFilter.TEXTURE_FILTER_NEAREST # Called every frame. 'delta' is the elapsed time since the previous frame. diff --git a/menu/Menu.tscn b/menu/Menu.tscn index 60cf0bf..ee73af3 100644 --- a/menu/Menu.tscn +++ b/menu/Menu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3 uid="uid://bufi0wh54u5x5"] +[gd_scene load_steps=5 format=3 uid="uid://bufi0wh54u5x5"] [ext_resource type="Theme" uid="uid://c5a1nyqumj46j" path="res://menu/menu_theme.tres" id="1_mkxnc"] [ext_resource type="Script" path="res://menu/Menu.gd" id="2_6amk3"] diff --git a/player/Player.tscn b/player/Player.tscn index 764a4ca..9d82622 100644 --- a/player/Player.tscn +++ b/player/Player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=17 format=3 uid="uid://dnrl0uycbw3lp"] +[gd_scene load_steps=16 format=3 uid="uid://dnrl0uycbw3lp"] [ext_resource type="Script" path="res://player/player.gd" id="1_rujcr"] [ext_resource type="Script" path="res://player/Head.gd" id="2_ohlgu"] @@ -68,9 +68,6 @@ func spawn_points_label(text: String, offset: Vector2): " -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_avmet"] -bg_color = Color(0, 0, 0, 0.647059) - [sub_resource type="GDScript" id="GDScript_7qy62"] script/source = "extends Camera3D @@ -97,11 +94,11 @@ shader = ExtResource("4_dut1p") shader_parameter/center_enabled = false shader_parameter/legs_enabled = true shader_parameter/inverted = false -shader_parameter/color_id = null -shader_parameter/color_0 = null -shader_parameter/color_1 = null -shader_parameter/color_2 = null -shader_parameter/center_radius = 0.002 +shader_parameter/color_id = 0 +shader_parameter/color_0 = Vector4(1, 1, 1, 1) +shader_parameter/color_1 = Quaternion(1, 0, 0, 1) +shader_parameter/color_2 = Quaternion(0, 0, 1, 1) +shader_parameter/center_radius = 0.005 shader_parameter/width = 0.001 shader_parameter/len = 0.008 shader_parameter/spacing = 0.006 @@ -151,13 +148,12 @@ grow_vertical = 2 stretch = true [node name="GameViewport" type="SubViewport" parent="Head/Viewport/CameraViewportContainer"] -transparent_bg = true handle_input_locally = false -size = Vector2i(284, 160) render_target_update_mode = 4 [node name="Camera" type="Camera3D" parent="Head/Viewport/CameraViewportContainer/GameViewport"] transform = Transform3D(1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, 0, 0.54, 0) +cull_mask = 1048573 current = true fov = 80.0 near = 0.001 @@ -224,29 +220,6 @@ grow_vertical = 2 horizontal_alignment = 1 vertical_alignment = 1 -[node name="Panel" type="Panel" parent="HUD"] -visible = false -anchors_preset = 3 -anchor_left = 1.0 -anchor_top = 1.0 -anchor_right = 1.0 -anchor_bottom = 1.0 -offset_left = -276.0 -offset_top = -122.0 -offset_right = -40.0 -offset_bottom = -40.0 -grow_horizontal = 0 -grow_vertical = 0 -theme_override_styles/panel = SubResource("StyleBoxFlat_avmet") - -[node name="ColorRect" type="ColorRect" parent="HUD/Panel"] -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -color = Color(0, 0, 0, 0.745098) - [node name="BackBufferCopy2" type="BackBufferCopy" parent="HUD"] position = Vector2(727, 447) scale = Vector2(7.61, 4.89) @@ -280,23 +253,13 @@ material = SubResource("ShaderMaterial_2p6rt") anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -offset_top = -5.0 -offset_bottom = -5.0 grow_horizontal = 2 grow_vertical = 2 [node name="BackBufferCopy" type="BackBufferCopy" parent="HUD"] -y_sort_enabled = true -position = Vector2(721, 449) -scale = Vector2(7.21, 4.54) - -[node name="GameFilter" type="ColorRect" parent="HUD"] visible = false -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -metadata/_edit_layout_mode = 1 +y_sort_enabled = true +position = Vector2(140, 79) +scale = Vector2(1.65, 1) [node name="RigidDynamicBody3D" type="RigidBody3D" parent="."] diff --git a/player/player.gd b/player/player.gd index af4890b..5e87b82 100644 --- a/player/player.gd +++ b/player/player.gd @@ -8,6 +8,8 @@ const MOUSE_SENSITIVITY = 2.25 const MAX_AIR_WISH_SPEED = 20 const AIR_ACCELERATE = 100 # Hu/39.97 +@export var viewport_resolution: Vector2 = Vector2(852, 420) + @onready var head: Node3D = $Head @onready var camera: Camera3D = head.get_node("Viewport/CameraViewportContainer/GameViewport/Camera") @onready var vport: SubViewport = head.get_node("Viewport/CameraViewportContainer/GameViewport") @@ -41,11 +43,7 @@ func _get_2d_velocity() -> Vector2: func _ready(): Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) OnHand.player = self -# vport.size = DisplayServer.window_get_size() - vport.size = Vector2(426, 240) -# for item in OnHand.get_children(): -# if item is BaseWeapon: -# item.player = self + vport.size = viewport_resolution func _process(delta): pass diff --git a/project.godot b/project.godot index bd231b2..35760dc 100644 --- a/project.godot +++ b/project.godot @@ -76,6 +76,26 @@ jump={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"unicode":0,"echo":false,"script":null) ] } +slot1={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":49,"unicode":0,"echo":false,"script":null) +] +} +slot2={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":50,"unicode":0,"echo":false,"script":null) +] +} +slot3={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":51,"unicode":0,"echo":false,"script":null) +] +} +toggle_torch={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":70,"unicode":0,"echo":false,"script":null) +] +} [rendering]