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.

Sign up for GitHub

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

Add editor-only roughness and metallic testers to Material Testers #899

Merged
merged 3 commits into from
Mar 29, 2023
Merged

Add editor-only roughness and metallic testers to Material Testers #899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66a0568
Enhancement for the testing material demo - adding roughness values f…
armanpapikyan Mar 29, 2023
1ac2bca
Apply suggestions from code review
Calinou Mar 29, 2023
691b91f
Fix script attachment
Calinou Mar 29, 2023
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
4 changes: 4 additions & 0 deletions 3d/material_testers/hide_on_startup.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
extends Node3D

func _ready():
visible = false
333 changes: 332 additions & 1 deletion 3d/material_testers/material_tester.tscn
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions 3d/material_testers/models/test_bed/test_bed_2.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[gd_scene load_steps=4 format=3 uid="uid://b5nlqjos161db"]

[ext_resource type="PackedScene" uid="uid://c1qfemtam74fa" path="res://models/test_bed/test_bed.glb" id="1_4jxo6"]
[ext_resource type="Material" uid="uid://bh3dtgmpl7gv0" path="res://models/test_bed/small_material.tres" id="2_ds4pc"]
[ext_resource type="Material" uid="uid://1wd862s1kfdy" path="res://models/test_bed/large_material.tres" id="3_00ymf"]

[node name="test_bed" instance=ExtResource("1_4jxo6")]

[node name="SmallPart" parent="." index="0"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 3, 0, 0, 12.5)
material_override = ExtResource("2_ds4pc")

[node name="LargePart" parent="." index="1"]
material_override = ExtResource("3_00ymf")
7 changes: 3 additions & 4 deletions 3d/material_testers/test_materials/aluminium_albedo.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://dsb01xyn6yui5"
path.s3tc="res://.godot/imported/aluminium_albedo.png-a68e22c8a951430ab431b2a7307e8bc7.s3tc.ctex"
path.etc2="res://.godot/imported/aluminium_albedo.png-a68e22c8a951430ab431b2a7307e8bc7.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}

[deps]

