Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use anisotropic filtering to improve texture appearance at oblique angles #181

Merged
merged 1 commit into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 13 additions & 19 deletions door/model/door.tres
Original file line number Diff line number Diff line change
@@ -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
9 changes: 4 additions & 5 deletions enemies/red_robot/laser/impact_effect/LightRays.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
32 changes: 13 additions & 19 deletions enemies/red_robot/model/EvilRobo.tres
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions enemies/red_robot/parts/EvilRobo.tres
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,4 @@ normal_enabled = true
normal_texture = ExtResource("2")
ao_enabled = true
ao_texture = ExtResource("3")
texture_filter = 5
4 changes: 1 addition & 3 deletions enemies/red_robot/red_robot.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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

Expand Down
31 changes: 12 additions & 19 deletions level/forklift/flying_forklift.tres
Original file line number Diff line number Diff line change
@@ -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
23 changes: 10 additions & 13 deletions level/forklift/mid_cargo_box.tres
Original file line number Diff line number Diff line change
@@ -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
23 changes: 10 additions & 13 deletions level/geometry/models/column.tres
Original file line number Diff line number Diff line change
@@ -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
23 changes: 10 additions & 13 deletions level/geometry/models/container2.tres
Original file line number Diff line number Diff line change
@@ -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
23 changes: 10 additions & 13 deletions level/geometry/models/container3.tres
Original file line number Diff line number Diff line change
@@ -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
29 changes: 13 additions & 16 deletions level/geometry/models/container4.tres
Original file line number Diff line number Diff line change
@@ -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
32 changes: 13 additions & 19 deletions level/geometry/models/door.tres
Original file line number Diff line number Diff line change
@@ -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
Loading