Skip to content

Commit adc0ec7

Browse files
akien-mgaakien-mga
authored
Merge pull request #181 from Calinou/use-anisotropic-filtering
Use anisotropic filtering to improve texture appearance at oblique angles
2 parents 32f43f4 + 1118faf commit adc0ec7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+406
-508
lines changed

‎door/model/door.tres

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,23 @@
1-
[gd_resource type="StandardMaterial3D" load_steps=5 format=2]
1+
[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://bjy37rys7arg0"]
22

3-
[ext_resource path="res://door/textures/door_orm.png" type="Texture2D" id=1]
4-
[ext_resource path="res://door/textures/door_emission.png" type="Texture2D" id=2]
5-
[ext_resource path="res://door/textures/door_normal.png" type="Texture2D" id=3]
6-
[ext_resource path="res://door/textures/door_albedo.png" type="Texture2D" id=4]
3+
[ext_resource type="Texture2D" uid="uid://c0gly8oy0hsbg" path="res://door/textures/door_orm.png" id="1"]
4+
[ext_resource type="Texture2D" uid="uid://cgimqwcsyb6eu" path="res://door/textures/door_emission.png" id="2"]
5+
[ext_resource type="Texture2D" uid="uid://bstx1dlfh05i1" path="res://door/textures/door_normal.png" id="3"]
6+
[ext_resource type="Texture2D" uid="uid://bhtkq1wnlj0gm" path="res://door/textures/door_albedo.png" id="4"]
77

88
[resource]
99
resource_name = "door"
10-
albedo_texture = ExtResource( 4 )
10+
albedo_texture = ExtResource("4")
1111
metallic = 1.0
12-
metallic_texture = ExtResource( 1 )
12+
metallic_texture = ExtResource("1")
1313
metallic_texture_channel = 2
14-
roughness_texture = ExtResource( 1 )
14+
roughness_texture = ExtResource("1")
1515
roughness_texture_channel = 1
1616
emission_enabled = true
17-
emission = Color( 0, 0, 0, 1 )
18-
emission_energy = 3.0
19-
emission_operator = 0
20-
emission_on_uv2 = false
21-
emission_texture = ExtResource( 2 )
17+
emission_energy_multiplier = 3.0
18+
emission_texture = ExtResource("2")
2219
normal_enabled = true
23-
normal_scale = 1.0
24-
normal_texture = ExtResource( 3 )
20+
normal_texture = ExtResource("3")
2521
ao_enabled = true
26-
ao_light_affect = 0.0
27-
ao_texture = ExtResource( 1 )
28-
ao_on_uv2 = false
29-
ao_texture_channel = 0
22+
ao_texture = ExtResource("1")
23+
texture_filter = 5

‎enemies/red_robot/laser/impact_effect/LightRays.png.import

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@
33
importer="texture"
44
type="CompressedTexture2D"
55
uid="uid://clqkmuqdlo4rh"
6-
path.s3tc="res://.godot/imported/LightRays.png-6ea2289055a4cb601788902fdea82c53.s3tc.ctex"
6+
path="res://.godot/imported/LightRays.png-6ea2289055a4cb601788902fdea82c53.ctex"
77
metadata={
8-
"imported_formats": ["s3tc_bptc"],
9-
"vram_texture": true
8+
"vram_texture": false
109
}
1110

1211
[deps]
1312

1413
source_file="res://enemies/red_robot/laser/impact_effect/LightRays.png"
15-
dest_files=["res://.godot/imported/LightRays.png-6ea2289055a4cb601788902fdea82c53.s3tc.ctex"]
14+
dest_files=["res://.godot/imported/LightRays.png-6ea2289055a4cb601788902fdea82c53.ctex"]
1615

1716
[params]
1817

19-
compress/mode=2
18+
compress/mode=0
2019
compress/high_quality=false
2120
compress/lossy_quality=0.7
2221
compress/hdr_compression=1

‎enemies/red_robot/model/EvilRobo.tres

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,23 @@
1-
[gd_resource type="StandardMaterial3D" load_steps=5 format=2]
1+
[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://ba4cx232blvi7"]
22

3-
[ext_resource path="res://enemies/red_robot/textures/red_robot_emission.png" type="Texture2D" id=1]
4-
[ext_resource path="res://enemies/red_robot/textures/red_robot_normal.png" type="Texture2D" id=2]
5-
[ext_resource path="res://enemies/red_robot/textures/red_robot_orm.png" type="Texture2D" id=3]
6-
[ext_resource path="res://enemies/red_robot/textures/red_robot_albedo.png" type="Texture2D" id=4]
3+
[ext_resource type="Texture2D" uid="uid://buosl00vcjypt" path="res://enemies/red_robot/textures/red_robot_emission.png" id="1"]
4+
[ext_resource type="Texture2D" uid="uid://daxby8xdf31fb" path="res://enemies/red_robot/textures/red_robot_normal.png" id="2"]
5+
[ext_resource type="Texture2D" uid="uid://c0o7286nq1di4" path="res://enemies/red_robot/textures/red_robot_orm.png" id="3"]
6+
[ext_resource type="Texture2D" uid="uid://bwosvc562wtg7" path="res://enemies/red_robot/textures/red_robot_albedo.png" id="4"]
77

88
[resource]
99
resource_name = "EvilRobo"
10-
albedo_texture = ExtResource( 4 )
10+
albedo_texture = ExtResource("4")
1111
metallic = 0.5
12-
metallic_texture = ExtResource( 3 )
12+
metallic_texture = ExtResource("3")
1313
metallic_texture_channel = 2
14-
roughness_texture = ExtResource( 3 )
14+
roughness_texture = ExtResource("3")
1515
roughness_texture_channel = 1
1616
emission_enabled = true
17-
emission = Color( 0, 0, 0, 1 )
18-
emission_energy = 4.0
19-
emission_operator = 0
20-
emission_on_uv2 = false
21-
emission_texture = ExtResource( 1 )
17+
emission_energy_multiplier = 4.0
18+
emission_texture = ExtResource("1")
2219
normal_enabled = true
23-
normal_scale = 1.0
24-
normal_texture = ExtResource( 2 )
20+
normal_texture = ExtResource("2")
2521
ao_enabled = true
26-
ao_light_affect = 0.0
27-
ao_texture = ExtResource( 3 )
28-
ao_on_uv2 = false
29-
ao_texture_channel = 0
22+
ao_texture = ExtResource("3")
23+
texture_filter = 5

‎enemies/red_robot/parts/EvilRobo.tres

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,3 +128,4 @@ normal_enabled = true
128128
normal_texture = ExtResource("2")
129129
ao_enabled = true
130130
ao_texture = ExtResource("3")
131+
texture_filter = 5

‎enemies/red_robot/red_robot.tscn

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10297,8 +10297,6 @@ bones/24/rotation = Quaternion(0.148649, 0.111638, -0.021468, 0.982334)
1029710297
bones/25/rotation = Quaternion(-0.00478714, -0.681487, 0.731769, -0.00823542)
1029810298
bones/26/rotation = Quaternion(0.399233, 0.108838, -0.0188344, 0.910172)
1029910299
bones/29/rotation = Quaternion(0.706577, 0.0273779, -0.0273784, 0.706577)
10300-
bones/30/scale = Vector3(1, 1, 1)
10301-
bones/32/scale = Vector3(1, 1, 1)
1030210300
bones/36/position = Vector3(1.25983, 1.30326, 0.185817)
1030310301
bones/37/rotation = Quaternion(5.33851e-08, -0.707107, 0.707107, 5.33851e-08)
1030410302
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)
1032310321
bones/62/position = Vector3(9.22342, 3.0487, 15.6378)
1032410322

1032510323
[node name="RayFrom" type="BoneAttachment3D" parent="RedRobotModel/Armature/Skeleton3D" index="4"]
10326-
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)
10324+
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)
1032710325
bone_name = "CannonAnimRecoil"
1032810326
bone_idx = 17
1032910327

