From 99f7d2f3a3468f4a4af15562e37f20002a686c89 Mon Sep 17 00:00:00 2001 From: Sara Date: Wed, 11 Feb 2026 16:06:14 +0100 Subject: [PATCH] feat: replaced lighting setup with physical light units --- project/assets/materials/weapons/arms.tres | 3 ++- project/assets/materials/weapons/metal.tres | 5 +++-- project/assets/materials/weapons/wood.tres | 5 +++-- project/maps/game.scn | Bin 2392 -> 2618 bytes project/objects/player.tscn | 7 ++++++- project/project.godot | 1 + 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/project/assets/materials/weapons/arms.tres b/project/assets/materials/weapons/arms.tres index 64cf0afc..616d8859 100644 --- a/project/assets/materials/weapons/arms.tres +++ b/project/assets/materials/weapons/arms.tres @@ -2,8 +2,9 @@ [resource] resource_name = "arms" +transparency = 4 cull_mode = 2 albedo_color = Color(0.9063318, 0.9063318, 0.9063318, 1) roughness = 0.5 use_z_clip_scale = true -z_clip_scale = 0.1 +z_clip_scale = 0.2 diff --git a/project/assets/materials/weapons/metal.tres b/project/assets/materials/weapons/metal.tres index 1e48dbab..0c924d5a 100644 --- a/project/assets/materials/weapons/metal.tres +++ b/project/assets/materials/weapons/metal.tres @@ -1,10 +1,11 @@ -[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://cey2t4uje80f3"] +[gd_resource type="StandardMaterial3D" format=3 uid="uid://cey2t4uje80f3"] [ext_resource type="Texture2D" uid="uid://bfk5amosuiriq" path="res://assets/textures/metal/metal_albedo.png" id="1_7pld1"] [ext_resource type="Texture2D" uid="uid://b2uh6cnh7e1xr" path="res://assets/textures/metal/metal_normal.png" id="2_vujp3"] [resource] resource_name = "metal" +transparency = 4 cull_mode = 2 albedo_texture = ExtResource("1_7pld1") metallic = 0.98 @@ -13,4 +14,4 @@ roughness = 0.48 normal_enabled = true normal_texture = ExtResource("2_vujp3") use_z_clip_scale = true -z_clip_scale = 0.1 +z_clip_scale = 0.2 diff --git a/project/assets/materials/weapons/wood.tres b/project/assets/materials/weapons/wood.tres index af8c568d..37602ce2 100644 --- a/project/assets/materials/weapons/wood.tres +++ b/project/assets/materials/weapons/wood.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://bvy3xngb287wd"] +[gd_resource type="StandardMaterial3D" format=3 uid="uid://bvy3xngb287wd"] [ext_resource type="Texture2D" uid="uid://dstrf0oxck5by" path="res://assets/textures/woodgrain/woodgrain_albedo.png" id="1_4wqgt"] [ext_resource type="Texture2D" uid="uid://celwjqrlb4cdv" path="res://assets/textures/woodgrain/woodgrain_rough.exr" id="2_o8vs7"] @@ -6,6 +6,7 @@ [resource] resource_name = "wood" +transparency = 4 cull_mode = 2 albedo_texture = ExtResource("1_4wqgt") metallic = 1.0 @@ -16,4 +17,4 @@ roughness_texture_channel = 1 normal_enabled = true normal_texture = ExtResource("3_elfj7") use_z_clip_scale = true -z_clip_scale = 0.1 +z_clip_scale = 0.2 diff --git a/project/maps/game.scn b/project/maps/game.scn index 43d740f2a05dd6275708661a34d02c1df2c4c91b..43f2d19a00e7ef6552a1d67390cdbadecb8b1b67 100644 GIT binary patch literal 2618 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 F1OOe82c!T1 literal 2392 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 Zw$@o*f2-M*#e=uq=6I!XCKS}B0syZ4f?)sv diff --git a/project/objects/player.tscn b/project/objects/player.tscn index 4ae05c1c..d042a3fa 100644 --- a/project/objects/player.tscn +++ b/project/objects/player.tscn @@ -2,6 +2,11 @@ [ext_resource type="PackedScene" uid="uid://cfgwif53qypko" path="res://objects/weapons/revolver.tscn" id="1_eqqp1"] +[sub_resource type="CameraAttributesPhysical" id="CameraAttributesPhysical_eqqp1"] +frustum_focus_distance = 1.0 +frustum_focal_length = 20.4 +exposure_aperture = 50.0 + [sub_resource type="SphereShape3D" id="SphereShape3D_eqqp1"] radius = 0.2 @@ -34,7 +39,7 @@ wall_min_slide_angle = 0.0 unique_name_in_owner = true process_priority = -1 transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0.27450943, 0) -fov = 65.0 +attributes = SubResource("CameraAttributesPhysical_eqqp1") [node name="PlayerInteractor" type="PlayerInteractor" parent="PlayerCamera" unique_id=1590374872] shape = SubResource("SphereShape3D_eqqp1") diff --git a/project/project.godot b/project/project.godot index 9404c2d8..0bd7396e 100644 --- a/project/project.godot +++ b/project/project.godot @@ -108,6 +108,7 @@ reload={ [rendering] +lights_and_shadows/use_physical_light_units=true lights_and_shadows/directional_shadow/size=8192 lights_and_shadows/directional_shadow/soft_shadow_filter_quality=4 lights_and_shadows/positional_shadow/soft_shadow_filter_quality=5