source_file="res://test_materials/aluminium_albedo.png"
dest_files=["res://.godot/imported/aluminium_albedo.png-a68e22c8a951430ab431b2a7307e8bc7.s3tc.ctex", "res://.godot/imported/aluminium_albedo.png-a68e22c8a951430ab431b2a7307e8bc7.etc2.ctex"]
dest_files=["res://.godot/imported/aluminium_albedo.png-a68e22c8a951430ab431b2a7307e8bc7.s3tc.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
Expand Down
7 changes: 3 additions & 4 deletions 3d/material_testers/test_materials/aluminium_flow.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://cqlianda7xhoy"
path.s3tc="res://.godot/imported/aluminium_flow.png-93fdac7ed0fa884674e32e5ec0c6d690.s3tc.ctex"
path.etc2="res://.godot/imported/aluminium_flow.png-93fdac7ed0fa884674e32e5ec0c6d690.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}

[deps]

source_file="res://test_materials/aluminium_flow.png"
dest_files=["res://.godot/imported/aluminium_flow.png-93fdac7ed0fa884674e32e5ec0c6d690.s3tc.ctex", "res://.godot/imported/aluminium_flow.png-93fdac7ed0fa884674e32e5ec0c6d690.etc2.ctex"]
dest_files=["res://.godot/imported/aluminium_flow.png-93fdac7ed0fa884674e32e5ec0c6d690.s3tc.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
7 changes: 3 additions & 4 deletions 3d/material_testers/test_materials/aluminium_normal.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://ds1h5kb3sbtqq"
path.s3tc="res://.godot/imported/aluminium_normal.png-ff9bf84211f307b1d9e8bf86ebea04b1.s3tc.ctex"
path.etc2="res://.godot/imported/aluminium_normal.png-ff9bf84211f307b1d9e8bf86ebea04b1.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}

[deps]

source_file="res://test_materials/aluminium_normal.png"
dest_files=["res://.godot/imported/aluminium_normal.png-ff9bf84211f307b1d9e8bf86ebea04b1.s3tc.ctex", "res://.godot/imported/aluminium_normal.png-ff9bf84211f307b1d9e8bf86ebea04b1.etc2.ctex"]
dest_files=["res://.godot/imported/aluminium_normal.png-ff9bf84211f307b1d9e8bf86ebea04b1.s3tc.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=1
compress/channel_pack=0
mipmaps/generate=true
Expand Down
7 changes: 3 additions & 4 deletions 3d/material_testers/test_materials/marble_albedo.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://d1lj5qylojp6o"
path.s3tc="res://.godot/imported/marble_albedo.png-47e5ec5352a78eb204ccaf317de65697.s3tc.ctex"
path.etc2="res://.godot/imported/marble_albedo.png-47e5ec5352a78eb204ccaf317de65697.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}

[deps]

source_file="res://test_materials/marble_albedo.png"
dest_files=["res://.godot/imported/marble_albedo.png-47e5ec5352a78eb204ccaf317de65697.s3tc.ctex", "res://.godot/imported/marble_albedo.png-47e5ec5352a78eb204ccaf317de65697.etc2.ctex"]
dest_files=["res://.godot/imported/marble_albedo.png-47e5ec5352a78eb204ccaf317de65697.s3tc.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
Expand Down
7 changes: 3 additions & 4 deletions 3d/material_testers/test_materials/rock_albedo.jpg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://hul3jcu52o8g"
path.s3tc="res://.godot/imported/rock_albedo.jpg-65fe78b8c7d44da07721bb783fdef67a.s3tc.ctex"
path.etc2="res://.godot/imported/rock_albedo.jpg-65fe78b8c7d44da07721bb783fdef67a.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}

[deps]

source_file="res://test_materials/rock_albedo.jpg"
dest_files=["res://.godot/imported/rock_albedo.jpg-65fe78b8c7d44da07721bb783fdef67a.s3tc.ctex", "res://.godot/imported/rock_albedo.jpg-65fe78b8c7d44da07721bb783fdef67a.etc2.ctex"]
dest_files=["res://.godot/imported/rock_albedo.jpg-65fe78b8c7d44da07721bb783fdef67a.s3tc.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
Expand Down
7 changes: 3 additions & 4 deletions 3d/material_testers/test_materials/rock_ao.jpg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://cjiwyepmfaa2d"
path.s3tc="res://.godot/imported/rock_ao.jpg-7578b4ab1e595c076d796172ca68cfa6.s3tc.ctex"
path.etc2="res://.godot/imported/rock_ao.jpg-7578b4ab1e595c076d796172ca68cfa6.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}

[deps]

source_file="res://test_materials/rock_ao.jpg"
dest_files=["res://.godot/imported/rock_ao.jpg-7578b4ab1e595c076d796172ca68cfa6.s3tc.ctex", "res://.godot/imported/rock_ao.jpg-7578b4ab1e595c076d796172ca68cfa6.etc2.ctex"]
dest_files=["res://.godot/imported/rock_ao.jpg-7578b4ab1e595c076d796172ca68cfa6.s3tc.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
Expand Down
7 changes: 3 additions & 4 deletions 3d/material_testers/test_materials/rock_depth.jpg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://bh3iv3ep28dsq"
path.s3tc="res://.godot/imported/rock_depth.jpg-4080fbc6202f837d0b0deef2c981bad4.s3tc.ctex"
path.etc2="res://.godot/imported/rock_depth.jpg-4080fbc6202f837d0b0deef2c981bad4.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}

[deps]

source_file="res://test_materials/rock_depth.jpg"
dest_files=["res://.godot/imported/rock_depth.jpg-4080fbc6202f837d0b0deef2c981bad4.s3tc.ctex", "res://.godot/imported/rock_depth.jpg-4080fbc6202f837d0b0deef2c981bad4.etc2.ctex"]
dest_files=["res://.godot/imported/rock_depth.jpg-4080fbc6202f837d0b0deef2c981bad4.s3tc.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
7 changes: 3 additions & 4 deletions 3d/material_testers/test_materials/rock_metal.jpg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://cyvm2mj4ibl0"
path.s3tc="res://.godot/imported/rock_metal.jpg-8defa2e9d8169c7a08962c4d1f3e6354.s3tc.ctex"
path.etc2="res://.godot/imported/rock_metal.jpg-8defa2e9d8169c7a08962c4d1f3e6354.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}

[deps]

source_file="res://test_materials/rock_metal.jpg"
dest_files=["res://.godot/imported/rock_metal.jpg-8defa2e9d8169c7a08962c4d1f3e6354.s3tc.ctex", "res://.godot/imported/rock_metal.jpg-8defa2e9d8169c7a08962c4d1f3e6354.etc2.ctex"]
dest_files=["res://.godot/imported/rock_metal.jpg-8defa2e9d8169c7a08962c4d1f3e6354.s3tc.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=1
compress/channel_pack=0
mipmaps/generate=true
Expand Down
7 changes: 3 additions & 4 deletions 3d/material_testers/test_materials/rock_rough.jpg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://d28x4upsru550"
path.s3tc="res://.godot/imported/rock_rough.jpg-a18116680c5cb62b9f0632460fe30f62.s3tc.ctex"
path.etc2="res://.godot/imported/rock_rough.jpg-a18116680c5cb62b9f0632460fe30f62.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}

[deps]

source_file="res://test_materials/rock_rough.jpg"
dest_files=["res://.godot/imported/rock_rough.jpg-a18116680c5cb62b9f0632460fe30f62.s3tc.ctex", "res://.godot/imported/rock_rough.jpg-a18116680c5cb62b9f0632460fe30f62.etc2.ctex"]
dest_files=["res://.godot/imported/rock_rough.jpg-a18116680c5cb62b9f0632460fe30f62.s3tc.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
Expand Down
7 changes: 3 additions & 4 deletions 3d/material_testers/test_materials/sand_albedo.jpg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://8ccausxvepx"
path.s3tc="res://.godot/imported/sand_albedo.jpg-c03140f13a9e6c9b1c6fe52f92bc0e1b.s3tc.ctex"
path.etc2="res://.godot/imported/sand_albedo.jpg-c03140f13a9e6c9b1c6fe52f92bc0e1b.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}

[deps]

source_file="res://test_materials/sand_albedo.jpg"
dest_files=["res://.godot/imported/sand_albedo.jpg-c03140f13a9e6c9b1c6fe52f92bc0e1b.s3tc.ctex", "res://.godot/imported/sand_albedo.jpg-c03140f13a9e6c9b1c6fe52f92bc0e1b.etc2.ctex"]
dest_files=["res://.godot/imported/sand_albedo.jpg-c03140f13a9e6c9b1c6fe52f92bc0e1b.s3tc.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
Expand Down
7 changes: 3 additions & 4 deletions 3d/material_testers/test_materials/sand_metal.jpg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://d1cw5asi5uuhm"
path.s3tc="res://.godot/imported/sand_metal.jpg-bc79f66c3e18060c7cbaa67c44681910.s3tc.ctex"
path.etc2="res://.godot/imported/sand_metal.jpg-bc79f66c3e18060c7cbaa67c44681910.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}

[deps]

source_file="res://test_materials/sand_metal.jpg"
dest_files=["res://.godot/imported/sand_metal.jpg-bc79f66c3e18060c7cbaa67c44681910.s3tc.ctex", "res://.godot/imported/sand_metal.jpg-bc79f66c3e18060c7cbaa67c44681910.etc2.ctex"]
dest_files=["res://.godot/imported/sand_metal.jpg-bc79f66c3e18060c7cbaa67c44681910.s3tc.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
Expand Down
7 changes: 3 additions & 4 deletions 3d/material_testers/test_materials/sand_normal.jpg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://cukid0fpw2pn0"
path.s3tc="res://.godot/imported/sand_normal.jpg-7a18b411efc93de1cffd09e24f6336b4.s3tc.ctex"
path.etc2="res://.godot/imported/sand_normal.jpg-7a18b411efc93de1cffd09e24f6336b4.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}

[deps]

source_file="res://test_materials/sand_normal.jpg"
dest_files=["res://.godot/imported/sand_normal.jpg-7a18b411efc93de1cffd09e24f6336b4.s3tc.ctex", "res://.godot/imported/sand_normal.jpg-7a18b411efc93de1cffd09e24f6336b4.etc2.ctex"]
dest_files=["res://.godot/imported/sand_normal.jpg-7a18b411efc93de1cffd09e24f6336b4.s3tc.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=1
compress/channel_pack=0
mipmaps/generate=true
Expand Down
7 changes: 3 additions & 4 deletions 3d/material_testers/test_materials/sand_rough.jpg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://dn11j7g5oa50e"
path.s3tc="res://.godot/imported/sand_rough.jpg-14616e257ba8a3726af90b2162c4ea2b.s3tc.ctex"
path.etc2="res://.godot/imported/sand_rough.jpg-14616e257ba8a3726af90b2162c4ea2b.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}

[deps]

source_file="res://test_materials/sand_rough.jpg"
dest_files=["res://.godot/imported/sand_rough.jpg-14616e257ba8a3726af90b2162c4ea2b.s3tc.ctex", "res://.godot/imported/sand_rough.jpg-14616e257ba8a3726af90b2162c4ea2b.etc2.ctex"]
dest_files=["res://.godot/imported/sand_rough.jpg-14616e257ba8a3726af90b2162c4ea2b.s3tc.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
Expand Down
2 changes: 1 addition & 1 deletion 3d/material_testers/test_materials/sand_shine.jpg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/sand_shine.jpg-616f02f6faeaa1d08b3581323d96b4
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
Loading