‎level/forklift/flying_forklift.tres

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,22 @@
1-
[gd_resource type="StandardMaterial3D" load_steps=5 format=2]
1+
[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://bb4rjtvtwl1a3"]
22

3-
[ext_resource path="res://level/forklift/flying_forklift_emission.png" type="Texture2D" id=1]
4-
[ext_resource path="res://level/forklift/flying_forklift_albedo.png" type="Texture2D" id=2]
5-
[ext_resource path="res://level/forklift/flying_forklift_orm.png" type="Texture2D" id=3]
6-
[ext_resource path="res://level/forklift/flying_forklift_normal.png" type="Texture2D" id=4]
3+
[ext_resource type="Texture2D" uid="uid://do3riae3njc8h" path="res://level/forklift/flying_forklift_emission.png" id="1"]
4+
[ext_resource type="Texture2D" uid="uid://b8w456lyydinp" path="res://level/forklift/flying_forklift_albedo.png" id="2"]
5+
[ext_resource type="Texture2D" uid="uid://c02c7iu5666d7" path="res://level/forklift/flying_forklift_orm.png" id="3"]
6+
[ext_resource type="Texture2D" uid="uid://0uccdx3aejn" path="res://level/forklift/flying_forklift_normal.png" id="4"]
77

88
[resource]
99
resource_name = "flying_forklift"
10-
albedo_texture = ExtResource( 2 )
10+
albedo_texture = ExtResource("2")
1111
metallic = 1.0
12-
metallic_texture = ExtResource( 3 )
12+
metallic_texture = ExtResource("3")
1313
metallic_texture_channel = 2
14-
roughness_texture = ExtResource( 3 )
14+
roughness_texture = ExtResource("3")
1515
roughness_texture_channel = 1
1616
emission_enabled = true
17-
emission = Color( 0, 0, 0, 1 )
18-
emission_energy = 1.0
19-
emission_operator = 0
20-
emission_on_uv2 = false
21-
emission_texture = ExtResource( 1 )
17+
emission_texture = ExtResource("1")
2218
normal_enabled = true
23-
normal_scale = 1.0
24-
normal_texture = ExtResource( 4 )
19+
normal_texture = ExtResource("4")
2520
ao_enabled = true
26-
ao_light_affect = 0.0
27-
ao_texture = ExtResource( 3 )
28-
ao_on_uv2 = false
29-
ao_texture_channel = 0
21+
ao_texture = ExtResource("3")
22+
texture_filter = 5

‎level/forklift/mid_cargo_box.tres

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
1-
[gd_resource type="StandardMaterial3D" load_steps=4 format=2]
1+
[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://fqclk6lbdf03"]
22

3-
[ext_resource path="res://level/textures/props/mid_cargo_box_normal.png" type="Texture2D" id=1]
4-
[ext_resource path="res://level/textures/props/mid_cargo_box_albedo.png" type="Texture2D" id=2]
5-
[ext_resource path="res://level/textures/props/mid_cargo_box_orm.png" type="Texture2D" id=3]
3+
[ext_resource type="Texture2D" uid="uid://ctgmrjj6re5t7" path="res://level/textures/props/mid_cargo_box_normal.png" id="1"]
4+
[ext_resource type="Texture2D" uid="uid://b0m02dsx5c8di" path="res://level/textures/props/mid_cargo_box_albedo.png" id="2"]
5+
[ext_resource type="Texture2D" uid="uid://ocdw38ooyy7f" path="res://level/textures/props/mid_cargo_box_orm.png" id="3"]
66

77
[resource]
88
resource_name = "mid_cargo_box"
9-
albedo_texture = ExtResource( 2 )
9+
albedo_texture = ExtResource("2")
1010
metallic = 1.0
11-
metallic_texture = ExtResource( 3 )
11+
metallic_texture = ExtResource("3")
1212
metallic_texture_channel = 2
13-
roughness_texture = ExtResource( 3 )
13+
roughness_texture = ExtResource("3")
1414
roughness_texture_channel = 1
1515
normal_enabled = true
16-
normal_scale = 1.0
17-
normal_texture = ExtResource( 1 )
16+
normal_texture = ExtResource("1")
1817
ao_enabled = true
19-
ao_light_affect = 0.0
20-
ao_texture = ExtResource( 3 )
21-
ao_on_uv2 = false
22-
ao_texture_channel = 0
18+
ao_texture = ExtResource("3")
19+
texture_filter = 5

‎level/geometry/models/column.tres

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
1-
[gd_resource type="StandardMaterial3D" load_steps=4 format=2]
1+
[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://dr0wdfsg5ra6s"]
22

3-
[ext_resource path="res://level/textures/structure/column_orm.png" type="Texture2D" id=1]
4-
[ext_resource path="res://level/textures/structure/column_normal.png" type="Texture2D" id=2]
5-
[ext_resource path="res://level/textures/structure/column_albedo.png" type="Texture2D" id=3]
3+
[ext_resource type="Texture2D" uid="uid://o6y1uu8sgf2g" path="res://level/textures/structure/column_orm.png" id="1"]
4+
[ext_resource type="Texture2D" uid="uid://24qvfgi838qc" path="res://level/textures/structure/column_normal.png" id="2"]
5+
[ext_resource type="Texture2D" uid="uid://cytco2ywnxs4d" path="res://level/textures/structure/column_albedo.png" id="3"]
66

77
[resource]
88
resource_name = "column"
9-
albedo_texture = ExtResource( 3 )
9+
albedo_texture = ExtResource("3")
1010
metallic = 0.5
11-
metallic_texture = ExtResource( 1 )
11+
metallic_texture = ExtResource("1")
1212
metallic_texture_channel = 2
13-
roughness_texture = ExtResource( 1 )
13+
roughness_texture = ExtResource("1")
1414
roughness_texture_channel = 1
1515
normal_enabled = true
16-
normal_scale = 1.0
17-
normal_texture = ExtResource( 2 )
16+
normal_texture = ExtResource("2")
1817
ao_enabled = true
19-
ao_light_affect = 0.0
20-
ao_texture = ExtResource( 1 )
21-
ao_on_uv2 = false
22-
ao_texture_channel = 0
18+
ao_texture = ExtResource("1")
19+
texture_filter = 5

‎level/geometry/models/container2.tres

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
1-
[gd_resource type="StandardMaterial3D" load_steps=4 format=2]
1+
[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://hcao661fvytd"]
22

3-
[ext_resource path="res://level/textures/props/container2_orm.png" type="Texture2D" id=1]
4-
[ext_resource path="res://level/textures/props/container2_normal.png" type="Texture2D" id=2]
5-
[ext_resource path="res://level/textures/props/container2_albedo.png" type="Texture2D" id=3]
3+
[ext_resource type="Texture2D" uid="uid://cdxqpvqe8ocfw" path="res://level/textures/props/container2_orm.png" id="1"]
4+
[ext_resource type="Texture2D" uid="uid://c1rl8jqrw1er8" path="res://level/textures/props/container2_normal.png" id="2"]
5+
[ext_resource type="Texture2D" uid="uid://bgokbxnx081fo" path="res://level/textures/props/container2_albedo.png" id="3"]
66

77
[resource]
88
resource_name = "container2"
9-
albedo_texture = ExtResource( 3 )
9+
albedo_texture = ExtResource("3")
1010
metallic = 0.5
11-
metallic_texture = ExtResource( 1 )
11+
metallic_texture = ExtResource("1")
1212
metallic_texture_channel = 2
13-
roughness_texture = ExtResource( 1 )
13+
roughness_texture = ExtResource("1")
1414
roughness_texture_channel = 1
1515
normal_enabled = true
16-
normal_scale = 1.0
17-
normal_texture = ExtResource( 2 )
16+
normal_texture = ExtResource("2")
1817
ao_enabled = true
19-
ao_light_affect = 0.0
20-
ao_texture = ExtResource( 1 )
21-
ao_on_uv2 = false
22-
ao_texture_channel = 0
18+
ao_texture = ExtResource("1")
19+
texture_filter = 5

‎level/geometry/models/container3.tres

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
1-
[gd_resource type="StandardMaterial3D" load_steps=4 format=2]
1+
[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://csax6570b6dwk"]
22

3-
[ext_resource path="res://level/textures/props/container3_normal.png" type="Texture2D" id=1]
4-
[ext_resource path="res://level/textures/props/container3_orm.png" type="Texture2D" id=2]
5-
[ext_resource path="res://level/textures/props/container3_albedo.png" type="Texture2D" id=3]
3+
[ext_resource type="Texture2D" uid="uid://cv6gpsrjo834d" path="res://level/textures/props/container3_normal.png" id="1"]
4+
[ext_resource type="Texture2D" uid="uid://baepkjfs6fd3g" path="res://level/textures/props/container3_orm.png" id="2"]
5+
[ext_resource type="Texture2D" uid="uid://gevxqfgego6g" path="res://level/textures/props/container3_albedo.png" id="3"]
66

77
[resource]
88
resource_name = "container3"
9-
albedo_texture = ExtResource( 3 )
9+
albedo_texture = ExtResource("3")
1010
metallic = 0.5
11-
metallic_texture = ExtResource( 2 )
11+
metallic_texture = ExtResource("2")
1212
metallic_texture_channel = 2
13-
roughness_texture = ExtResource( 2 )
13+
roughness_texture = ExtResource("2")
1414
roughness_texture_channel = 2
1515
normal_enabled = true
16-
normal_scale = 1.0
17-
normal_texture = ExtResource( 1 )
16+
normal_texture = ExtResource("1")
1817
ao_enabled = true
19-
ao_light_affect = 0.0
20-
ao_texture = ExtResource( 2 )
21-
ao_on_uv2 = false
22-
ao_texture_channel = 0
18+
ao_texture = ExtResource("2")
19+
texture_filter = 5

0 commit comments

Comments
 (0)