diff --git a/door/model/door.tres b/door/model/door.tres index fb797c4..2f31ade 100644 --- a/door/model/door.tres +++ b/door/model/door.tres @@ -1,29 +1,23 @@ -[gd_resource type="StandardMaterial3D" load_steps=5 format=2] +[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://bjy37rys7arg0"] -[ext_resource path="res://door/textures/door_orm.png" type="Texture2D" id=1] -[ext_resource path="res://door/textures/door_emission.png" type="Texture2D" id=2] -[ext_resource path="res://door/textures/door_normal.png" type="Texture2D" id=3] -[ext_resource path="res://door/textures/door_albedo.png" type="Texture2D" id=4] +[ext_resource type="Texture2D" uid="uid://c0gly8oy0hsbg" path="res://door/textures/door_orm.png" id="1"] +[ext_resource type="Texture2D" uid="uid://cgimqwcsyb6eu" path="res://door/textures/door_emission.png" id="2"] +[ext_resource type="Texture2D" uid="uid://bstx1dlfh05i1" path="res://door/textures/door_normal.png" id="3"] +[ext_resource type="Texture2D" uid="uid://bhtkq1wnlj0gm" path="res://door/textures/door_albedo.png" id="4"] [resource] resource_name = "door" -albedo_texture = ExtResource( 4 ) +albedo_texture = ExtResource("4") metallic = 1.0 -metallic_texture = ExtResource( 1 ) +metallic_texture = ExtResource("1") metallic_texture_channel = 2 -roughness_texture = ExtResource( 1 ) +roughness_texture = ExtResource("1") roughness_texture_channel = 1 emission_enabled = true -emission = Color( 0, 0, 0, 1 ) -emission_energy = 3.0 -emission_operator = 0 -emission_on_uv2 = false -emission_texture = ExtResource( 2 ) +emission_energy_multiplier = 3.0 +emission_texture = ExtResource("2") normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 3 ) +normal_texture = ExtResource("3") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 1 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("1") +texture_filter = 5 diff --git a/enemies/red_robot/laser/impact_effect/LightRays.png.import b/enemies/red_robot/laser/impact_effect/LightRays.png.import index 77bb073..3ac57b9 100644 --- a/enemies/red_robot/laser/impact_effect/LightRays.png.import +++ b/enemies/red_robot/laser/impact_effect/LightRays.png.import @@ -3,20 +3,19 @@ importer="texture" type="CompressedTexture2D" uid="uid://clqkmuqdlo4rh" -path.s3tc="res://.godot/imported/LightRays.png-6ea2289055a4cb601788902fdea82c53.s3tc.ctex" +path="res://.godot/imported/LightRays.png-6ea2289055a4cb601788902fdea82c53.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true +"vram_texture": false } [deps] source_file="res://enemies/red_robot/laser/impact_effect/LightRays.png" -dest_files=["res://.godot/imported/LightRays.png-6ea2289055a4cb601788902fdea82c53.s3tc.ctex"] +dest_files=["res://.godot/imported/LightRays.png-6ea2289055a4cb601788902fdea82c53.ctex"] [params] -compress/mode=2 +compress/mode=0 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 diff --git a/enemies/red_robot/model/EvilRobo.tres b/enemies/red_robot/model/EvilRobo.tres index c042d55..e069b0b 100644 --- a/enemies/red_robot/model/EvilRobo.tres +++ b/enemies/red_robot/model/EvilRobo.tres @@ -1,29 +1,23 @@ -[gd_resource type="StandardMaterial3D" load_steps=5 format=2] +[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://ba4cx232blvi7"] -[ext_resource path="res://enemies/red_robot/textures/red_robot_emission.png" type="Texture2D" id=1] -[ext_resource path="res://enemies/red_robot/textures/red_robot_normal.png" type="Texture2D" id=2] -[ext_resource path="res://enemies/red_robot/textures/red_robot_orm.png" type="Texture2D" id=3] -[ext_resource path="res://enemies/red_robot/textures/red_robot_albedo.png" type="Texture2D" id=4] +[ext_resource type="Texture2D" uid="uid://buosl00vcjypt" path="res://enemies/red_robot/textures/red_robot_emission.png" id="1"] +[ext_resource type="Texture2D" uid="uid://daxby8xdf31fb" path="res://enemies/red_robot/textures/red_robot_normal.png" id="2"] +[ext_resource type="Texture2D" uid="uid://c0o7286nq1di4" path="res://enemies/red_robot/textures/red_robot_orm.png" id="3"] +[ext_resource type="Texture2D" uid="uid://bwosvc562wtg7" path="res://enemies/red_robot/textures/red_robot_albedo.png" id="4"] [resource] resource_name = "EvilRobo" -albedo_texture = ExtResource( 4 ) +albedo_texture = ExtResource("4") metallic = 0.5 -metallic_texture = ExtResource( 3 ) +metallic_texture = ExtResource("3") metallic_texture_channel = 2 -roughness_texture = ExtResource( 3 ) +roughness_texture = ExtResource("3") roughness_texture_channel = 1 emission_enabled = true -emission = Color( 0, 0, 0, 1 ) -emission_energy = 4.0 -emission_operator = 0 -emission_on_uv2 = false -emission_texture = ExtResource( 1 ) +emission_energy_multiplier = 4.0 +emission_texture = ExtResource("1") normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 2 ) +normal_texture = ExtResource("2") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 3 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("3") +texture_filter = 5 diff --git a/enemies/red_robot/parts/EvilRobo.tres b/enemies/red_robot/parts/EvilRobo.tres index 0aa6d4a..a357472 100644 --- a/enemies/red_robot/parts/EvilRobo.tres +++ b/enemies/red_robot/parts/EvilRobo.tres @@ -128,3 +128,4 @@ normal_enabled = true normal_texture = ExtResource("2") ao_enabled = true ao_texture = ExtResource("3") +texture_filter = 5 diff --git a/enemies/red_robot/red_robot.tscn b/enemies/red_robot/red_robot.tscn index 343b8ba..d08f5d1 100644 --- a/enemies/red_robot/red_robot.tscn +++ b/enemies/red_robot/red_robot.tscn @@ -10297,8 +10297,6 @@ bones/24/rotation = Quaternion(0.148649, 0.111638, -0.021468, 0.982334) bones/25/rotation = Quaternion(-0.00478714, -0.681487, 0.731769, -0.00823542) bones/26/rotation = Quaternion(0.399233, 0.108838, -0.0188344, 0.910172) bones/29/rotation = Quaternion(0.706577, 0.0273779, -0.0273784, 0.706577) -bones/30/scale = Vector3(1, 1, 1) -bones/32/scale = Vector3(1, 1, 1) bones/36/position = Vector3(1.25983, 1.30326, 0.185817) bones/37/rotation = Quaternion(5.33851e-08, -0.707107, 0.707107, 5.33851e-08) bones/39/rotation = Quaternion(0.972381, 0.0110875, -0.00285769, 0.233117) @@ -10323,7 +10321,7 @@ bones/61/position = Vector3(-0.702017, 1.13607, -0.804415) bones/62/position = Vector3(9.22342, 3.0487, 15.6378) [node name="RayFrom" type="BoneAttachment3D" parent="RedRobotModel/Armature/Skeleton3D" index="4"] -transform = Transform3D(-0.89197, 0.450585, -0.0369248, -0.0296557, 0.0231846, 0.999291, 0.451122, 0.892432, -0.00731756, 0.101781, 2.00666, 0.25782) +transform = Transform3D(-0.891969, 0.450586, -0.0369248, -0.0296557, 0.0231846, 0.999291, 0.451123, 0.892432, -0.0073175, 0.101781, 2.00666, 0.25782) bone_name = "CannonAnimRecoil" bone_idx = 17 diff --git a/level/forklift/flying_forklift.tres b/level/forklift/flying_forklift.tres index 4dde6ab..223ce4e 100644 --- a/level/forklift/flying_forklift.tres +++ b/level/forklift/flying_forklift.tres @@ -1,29 +1,22 @@ -[gd_resource type="StandardMaterial3D" load_steps=5 format=2] +[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://bb4rjtvtwl1a3"] -[ext_resource path="res://level/forklift/flying_forklift_emission.png" type="Texture2D" id=1] -[ext_resource path="res://level/forklift/flying_forklift_albedo.png" type="Texture2D" id=2] -[ext_resource path="res://level/forklift/flying_forklift_orm.png" type="Texture2D" id=3] -[ext_resource path="res://level/forklift/flying_forklift_normal.png" type="Texture2D" id=4] +[ext_resource type="Texture2D" uid="uid://do3riae3njc8h" path="res://level/forklift/flying_forklift_emission.png" id="1"] +[ext_resource type="Texture2D" uid="uid://b8w456lyydinp" path="res://level/forklift/flying_forklift_albedo.png" id="2"] +[ext_resource type="Texture2D" uid="uid://c02c7iu5666d7" path="res://level/forklift/flying_forklift_orm.png" id="3"] +[ext_resource type="Texture2D" uid="uid://0uccdx3aejn" path="res://level/forklift/flying_forklift_normal.png" id="4"] [resource] resource_name = "flying_forklift" -albedo_texture = ExtResource( 2 ) +albedo_texture = ExtResource("2") metallic = 1.0 -metallic_texture = ExtResource( 3 ) +metallic_texture = ExtResource("3") metallic_texture_channel = 2 -roughness_texture = ExtResource( 3 ) +roughness_texture = ExtResource("3") roughness_texture_channel = 1 emission_enabled = true -emission = Color( 0, 0, 0, 1 ) -emission_energy = 1.0 -emission_operator = 0 -emission_on_uv2 = false -emission_texture = ExtResource( 1 ) +emission_texture = ExtResource("1") normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 4 ) +normal_texture = ExtResource("4") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 3 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("3") +texture_filter = 5 diff --git a/level/forklift/mid_cargo_box.tres b/level/forklift/mid_cargo_box.tres index 3142df9..ea2d083 100644 --- a/level/forklift/mid_cargo_box.tres +++ b/level/forklift/mid_cargo_box.tres @@ -1,22 +1,19 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=2] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://fqclk6lbdf03"] -[ext_resource path="res://level/textures/props/mid_cargo_box_normal.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/props/mid_cargo_box_albedo.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/props/mid_cargo_box_orm.png" type="Texture2D" id=3] +[ext_resource type="Texture2D" uid="uid://ctgmrjj6re5t7" path="res://level/textures/props/mid_cargo_box_normal.png" id="1"] +[ext_resource type="Texture2D" uid="uid://b0m02dsx5c8di" path="res://level/textures/props/mid_cargo_box_albedo.png" id="2"] +[ext_resource type="Texture2D" uid="uid://ocdw38ooyy7f" path="res://level/textures/props/mid_cargo_box_orm.png" id="3"] [resource] resource_name = "mid_cargo_box" -albedo_texture = ExtResource( 2 ) +albedo_texture = ExtResource("2") metallic = 1.0 -metallic_texture = ExtResource( 3 ) +metallic_texture = ExtResource("3") metallic_texture_channel = 2 -roughness_texture = ExtResource( 3 ) +roughness_texture = ExtResource("3") roughness_texture_channel = 1 normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 1 ) +normal_texture = ExtResource("1") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 3 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("3") +texture_filter = 5 diff --git a/level/geometry/models/column.tres b/level/geometry/models/column.tres index 3eb223b..2a5966e 100644 --- a/level/geometry/models/column.tres +++ b/level/geometry/models/column.tres @@ -1,22 +1,19 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=2] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://dr0wdfsg5ra6s"] -[ext_resource path="res://level/textures/structure/column_orm.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/structure/column_normal.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/structure/column_albedo.png" type="Texture2D" id=3] +[ext_resource type="Texture2D" uid="uid://o6y1uu8sgf2g" path="res://level/textures/structure/column_orm.png" id="1"] +[ext_resource type="Texture2D" uid="uid://24qvfgi838qc" path="res://level/textures/structure/column_normal.png" id="2"] +[ext_resource type="Texture2D" uid="uid://cytco2ywnxs4d" path="res://level/textures/structure/column_albedo.png" id="3"] [resource] resource_name = "column" -albedo_texture = ExtResource( 3 ) +albedo_texture = ExtResource("3") metallic = 0.5 -metallic_texture = ExtResource( 1 ) +metallic_texture = ExtResource("1") metallic_texture_channel = 2 -roughness_texture = ExtResource( 1 ) +roughness_texture = ExtResource("1") roughness_texture_channel = 1 normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 2 ) +normal_texture = ExtResource("2") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 1 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("1") +texture_filter = 5 diff --git a/level/geometry/models/container2.tres b/level/geometry/models/container2.tres index e52799c..de353b1 100644 --- a/level/geometry/models/container2.tres +++ b/level/geometry/models/container2.tres @@ -1,22 +1,19 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=2] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://hcao661fvytd"] -[ext_resource path="res://level/textures/props/container2_orm.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/props/container2_normal.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/props/container2_albedo.png" type="Texture2D" id=3] +[ext_resource type="Texture2D" uid="uid://cdxqpvqe8ocfw" path="res://level/textures/props/container2_orm.png" id="1"] +[ext_resource type="Texture2D" uid="uid://c1rl8jqrw1er8" path="res://level/textures/props/container2_normal.png" id="2"] +[ext_resource type="Texture2D" uid="uid://bgokbxnx081fo" path="res://level/textures/props/container2_albedo.png" id="3"] [resource] resource_name = "container2" -albedo_texture = ExtResource( 3 ) +albedo_texture = ExtResource("3") metallic = 0.5 -metallic_texture = ExtResource( 1 ) +metallic_texture = ExtResource("1") metallic_texture_channel = 2 -roughness_texture = ExtResource( 1 ) +roughness_texture = ExtResource("1") roughness_texture_channel = 1 normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 2 ) +normal_texture = ExtResource("2") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 1 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("1") +texture_filter = 5 diff --git a/level/geometry/models/container3.tres b/level/geometry/models/container3.tres index 556071c..0572fef 100644 --- a/level/geometry/models/container3.tres +++ b/level/geometry/models/container3.tres @@ -1,22 +1,19 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=2] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://csax6570b6dwk"] -[ext_resource path="res://level/textures/props/container3_normal.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/props/container3_orm.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/props/container3_albedo.png" type="Texture2D" id=3] +[ext_resource type="Texture2D" uid="uid://cv6gpsrjo834d" path="res://level/textures/props/container3_normal.png" id="1"] +[ext_resource type="Texture2D" uid="uid://baepkjfs6fd3g" path="res://level/textures/props/container3_orm.png" id="2"] +[ext_resource type="Texture2D" uid="uid://gevxqfgego6g" path="res://level/textures/props/container3_albedo.png" id="3"] [resource] resource_name = "container3" -albedo_texture = ExtResource( 3 ) +albedo_texture = ExtResource("3") metallic = 0.5 -metallic_texture = ExtResource( 2 ) +metallic_texture = ExtResource("2") metallic_texture_channel = 2 -roughness_texture = ExtResource( 2 ) +roughness_texture = ExtResource("2") roughness_texture_channel = 2 normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 1 ) +normal_texture = ExtResource("1") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 2 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("2") +texture_filter = 5 diff --git a/level/geometry/models/container4.tres b/level/geometry/models/container4.tres index 405d31d..00fc377 100644 --- a/level/geometry/models/container4.tres +++ b/level/geometry/models/container4.tres @@ -1,25 +1,22 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=2] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://pnj54vgelmt6"] -[ext_resource path="res://level/textures/props/container4_orm.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/props/container4_albedo.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/props/container4_normal.png" type="Texture2D" id=3] +[ext_resource type="Texture2D" uid="uid://dts3qrcj1sat8" path="res://level/textures/props/container4_orm.png" id="1"] +[ext_resource type="Texture2D" uid="uid://n6n3fgnf1hsh" path="res://level/textures/props/container4_albedo.png" id="2"] +[ext_resource type="Texture2D" uid="uid://basmfpqdaptkb" path="res://level/textures/props/container4_normal.png" id="3"] [resource] resource_name = "container4" -flags_transparent = true -params_use_alpha_scissor = true -params_alpha_scissor_threshold = 0.98 -albedo_texture = ExtResource( 2 ) +transparency = 2 +alpha_scissor_threshold = 0.98 +alpha_antialiasing_mode = 0 +albedo_texture = ExtResource("2") metallic = 0.5 -metallic_texture = ExtResource( 1 ) +metallic_texture = ExtResource("1") metallic_texture_channel = 2 -roughness_texture = ExtResource( 1 ) +roughness_texture = ExtResource("1") roughness_texture_channel = 1 normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 3 ) +normal_texture = ExtResource("3") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 1 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("1") +texture_filter = 5 diff --git a/level/geometry/models/door.tres b/level/geometry/models/door.tres index 77074c6..bcd8b4f 100644 --- a/level/geometry/models/door.tres +++ b/level/geometry/models/door.tres @@ -1,29 +1,23 @@ -[gd_resource type="StandardMaterial3D" load_steps=5 format=2] +[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://crai084xm7kj"] -[ext_resource path="res://level/textures/props/door_normal.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/props/door_orm.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/props/door_emission.png" type="Texture2D" id=3] -[ext_resource path="res://level/textures/props/door_albedo.png" type="Texture2D" id=4] +[ext_resource type="Texture2D" uid="uid://c0s2chpxfbfva" path="res://level/textures/props/door_normal.png" id="1"] +[ext_resource type="Texture2D" uid="uid://crmon0kumdi2t" path="res://level/textures/props/door_orm.png" id="2"] +[ext_resource type="Texture2D" uid="uid://d14y7pucpqfdu" path="res://level/textures/props/door_emission.png" id="3"] +[ext_resource type="Texture2D" uid="uid://u78tlsd511gf" path="res://level/textures/props/door_albedo.png" id="4"] [resource] resource_name = "door" -albedo_texture = ExtResource( 4 ) +albedo_texture = ExtResource("4") metallic = 0.5 -metallic_texture = ExtResource( 2 ) +metallic_texture = ExtResource("2") metallic_texture_channel = 2 -roughness_texture = ExtResource( 2 ) +roughness_texture = ExtResource("2") roughness_texture_channel = 1 emission_enabled = true -emission = Color( 0, 0, 0, 1 ) -emission_energy = 3.0 -emission_operator = 0 -emission_on_uv2 = false -emission_texture = ExtResource( 3 ) +emission_energy_multiplier = 3.0 +emission_texture = ExtResource("3") normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 1 ) +normal_texture = ExtResource("1") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 2 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("2") +texture_filter = 5 diff --git a/level/geometry/models/door_reactor.tres b/level/geometry/models/door_reactor.tres index ce103b0..2627f81 100644 --- a/level/geometry/models/door_reactor.tres +++ b/level/geometry/models/door_reactor.tres @@ -1,28 +1,22 @@ -[gd_resource type="StandardMaterial3D" load_steps=5 format=2] +[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://7ahmb3jrajnt"] -[ext_resource path="res://level/textures/props/door_reactor_emission.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/props/door_reactor_albedo.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/props/door_reactor_normal.png" type="Texture2D" id=3] -[ext_resource path="res://level/textures/props/door_reactor_orm.png" type="Texture2D" id=4] +[ext_resource type="Texture2D" uid="uid://cis73xaqdsdlu" path="res://level/textures/props/door_reactor_emission.png" id="1"] +[ext_resource type="Texture2D" uid="uid://bo7k4txftqby1" path="res://level/textures/props/door_reactor_albedo.png" id="2"] +[ext_resource type="Texture2D" uid="uid://b1h0lohi1e6t3" path="res://level/textures/props/door_reactor_normal.png" id="3"] +[ext_resource type="Texture2D" uid="uid://bi47hceu70j2g" path="res://level/textures/props/door_reactor_orm.png" id="4"] [resource] resource_name = "door_reactor" -albedo_texture = ExtResource( 2 ) +albedo_texture = ExtResource("2") metallic = 0.5 -metallic_texture = ExtResource( 4 ) +metallic_texture = ExtResource("4") metallic_texture_channel = 2 roughness_texture_channel = 1 emission_enabled = true -emission = Color( 0, 0, 0, 1 ) -emission_energy = 3.0 -emission_operator = 0 -emission_on_uv2 = false -emission_texture = ExtResource( 1 ) +emission_energy_multiplier = 3.0 +emission_texture = ExtResource("1") normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 3 ) +normal_texture = ExtResource("3") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 4 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("4") +texture_filter = 5 diff --git a/level/geometry/models/floor_grate_wholes.tres b/level/geometry/models/floor_grate_wholes.tres index fc7415e..9a188c1 100644 --- a/level/geometry/models/floor_grate_wholes.tres +++ b/level/geometry/models/floor_grate_wholes.tres @@ -1,25 +1,22 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=2] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://bg0tag6xiao3r"] -[ext_resource path="res://level/textures/structure/floor_grate_wholes_normal.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/structure/floor_grate_wholes_orm.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/structure/floor_grate_wholes_albedo.png" type="Texture2D" id=3] +[ext_resource type="Texture2D" uid="uid://0qcfc1733hss" path="res://level/textures/structure/floor_grate_wholes_normal.png" id="1"] +[ext_resource type="Texture2D" uid="uid://bkr0eusigowak" path="res://level/textures/structure/floor_grate_wholes_orm.png" id="2"] +[ext_resource type="Texture2D" uid="uid://cypf8j0tp2vlv" path="res://level/textures/structure/floor_grate_wholes_albedo.png" id="3"] [resource] resource_name = "floor_grate_wholes" -flags_transparent = true -params_use_alpha_scissor = true -params_alpha_scissor_threshold = 0.98 -albedo_texture = ExtResource( 3 ) +transparency = 2 +alpha_scissor_threshold = 0.98 +alpha_antialiasing_mode = 0 +albedo_texture = ExtResource("3") metallic = 0.5 -metallic_texture = ExtResource( 2 ) +metallic_texture = ExtResource("2") metallic_texture_channel = 2 -roughness_texture = ExtResource( 2 ) +roughness_texture = ExtResource("2") roughness_texture_channel = 1 normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 1 ) +normal_texture = ExtResource("1") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 2 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("2") +texture_filter = 5 diff --git a/level/geometry/models/mid_cargo_box.tres b/level/geometry/models/mid_cargo_box.tres index fb3cc4d..1481cc4 100644 --- a/level/geometry/models/mid_cargo_box.tres +++ b/level/geometry/models/mid_cargo_box.tres @@ -1,22 +1,19 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=2] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://btbrh0piulu1r"] -[ext_resource path="res://level/textures/props/mid_cargo_box_albedo.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/props/mid_cargo_box_orm.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/props/mid_cargo_box_normal.png" type="Texture2D" id=3] +[ext_resource type="Texture2D" uid="uid://b0m02dsx5c8di" path="res://level/textures/props/mid_cargo_box_albedo.png" id="1"] +[ext_resource type="Texture2D" uid="uid://ocdw38ooyy7f" path="res://level/textures/props/mid_cargo_box_orm.png" id="2"] +[ext_resource type="Texture2D" uid="uid://ctgmrjj6re5t7" path="res://level/textures/props/mid_cargo_box_normal.png" id="3"] [resource] resource_name = "mid_cargo_box" -albedo_texture = ExtResource( 1 ) +albedo_texture = ExtResource("1") metallic = 0.5 -metallic_texture = ExtResource( 2 ) +metallic_texture = ExtResource("2") metallic_texture_channel = 2 -roughness_texture = ExtResource( 2 ) +roughness_texture = ExtResource("2") roughness_texture_channel = 1 normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 3 ) +normal_texture = ExtResource("3") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 2 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("2") +texture_filter = 5 diff --git a/level/geometry/models/reactor_cylinder.tres b/level/geometry/models/reactor_cylinder.tres index 3cfd3cc..d58c757 100644 --- a/level/geometry/models/reactor_cylinder.tres +++ b/level/geometry/models/reactor_cylinder.tres @@ -1,29 +1,23 @@ -[gd_resource type="StandardMaterial3D" load_steps=5 format=2] +[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://ct6gqk0powrr4"] -[ext_resource path="res://level/textures/props/reactor_cylinder_emissive.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/props/reactor_cylinder_normal.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/props/reactor_cylinder_albedo.png" type="Texture2D" id=3] -[ext_resource path="res://level/textures/props/reactor_cylinder_orm.png" type="Texture2D" id=4] +[ext_resource type="Texture2D" uid="uid://s1qpxe4ao8l" path="res://level/textures/props/reactor_cylinder_emissive.png" id="1"] +[ext_resource type="Texture2D" uid="uid://cp1sttp6pfsim" path="res://level/textures/props/reactor_cylinder_normal.png" id="2"] +[ext_resource type="Texture2D" uid="uid://cflo3wp81kvv4" path="res://level/textures/props/reactor_cylinder_albedo.png" id="3"] +[ext_resource type="Texture2D" uid="uid://dnds7xlobxq44" path="res://level/textures/props/reactor_cylinder_orm.png" id="4"] [resource] resource_name = "reactor_cylinder" -albedo_texture = ExtResource( 3 ) +albedo_texture = ExtResource("3") metallic = 0.5 -metallic_texture = ExtResource( 4 ) +metallic_texture = ExtResource("4") metallic_texture_channel = 2 -roughness_texture = ExtResource( 4 ) +roughness_texture = ExtResource("4") roughness_texture_channel = 2 emission_enabled = true -emission = Color( 0, 0, 0, 1 ) -emission_energy = 1.5 -emission_operator = 0 -emission_on_uv2 = false -emission_texture = ExtResource( 1 ) +emission_energy_multiplier = 1.5 +emission_texture = ExtResource("1") normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 2 ) +normal_texture = ExtResource("2") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 4 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("4") +texture_filter = 5 diff --git a/level/geometry/models/reactor_emitter.tres b/level/geometry/models/reactor_emitter.tres index fb48b68..ad1c66a 100644 --- a/level/geometry/models/reactor_emitter.tres +++ b/level/geometry/models/reactor_emitter.tres @@ -15,3 +15,4 @@ normal_enabled = true normal_texture = ExtResource("3") ao_enabled = true ao_texture = ExtResource("2") +texture_filter = 5 diff --git a/level/geometry/models/scifi_car.tres b/level/geometry/models/scifi_car.tres index 7c83322..f79778e 100644 --- a/level/geometry/models/scifi_car.tres +++ b/level/geometry/models/scifi_car.tres @@ -20,3 +20,4 @@ normal_enabled = true normal_texture = ExtResource("2") ao_enabled = true ao_light_affect = 0.5 +texture_filter = 5 diff --git a/level/geometry/models/scifi_car_glass.tres b/level/geometry/models/scifi_car_glass.tres index 7ff7653..870f434 100644 --- a/level/geometry/models/scifi_car_glass.tres +++ b/level/geometry/models/scifi_car_glass.tres @@ -5,3 +5,4 @@ resource_name = "scifi_car_glass" transparency = 1 albedo_color = Color(0.191406, 0.0710055, 0.0710055, 0.720039) roughness = 0.11 +texture_filter = 5 diff --git a/level/geometry/models/set_asphalt.tres b/level/geometry/models/set_asphalt.tres index a25d57e..c362ad2 100644 --- a/level/geometry/models/set_asphalt.tres +++ b/level/geometry/models/set_asphalt.tres @@ -1,22 +1,20 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=2] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://v2klt8psnllx"] -[ext_resource path="res://level/textures/structure/set_asphalt_albedo.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/structure/set_asphalt_normal.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/structure/set_asphalt_orm.png" type="Texture2D" id=3] +[ext_resource type="Texture2D" uid="uid://bymtnligdlipl" path="res://level/textures/structure/set_asphalt_albedo.png" id="1"] +[ext_resource type="Texture2D" uid="uid://di2s520ksnyt" path="res://level/textures/structure/set_asphalt_normal.png" id="2"] +[ext_resource type="Texture2D" uid="uid://bs0ej03oxabih" path="res://level/textures/structure/set_asphalt_orm.png" id="3"] [resource] resource_name = "set_asphalt" -albedo_texture = ExtResource( 1 ) +albedo_texture = ExtResource("1") metallic = 0.5 -metallic_texture = ExtResource( 3 ) +metallic_texture = ExtResource("3") metallic_texture_channel = 2 -roughness_texture = ExtResource( 3 ) +roughness_texture = ExtResource("3") roughness_texture_channel = 1 normal_enabled = true normal_scale = 1.5 -normal_texture = ExtResource( 2 ) +normal_texture = ExtResource("2") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 3 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("3") +texture_filter = 5 diff --git a/level/geometry/models/tile_anti_slip_metal.tres b/level/geometry/models/tile_anti_slip_metal.tres index 3e0e206..9062117 100644 --- a/level/geometry/models/tile_anti_slip_metal.tres +++ b/level/geometry/models/tile_anti_slip_metal.tres @@ -1,23 +1,20 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=2] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://powxdyqwd86t"] -[ext_resource path="res://level/textures/structure/tile_anti_slip_albedo.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/structure/tile_anti_slip_metal_normal.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/structure/tile_anti_slip_metal_orm.png" type="Texture2D" id=3] +[ext_resource type="Texture2D" uid="uid://bd6uvwbriwdu6" path="res://level/textures/structure/tile_anti_slip_albedo.png" id="1"] +[ext_resource type="Texture2D" uid="uid://bnlskswoobj2l" path="res://level/textures/structure/tile_anti_slip_metal_normal.png" id="2"] +[ext_resource type="Texture2D" uid="uid://cvhuv2ivvnuqo" path="res://level/textures/structure/tile_anti_slip_metal_orm.png" id="3"] [resource] resource_name = "tile_anti_slip_metal" -albedo_texture = ExtResource( 1 ) +albedo_texture = ExtResource("1") metallic = 1.0 -metallic_texture = ExtResource( 3 ) +metallic_texture = ExtResource("3") metallic_texture_channel = 2 roughness = 0.75 -roughness_texture = ExtResource( 3 ) +roughness_texture = ExtResource("3") roughness_texture_channel = 1 normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 2 ) +normal_texture = ExtResource("2") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 3 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("3") +texture_filter = 5 diff --git a/level/geometry/models/tile_black_plastic.tres b/level/geometry/models/tile_black_plastic.tres index fead676..a97b511 100644 --- a/level/geometry/models/tile_black_plastic.tres +++ b/level/geometry/models/tile_black_plastic.tres @@ -1,6 +1,7 @@ -[gd_resource type="StandardMaterial3D" format=2] +[gd_resource type="StandardMaterial3D" format=3 uid="uid://lg6qj8wpa5va"] [resource] resource_name = "tile_black_plastic" -albedo_color = Color( 0.0224657, 0.027302, 0.0741629, 1 ) +albedo_color = Color(0.0224657, 0.027302, 0.0741629, 1) roughness = 0.542695 +texture_filter = 5 diff --git a/level/geometry/models/tile_carbon_fiber.tres b/level/geometry/models/tile_carbon_fiber.tres index 9b7ec60..5279b0b 100644 --- a/level/geometry/models/tile_carbon_fiber.tres +++ b/level/geometry/models/tile_carbon_fiber.tres @@ -1,22 +1,20 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=2] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://cox8xmrxcgitt"] -[ext_resource path="res://level/textures/structure/tile_carbon_fiber_orm.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/structure/tile_carbon_fiber_albedo.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/structure/tile_carbon_fiber_normal.png" type="Texture2D" id=3] +[ext_resource type="Texture2D" uid="uid://bwfy5xt2m0vpi" path="res://level/textures/structure/tile_carbon_fiber_orm.png" id="1"] +[ext_resource type="Texture2D" uid="uid://c8fm57u30timv" path="res://level/textures/structure/tile_carbon_fiber_albedo.png" id="2"] +[ext_resource type="Texture2D" uid="uid://bavo2de4rmxav" path="res://level/textures/structure/tile_carbon_fiber_normal.png" id="3"] [resource] resource_name = "tile_carbon_fiber" -albedo_texture = ExtResource( 2 ) +albedo_texture = ExtResource("2") metallic = 0.5 -metallic_texture = ExtResource( 1 ) +metallic_texture = ExtResource("1") metallic_texture_channel = 2 -roughness_texture = ExtResource( 1 ) +roughness_texture = ExtResource("1") roughness_texture_channel = 1 normal_enabled = true normal_scale = 3.0 -normal_texture = ExtResource( 3 ) +normal_texture = ExtResource("3") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 1 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("1") +texture_filter = 5 diff --git a/level/geometry/models/tile_default_metal.tres b/level/geometry/models/tile_default_metal.tres index 246105c..0415737 100644 --- a/level/geometry/models/tile_default_metal.tres +++ b/level/geometry/models/tile_default_metal.tres @@ -1,22 +1,19 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=2] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://4o80ywqgw2sj"] -[ext_resource path="res://level/textures/structure/tile_default_metal_normal.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/structure/tile_default_metal_albedo.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/structure/tile_default_metal_orm.png" type="Texture2D" id=3] +[ext_resource type="Texture2D" uid="uid://l2anliueqj5b" path="res://level/textures/structure/tile_default_metal_normal.png" id="1"] +[ext_resource type="Texture2D" uid="uid://yyss75p88ker" path="res://level/textures/structure/tile_default_metal_albedo.png" id="2"] +[ext_resource type="Texture2D" uid="uid://c760y3qe8kdu8" path="res://level/textures/structure/tile_default_metal_orm.png" id="3"] [resource] resource_name = "tile_default_metal" -albedo_texture = ExtResource( 2 ) +albedo_texture = ExtResource("2") metallic = 0.5 -metallic_texture = ExtResource( 3 ) +metallic_texture = ExtResource("3") metallic_texture_channel = 2 -roughness_texture = ExtResource( 3 ) +roughness_texture = ExtResource("3") roughness_texture_channel = 1 normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 1 ) +normal_texture = ExtResource("1") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 3 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("3") +texture_filter = 5 diff --git a/level/geometry/models/tile_glass.tres b/level/geometry/models/tile_glass.tres index 5c407fd..b4f7648 100644 --- a/level/geometry/models/tile_glass.tres +++ b/level/geometry/models/tile_glass.tres @@ -22,3 +22,4 @@ normal_enabled = true normal_texture = ExtResource("2") ao_enabled = true ao_texture = ExtResource("3") +texture_filter = 5 diff --git a/level/geometry/models/tile_metal_pillars.tres b/level/geometry/models/tile_metal_pillars.tres index 622a0df..0b710c4 100644 --- a/level/geometry/models/tile_metal_pillars.tres +++ b/level/geometry/models/tile_metal_pillars.tres @@ -1,22 +1,19 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=2] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://cj2l258iggsj1"] -[ext_resource path="res://level/textures/structure/tile_metal_pillars_albedo.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/structure/tile_metal_pillars_normal.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/structure/tile_metal_pillars_orm.png" type="Texture2D" id=3] +[ext_resource type="Texture2D" uid="uid://bqsbqw1oc1nie" path="res://level/textures/structure/tile_metal_pillars_albedo.png" id="1"] +[ext_resource type="Texture2D" uid="uid://coefgoojkhgw7" path="res://level/textures/structure/tile_metal_pillars_normal.png" id="2"] +[ext_resource type="Texture2D" uid="uid://bsorfbmvpbrch" path="res://level/textures/structure/tile_metal_pillars_orm.png" id="3"] [resource] resource_name = "Tile_metal_pillars" -albedo_texture = ExtResource( 1 ) +albedo_texture = ExtResource("1") metallic = 0.5 -metallic_texture = ExtResource( 3 ) +metallic_texture = ExtResource("3") metallic_texture_channel = 2 -roughness_texture = ExtResource( 3 ) +roughness_texture = ExtResource("3") roughness_texture_channel = 1 normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 2 ) +normal_texture = ExtResource("2") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 3 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("3") +texture_filter = 5 diff --git a/level/geometry/models/tile_painted_gun_metal.tres b/level/geometry/models/tile_painted_gun_metal.tres index 05eca5f..e0cecac 100644 --- a/level/geometry/models/tile_painted_gun_metal.tres +++ b/level/geometry/models/tile_painted_gun_metal.tres @@ -1,22 +1,19 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=2] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://4li4j8ie6au1"] -[ext_resource path="res://level/textures/structure/tile_painted_gun_metal_normal.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/structure/tile_painted_gun_metal_albedo.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/structure/tile_painted_gun_metal_orm.png" type="Texture2D" id=3] +[ext_resource type="Texture2D" uid="uid://xdjxolllclr5" path="res://level/textures/structure/tile_painted_gun_metal_normal.png" id="1"] +[ext_resource type="Texture2D" uid="uid://bukfdn5xwc5jv" path="res://level/textures/structure/tile_painted_gun_metal_albedo.png" id="2"] +[ext_resource type="Texture2D" uid="uid://duv6ykrcrhitl" path="res://level/textures/structure/tile_painted_gun_metal_orm.png" id="3"] [resource] resource_name = "tile_painted_gun_metal" -albedo_texture = ExtResource( 2 ) +albedo_texture = ExtResource("2") metallic = 0.5 -metallic_texture = ExtResource( 3 ) +metallic_texture = ExtResource("3") metallic_texture_channel = 2 -roughness_texture = ExtResource( 3 ) +roughness_texture = ExtResource("3") roughness_texture_channel = 1 normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 1 ) +normal_texture = ExtResource("1") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 3 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("3") +texture_filter = 5 diff --git a/level/geometry/models/tile_rivet_panels.tres b/level/geometry/models/tile_rivet_panels.tres index 350ae07..16f0147 100644 --- a/level/geometry/models/tile_rivet_panels.tres +++ b/level/geometry/models/tile_rivet_panels.tres @@ -1,22 +1,19 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=2] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://chkn2bkog3yaw"] -[ext_resource path="res://level/textures/structure/tile_rivet_panels_albedo.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/structure/tile_rivet_panels_normal.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/structure/tile_rivet_panels_orm.png" type="Texture2D" id=3] +[ext_resource type="Texture2D" uid="uid://cyo2tbb5np35t" path="res://level/textures/structure/tile_rivet_panels_albedo.png" id="1"] +[ext_resource type="Texture2D" uid="uid://bktpgw34qfqrw" path="res://level/textures/structure/tile_rivet_panels_normal.png" id="2"] +[ext_resource type="Texture2D" uid="uid://d3kr811gcng7q" path="res://level/textures/structure/tile_rivet_panels_orm.png" id="3"] [resource] resource_name = "tile_rivet_panels" -albedo_texture = ExtResource( 1 ) +albedo_texture = ExtResource("1") metallic = 0.5 -metallic_texture = ExtResource( 3 ) +metallic_texture = ExtResource("3") metallic_texture_channel = 2 -roughness_texture = ExtResource( 3 ) +roughness_texture = ExtResource("3") roughness_texture_channel = 1 normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 2 ) +normal_texture = ExtResource("2") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 3 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("3") +texture_filter = 5 diff --git a/level/geometry/models/tile_scifi_floor_panel.tres b/level/geometry/models/tile_scifi_floor_panel.tres index 4008448..af35551 100644 --- a/level/geometry/models/tile_scifi_floor_panel.tres +++ b/level/geometry/models/tile_scifi_floor_panel.tres @@ -1,22 +1,19 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=2] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://dns1851xm3coh"] -[ext_resource path="res://level/textures/structure/tile_scifi_floor_panel_albedo.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/structure/tile_scifi_floor_panel_normal.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/structure/tile_scifi_floor_panel_orm.png" type="Texture2D" id=3] +[ext_resource type="Texture2D" uid="uid://d2adi7d38ilq5" path="res://level/textures/structure/tile_scifi_floor_panel_albedo.png" id="1"] +[ext_resource type="Texture2D" uid="uid://bhc8hnk3vehij" path="res://level/textures/structure/tile_scifi_floor_panel_normal.png" id="2"] +[ext_resource type="Texture2D" uid="uid://cpy0lbh6h2tx6" path="res://level/textures/structure/tile_scifi_floor_panel_orm.png" id="3"] [resource] resource_name = "tile_scifi_floor_panel" -albedo_texture = ExtResource( 1 ) +albedo_texture = ExtResource("1") metallic = 0.5 -metallic_texture = ExtResource( 3 ) +metallic_texture = ExtResource("3") metallic_texture_channel = 2 -roughness_texture = ExtResource( 3 ) +roughness_texture = ExtResource("3") roughness_texture_channel = 1 normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 2 ) +normal_texture = ExtResource("2") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 3 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("3") +texture_filter = 5 diff --git a/level/geometry/models/tile_silver_metal.tres b/level/geometry/models/tile_silver_metal.tres index 176b4dd..25ca618 100644 --- a/level/geometry/models/tile_silver_metal.tres +++ b/level/geometry/models/tile_silver_metal.tres @@ -1,7 +1,8 @@ -[gd_resource type="StandardMaterial3D" format=2] +[gd_resource type="StandardMaterial3D" format=3 uid="uid://xa4yqg750fv7"] [resource] resource_name = "tile_silver_metal" -albedo_color = Color( 0.21507, 0.216532, 0.239556, 1 ) +albedo_color = Color(0.21507, 0.216532, 0.239556, 1) metallic = 0.5 roughness = 0.0960784 +texture_filter = 5 diff --git a/level/geometry/models/tile_simple_floor.tres b/level/geometry/models/tile_simple_floor.tres index ae62f2d..e8be80f 100644 --- a/level/geometry/models/tile_simple_floor.tres +++ b/level/geometry/models/tile_simple_floor.tres @@ -1,22 +1,20 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=2] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://caa8viibt4phj"] -[ext_resource path="res://level/textures/structure/tile_simple_floor_albedo.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/structure/tile_simple_floor_orm.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/structure/tile_simple_floor_normal.png" type="Texture2D" id=3] +[ext_resource type="Texture2D" uid="uid://dmnbwrwscpwgt" path="res://level/textures/structure/tile_simple_floor_albedo.png" id="1"] +[ext_resource type="Texture2D" uid="uid://dffv38p0ey0br" path="res://level/textures/structure/tile_simple_floor_orm.png" id="2"] +[ext_resource type="Texture2D" uid="uid://du7gjek7kjtog" path="res://level/textures/structure/tile_simple_floor_normal.png" id="3"] [resource] resource_name = "tile_simple_floor" -albedo_texture = ExtResource( 1 ) +albedo_texture = ExtResource("1") metallic = 0.5 -metallic_texture = ExtResource( 2 ) +metallic_texture = ExtResource("2") metallic_texture_channel = 2 -roughness_texture = ExtResource( 2 ) +roughness_texture = ExtResource("2") roughness_texture_channel = 1 normal_enabled = true normal_scale = 2.0 -normal_texture = ExtResource( 3 ) +normal_texture = ExtResource("3") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 2 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("2") +texture_filter = 5 diff --git a/level/geometry/models/tile_steel.tres b/level/geometry/models/tile_steel.tres index 16771d2..12b7e7c 100644 --- a/level/geometry/models/tile_steel.tres +++ b/level/geometry/models/tile_steel.tres @@ -3,3 +3,4 @@ [resource] resource_name = "tile_steel" metallic = 1.0 +texture_filter = 5 diff --git a/level/geometry/models/tile_tech_panels.tres b/level/geometry/models/tile_tech_panels.tres index ccc71ea..42a293e 100644 --- a/level/geometry/models/tile_tech_panels.tres +++ b/level/geometry/models/tile_tech_panels.tres @@ -1,22 +1,19 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=2] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://pnaq2hdnipqg"] -[ext_resource path="res://level/textures/structure/tile_tech_panels_normal.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/structure/tile_tech_panels_orm.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/structure/tile_tech_panels_albedo.png" type="Texture2D" id=3] +[ext_resource type="Texture2D" uid="uid://deqf4exqlmk36" path="res://level/textures/structure/tile_tech_panels_normal.png" id="1"] +[ext_resource type="Texture2D" uid="uid://dem3n48wg6rjh" path="res://level/textures/structure/tile_tech_panels_orm.png" id="2"] +[ext_resource type="Texture2D" uid="uid://c5sut4uu8cq18" path="res://level/textures/structure/tile_tech_panels_albedo.png" id="3"] [resource] resource_name = "tile_tech_panels" -albedo_texture = ExtResource( 3 ) +albedo_texture = ExtResource("3") metallic = 0.5 -metallic_texture = ExtResource( 2 ) +metallic_texture = ExtResource("2") metallic_texture_channel = 2 -roughness_texture = ExtResource( 2 ) +roughness_texture = ExtResource("2") roughness_texture_channel = 1 normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 1 ) +normal_texture = ExtResource("1") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 2 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("2") +texture_filter = 5 diff --git a/level/geometry/models/tile_tech_panels_color.tres b/level/geometry/models/tile_tech_panels_color.tres index 5a3e9fb..891bc1a 100644 --- a/level/geometry/models/tile_tech_panels_color.tres +++ b/level/geometry/models/tile_tech_panels_color.tres @@ -1,22 +1,19 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=2] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://boe38a2lsbsbu"] -[ext_resource path="res://level/textures/structure/tile_tech_panels_normal.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/structure/tile_tech_panels_color_orm.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/structure/tile_tech_panels_color_albedo.png" type="Texture2D" id=3] +[ext_resource type="Texture2D" uid="uid://deqf4exqlmk36" path="res://level/textures/structure/tile_tech_panels_normal.png" id="1"] +[ext_resource type="Texture2D" uid="uid://b6yu2y8uqg7hv" path="res://level/textures/structure/tile_tech_panels_color_orm.png" id="2"] +[ext_resource type="Texture2D" uid="uid://cd1xtgs6oxgfo" path="res://level/textures/structure/tile_tech_panels_color_albedo.png" id="3"] [resource] resource_name = "tile_tech_panels_color" -albedo_texture = ExtResource( 3 ) +albedo_texture = ExtResource("3") metallic = 0.5 -metallic_texture = ExtResource( 2 ) +metallic_texture = ExtResource("2") metallic_texture_channel = 2 -roughness_texture = ExtResource( 2 ) +roughness_texture = ExtResource("2") roughness_texture_channel = 1 normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 1 ) +normal_texture = ExtResource("1") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 2 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("2") +texture_filter = 5 diff --git a/level/geometry/models/train_inner.tres b/level/geometry/models/train_inner.tres index 1532492..030adff 100644 --- a/level/geometry/models/train_inner.tres +++ b/level/geometry/models/train_inner.tres @@ -1,7 +1,8 @@ -[gd_resource type="StandardMaterial3D" format=2] +[gd_resource type="StandardMaterial3D" format=3 uid="uid://dqem6h7nwsf10"] [resource] resource_name = "train_inner" -albedo_color = Color( 0.10375, 0.125224, 0.213956, 1 ) +albedo_color = Color(0.10375, 0.125224, 0.213956, 1) metallic = 0.5 roughness = 0.0960784 +texture_filter = 5 diff --git a/level/geometry/models/train_texture.tres b/level/geometry/models/train_texture.tres index 392bd2c..7e3caa6 100644 --- a/level/geometry/models/train_texture.tres +++ b/level/geometry/models/train_texture.tres @@ -1,22 +1,19 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=2] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://n855v6f65yte"] -[ext_resource path="res://level/textures/structure/train_texture_normal.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/structure/train_texture_orm.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/structure/train_texture_albedo.png" type="Texture2D" id=3] +[ext_resource type="Texture2D" uid="uid://iidaw8faveyc" path="res://level/textures/structure/train_texture_normal.png" id="1"] +[ext_resource type="Texture2D" uid="uid://crfvpcvo3otfs" path="res://level/textures/structure/train_texture_orm.png" id="2"] +[ext_resource type="Texture2D" uid="uid://blnqy8n41020h" path="res://level/textures/structure/train_texture_albedo.png" id="3"] [resource] resource_name = "train_texture" -albedo_texture = ExtResource( 3 ) +albedo_texture = ExtResource("3") metallic = 1.0 -metallic_texture = ExtResource( 2 ) +metallic_texture = ExtResource("2") metallic_texture_channel = 2 -roughness_texture = ExtResource( 2 ) +roughness_texture = ExtResource("2") roughness_texture_channel = 1 normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 1 ) +normal_texture = ExtResource("1") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 2 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("2") +texture_filter = 5 diff --git a/level/geometry/models/trim_emission_lights.tres b/level/geometry/models/trim_emission_lights.tres index 99aeb83..1faedd3 100644 --- a/level/geometry/models/trim_emission_lights.tres +++ b/level/geometry/models/trim_emission_lights.tres @@ -1,29 +1,23 @@ -[gd_resource type="StandardMaterial3D" load_steps=5 format=2] +[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://csx8hue5klwn1"] -[ext_resource path="res://level/textures/structure/trim_emission_lights_orm.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/structure/trim_emission_lights_albedo.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/structure/trim_emission_lights_normal.png" type="Texture2D" id=3] -[ext_resource path="res://level/textures/structure/trim_emission_lights_emission.png" type="Texture2D" id=4] +[ext_resource type="Texture2D" uid="uid://dtlacu2mfg4cr" path="res://level/textures/structure/trim_emission_lights_orm.png" id="1"] +[ext_resource type="Texture2D" uid="uid://dflt45b68hqv8" path="res://level/textures/structure/trim_emission_lights_albedo.png" id="2"] +[ext_resource type="Texture2D" uid="uid://dk20nhluu5fah" path="res://level/textures/structure/trim_emission_lights_normal.png" id="3"] +[ext_resource type="Texture2D" uid="uid://cgla4463e00o3" path="res://level/textures/structure/trim_emission_lights_emission.png" id="4"] [resource] resource_name = "trim_emission_lights" -albedo_texture = ExtResource( 2 ) +albedo_texture = ExtResource("2") metallic = 0.5 -metallic_texture = ExtResource( 1 ) +metallic_texture = ExtResource("1") metallic_texture_channel = 2 -roughness_texture = ExtResource( 1 ) +roughness_texture = ExtResource("1") roughness_texture_channel = 1 emission_enabled = true -emission = Color( 0, 0, 0, 1 ) -emission_energy = 9.92 -emission_operator = 0 -emission_on_uv2 = false -emission_texture = ExtResource( 4 ) +emission_energy_multiplier = 9.92 +emission_texture = ExtResource("4") normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 3 ) +normal_texture = ExtResource("3") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 1 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("1") +texture_filter = 5 diff --git a/level/geometry/models/trim_misc_1.tres b/level/geometry/models/trim_misc_1.tres index b4c60fb..c6677a2 100644 --- a/level/geometry/models/trim_misc_1.tres +++ b/level/geometry/models/trim_misc_1.tres @@ -1,22 +1,20 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=2] +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://ck8f6yik1e0kb"] -[ext_resource path="res://level/textures/structure/trim_misc_1_normal.png" type="Texture2D" id=1] -[ext_resource path="res://level/textures/structure/trim_misc_1_albedo.png" type="Texture2D" id=2] -[ext_resource path="res://level/textures/structure/trim_misc_1_orm.png" type="Texture2D" id=3] +[ext_resource type="Texture2D" uid="uid://evsrx8dulnfa" path="res://level/textures/structure/trim_misc_1_normal.png" id="1"] +[ext_resource type="Texture2D" uid="uid://dbsvibmkcsc2" path="res://level/textures/structure/trim_misc_1_albedo.png" id="2"] +[ext_resource type="Texture2D" uid="uid://cpa3rnfri3u8i" path="res://level/textures/structure/trim_misc_1_orm.png" id="3"] [resource] resource_name = "trim_misc_1" -albedo_texture = ExtResource( 2 ) +albedo_texture = ExtResource("2") metallic = 0.5 -metallic_texture = ExtResource( 3 ) +metallic_texture = ExtResource("3") metallic_texture_channel = 2 -roughness_texture = ExtResource( 3 ) +roughness_texture = ExtResource("3") roughness_texture_channel = 1 normal_enabled = true normal_scale = 1.5 -normal_texture = ExtResource( 1 ) +normal_texture = ExtResource("1") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 3 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("3") +texture_filter = 5 diff --git a/level/geometry/models/trim_misc_2.tres b/level/geometry/models/trim_misc_2.tres index 7d34646..78f902e 100644 --- a/level/geometry/models/trim_misc_2.tres +++ b/level/geometry/models/trim_misc_2.tres @@ -16,3 +16,4 @@ normal_enabled = true normal_texture = ExtResource("3") ao_enabled = true ao_texture = ExtResource("1") +texture_filter = 5 diff --git a/level/geometry/models/trim_pipes.tres b/level/geometry/models/trim_pipes.tres index 6455bd0..5dece8e 100644 --- a/level/geometry/models/trim_pipes.tres +++ b/level/geometry/models/trim_pipes.tres @@ -1,7 +1,8 @@ -[gd_resource type="StandardMaterial3D" format=2] +[gd_resource type="StandardMaterial3D" format=3 uid="uid://btb3lh0advqke"] [resource] resource_name = "trims_pipes" -albedo_color = Color( 0.0135406, 0.00956619, 0.0144829, 1 ) +albedo_color = Color(0.0135406, 0.00956619, 0.0144829, 1) metallic = 0.0042692 roughness = 0.542695 +texture_filter = 5 diff --git a/level/geometry/models/trim_rail_pipe.tres b/level/geometry/models/trim_rail_pipe.tres index 31adfd6..0608f99 100644 --- a/level/geometry/models/trim_rail_pipe.tres +++ b/level/geometry/models/trim_rail_pipe.tres @@ -1,6 +1,6 @@ -[gd_resource type="StandardMaterial3D" format=2] +[gd_resource type="StandardMaterial3D" format=3 uid="uid://bs2jei6uvq271"] [resource] resource_name = "trim_rail_pipe" -albedo_color = Color( 0.64, 0.0652415, 0.0474241, 1 ) +albedo_color = Color(0.64, 0.0652415, 0.0474241, 1) roughness = 0.542695 diff --git a/level/textures/structure/Core/Material_001.material b/level/textures/structure/Core/Material_001.material index f614816..0e99388 100644 Binary files a/level/textures/structure/Core/Material_001.material and b/level/textures/structure/Core/Material_001.material differ diff --git a/level/textures/structure/light_shafts.png.import b/level/textures/structure/light_shafts.png.import index d30d685..988f8e4 100644 --- a/level/textures/structure/light_shafts.png.import +++ b/level/textures/structure/light_shafts.png.import @@ -3,20 +3,19 @@ importer="texture" type="CompressedTexture2D" uid="uid://mynyixl3f55g" -path.s3tc="res://.godot/imported/light_shafts.png-7bf7b75ffc6e9552229cab1850001e61.s3tc.ctex" +path="res://.godot/imported/light_shafts.png-7bf7b75ffc6e9552229cab1850001e61.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true +"vram_texture": false } [deps] source_file="res://level/textures/structure/light_shafts.png" -dest_files=["res://.godot/imported/light_shafts.png-7bf7b75ffc6e9552229cab1850001e61.s3tc.ctex"] +dest_files=["res://.godot/imported/light_shafts.png-7bf7b75ffc6e9552229cab1850001e61.ctex"] [params] -compress/mode=2 +compress/mode=0 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 diff --git a/level/textures/structure/trim_emission_lights_albedo.png.import b/level/textures/structure/trim_emission_lights_albedo.png.import index 490f000..b72ce2e 100644 --- a/level/textures/structure/trim_emission_lights_albedo.png.import +++ b/level/textures/structure/trim_emission_lights_albedo.png.import @@ -3,20 +3,19 @@ importer="texture" type="CompressedTexture2D" uid="uid://dflt45b68hqv8" -path.s3tc="res://.godot/imported/trim_emission_lights_albedo.png-bd3bc4036fa0d7975a209c87e947669c.s3tc.ctex" +path="res://.godot/imported/trim_emission_lights_albedo.png-bd3bc4036fa0d7975a209c87e947669c.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true +"vram_texture": false } [deps] source_file="res://level/textures/structure/trim_emission_lights_albedo.png" -dest_files=["res://.godot/imported/trim_emission_lights_albedo.png-bd3bc4036fa0d7975a209c87e947669c.s3tc.ctex"] +dest_files=["res://.godot/imported/trim_emission_lights_albedo.png-bd3bc4036fa0d7975a209c87e947669c.ctex"] [params] -compress/mode=2 +compress/mode=0 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 diff --git a/level/textures/structure/trim_emission_lights_emission.png.import b/level/textures/structure/trim_emission_lights_emission.png.import index 35b1f20..fc5a76a 100644 --- a/level/textures/structure/trim_emission_lights_emission.png.import +++ b/level/textures/structure/trim_emission_lights_emission.png.import @@ -3,20 +3,19 @@ importer="texture" type="CompressedTexture2D" uid="uid://cgla4463e00o3" -path.s3tc="res://.godot/imported/trim_emission_lights_emission.png-634f2f10978e7a76afba8d5f8671bcc7.s3tc.ctex" +path="res://.godot/imported/trim_emission_lights_emission.png-634f2f10978e7a76afba8d5f8671bcc7.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true +"vram_texture": false } [deps] source_file="res://level/textures/structure/trim_emission_lights_emission.png" -dest_files=["res://.godot/imported/trim_emission_lights_emission.png-634f2f10978e7a76afba8d5f8671bcc7.s3tc.ctex"] +dest_files=["res://.godot/imported/trim_emission_lights_emission.png-634f2f10978e7a76afba8d5f8671bcc7.ctex"] [params] -compress/mode=2 +compress/mode=0 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 diff --git a/level/textures/structure/trim_emission_lights_normal.png.import b/level/textures/structure/trim_emission_lights_normal.png.import index caa03ea..f6098ac 100644 --- a/level/textures/structure/trim_emission_lights_normal.png.import +++ b/level/textures/structure/trim_emission_lights_normal.png.import @@ -3,20 +3,19 @@ importer="texture" type="CompressedTexture2D" uid="uid://dk20nhluu5fah" -path.s3tc="res://.godot/imported/trim_emission_lights_normal.png-886ffc45476bb0b4caaace609fd0d1f6.s3tc.ctex" +path="res://.godot/imported/trim_emission_lights_normal.png-886ffc45476bb0b4caaace609fd0d1f6.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true +"vram_texture": false } [deps] source_file="res://level/textures/structure/trim_emission_lights_normal.png" -dest_files=["res://.godot/imported/trim_emission_lights_normal.png-886ffc45476bb0b4caaace609fd0d1f6.s3tc.ctex"] +dest_files=["res://.godot/imported/trim_emission_lights_normal.png-886ffc45476bb0b4caaace609fd0d1f6.ctex"] [params] -compress/mode=2 +compress/mode=0 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 diff --git a/level/textures/structure/trim_emission_lights_orm.png.import b/level/textures/structure/trim_emission_lights_orm.png.import index af2a7ff..875afc6 100644 --- a/level/textures/structure/trim_emission_lights_orm.png.import +++ b/level/textures/structure/trim_emission_lights_orm.png.import @@ -3,20 +3,19 @@ importer="texture" type="CompressedTexture2D" uid="uid://dtlacu2mfg4cr" -path.s3tc="res://.godot/imported/trim_emission_lights_orm.png-c3dc78319d070fd02130b8d216eadcc1.s3tc.ctex" +path="res://.godot/imported/trim_emission_lights_orm.png-c3dc78319d070fd02130b8d216eadcc1.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true +"vram_texture": false } [deps] source_file="res://level/textures/structure/trim_emission_lights_orm.png" -dest_files=["res://.godot/imported/trim_emission_lights_orm.png-c3dc78319d070fd02130b8d216eadcc1.s3tc.ctex"] +dest_files=["res://.godot/imported/trim_emission_lights_orm.png-c3dc78319d070fd02130b8d216eadcc1.ctex"] [params] -compress/mode=2 +compress/mode=0 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 diff --git a/player/bullet/bullet.tscn b/player/bullet/bullet.tscn index fc728c8..1411b33 100644 --- a/player/bullet/bullet.tscn +++ b/player/bullet/bullet.tscn @@ -23,6 +23,57 @@ rings = 5 [sub_resource type="SphereShape3D" id="SphereShape3D_klbc5"] radius = 0.170413 +[sub_resource type="Animation" id="Animation_gjuvs"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("OmniLight3D:omni_range") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [1.5] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("BulletBody/MainBody:emitting") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("BulletBody/Trail:emitting") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} +tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("MeshInstance3D:visible") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} + [sub_resource type="Animation" id="Animation_8lnsf"] resource_name = "explode" length = 1.6 @@ -186,57 +237,6 @@ tracks/12/keys = { "values": [3.0, 0.0] } -[sub_resource type="Animation" id="Animation_gjuvs"] -length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("OmniLight3D:omni_range") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [1.5] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("BulletBody/MainBody:emitting") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [true] -} -tracks/2/type = "value" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("BulletBody/Trail:emitting") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [true] -} -tracks/3/type = "value" -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/path = NodePath("MeshInstance3D:visible") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [true] -} - [sub_resource type="AnimationLibrary" id="AnimationLibrary_dbep6"] _data = { "RESET": SubResource("Animation_gjuvs"), diff --git a/player/model/playerobot.tres b/player/model/playerobot.tres index ff1733a..aebc160 100644 --- a/player/model/playerobot.tres +++ b/player/model/playerobot.tres @@ -1,32 +1,25 @@ -[gd_resource type="StandardMaterial3D" load_steps=5 format=2] +[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://deuketc2tfbcu"] -[ext_resource path="res://player/textures/player_robot_albedo.png" type="Texture2D" id=1] -[ext_resource path="res://player/textures/player_robot_orm.png" type="Texture2D" id=2] -[ext_resource path="res://player/textures/player_robot_normal.png" type="Texture2D" id=3] -[ext_resource path="res://player/textures/player_robot_emissive.png" type="Texture2D" id=4] +[ext_resource type="Texture2D" uid="uid://o1nd7djiihf1" path="res://player/textures/player_robot_albedo.png" id="1"] +[ext_resource type="Texture2D" uid="uid://e25tiap7vd16" path="res://player/textures/player_robot_orm.png" id="2"] +[ext_resource type="Texture2D" uid="uid://dfiaidypprqxn" path="res://player/textures/player_robot_normal.png" id="3"] +[ext_resource type="Texture2D" uid="uid://b8bamggcp7gpx" path="res://player/textures/player_robot_emissive.png" id="4"] [resource] resource_name = "playerobot" -albedo_texture = ExtResource( 1 ) +albedo_texture = ExtResource("1") metallic = 1.0 -metallic_texture = ExtResource( 2 ) +metallic_texture = ExtResource("2") metallic_texture_channel = 2 -roughness_texture = ExtResource( 2 ) +roughness_texture = ExtResource("2") roughness_texture_channel = 1 emission_enabled = true -emission = Color( 0, 0, 0, 1 ) -emission_energy = 1.0 -emission_operator = 0 -emission_on_uv2 = false -emission_texture = ExtResource( 4 ) +emission_texture = ExtResource("4") normal_enabled = true -normal_scale = 1.0 -normal_texture = ExtResource( 3 ) +normal_texture = ExtResource("3") ao_enabled = true -ao_light_affect = 0.0 -ao_texture = ExtResource( 2 ) -ao_on_uv2 = false -ao_texture_channel = 0 +ao_texture = ExtResource("2") +texture_filter = 5 distance_fade_mode = 3 distance_fade_min_distance = 0.2 distance_fade_max_distance = 0.8 diff --git a/player/player.tscn b/player/player.tscn index ee1ce21..d99d746 100644 --- a/player/player.tscn +++ b/player/player.tscn @@ -74113,7 +74113,7 @@ bones/143/rotation = Quaternion(0.99835, 0, -0.0574184, 0) bones/143/scale = Vector3(1, 1.03008, 1) [node name="GunBone" type="BoneAttachment3D" parent="PlayerModel/Robot_Skeleton/Skeleton3D" index="5"] -transform = Transform3D(0.436536, 0.170919, -0.887242, 0.709297, 0.54571, 0.454029, 0.559914, -0.824562, 0.116573, -0.346575, 1.18472, 0.176002) +transform = Transform3D(0.436535, 0.170919, -0.887241, 0.709296, 0.54571, 0.454028, 0.559913, -0.824561, 0.116573, -0.346575, 1.18472, 0.176002) bone_name = "hand.R" bone_idx = 55 diff --git a/project.godot b/project.godot index 3206697..a19eb30 100644 --- a/project.godot +++ b/project.godot @@ -218,6 +218,7 @@ common/physics_interpolation=true [rendering] reflections/sky_reflections/texture_array_reflections=false +textures/default_filters/anisotropic_filtering_level=4 scaling_3d/mode=2 textures/decals/filter=1 textures/light_projectors/filter=1