From 0ab67e45779cc7edf13c9cfdfc5079aba6f181ea Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Mon, 13 May 2024 03:38:12 +0200 Subject: [PATCH] Fix invalid UID warnings when loading Sponza by resaving all materials --- thirdparty/sponza/Material__25.tres | 4 ++-- thirdparty/sponza/Material__298.tres | 4 ++-- thirdparty/sponza/Material__57.tres | 2 +- thirdparty/sponza/arch.tres | 2 +- thirdparty/sponza/bricks.tres | 2 +- thirdparty/sponza/ceiling.tres | 2 +- thirdparty/sponza/chain.tres | 4 ++-- thirdparty/sponza/column_a.tres | 4 ++-- thirdparty/sponza/column_b.tres | 4 ++-- thirdparty/sponza/column_c.tres | 4 ++-- thirdparty/sponza/details.tres | 2 +- thirdparty/sponza/fabric_a.tres | 2 +- thirdparty/sponza/fabric_c.tres | 2 +- thirdparty/sponza/fabric_d.tres | 2 +- thirdparty/sponza/fabric_e.tres | 2 +- thirdparty/sponza/fabric_f.tres | 2 +- thirdparty/sponza/fabric_g.tres | 2 +- thirdparty/sponza/flagpole.tres | 2 +- thirdparty/sponza/leaf.tres | 4 ++-- thirdparty/sponza/roof.tres | 2 +- thirdparty/sponza/sponza.glb.import | 5 +++++ thirdparty/sponza/vase.tres | 2 +- thirdparty/sponza/vase_hanging.tres | 2 +- thirdparty/sponza/vase_round.tres | 4 ++-- 24 files changed, 36 insertions(+), 31 deletions(-) diff --git a/thirdparty/sponza/Material__25.tres b/thirdparty/sponza/Material__25.tres index 89dcac0..fe03040 100644 --- a/thirdparty/sponza/Material__25.tres +++ b/thirdparty/sponza/Material__25.tres @@ -1,7 +1,7 @@ [gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://hs2ob5edfwom"] -[ext_resource type="Texture2D" uid="uid://dkub6fpbj3o0r" path="res://thirdparty/sponza/textures/lion.webp" id="1_tnn7u"] -[ext_resource type="Texture2D" uid="uid://cx87f7q45oulv" path="res://thirdparty/sponza/textures/lion_ddn.webp" id="2_prxi6"] +[ext_resource type="Texture2D" uid="uid://b4bal7tk2os30" path="res://thirdparty/sponza/textures/lion.webp" id="1_tnn7u"] +[ext_resource type="Texture2D" uid="uid://doihj4aiajwes" path="res://thirdparty/sponza/textures/lion_ddn.webp" id="2_prxi6"] [resource] resource_name = "Material__25" diff --git a/thirdparty/sponza/Material__298.tres b/thirdparty/sponza/Material__298.tres index 234141e..e0c3356 100644 --- a/thirdparty/sponza/Material__298.tres +++ b/thirdparty/sponza/Material__298.tres @@ -1,7 +1,7 @@ [gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://cujxyiepujuat"] -[ext_resource type="Texture2D" uid="uid://clipou3fhmvxj" path="res://thirdparty/sponza/textures/background.webp" id="1_7atb2"] -[ext_resource type="Texture2D" uid="uid://lbhsqbq5crv6" path="res://thirdparty/sponza/textures/background_ddn.webp" id="2_ejjwe"] +[ext_resource type="Texture2D" uid="uid://25g5gn5oqyl5" path="res://thirdparty/sponza/textures/background.webp" id="1_7atb2"] +[ext_resource type="Texture2D" uid="uid://b5tqyajuyauyg" path="res://thirdparty/sponza/textures/background_ddn.webp" id="2_ejjwe"] [resource] resource_name = "Material__298" diff --git a/thirdparty/sponza/Material__57.tres b/thirdparty/sponza/Material__57.tres index b47d42c..82ced3c 100644 --- a/thirdparty/sponza/Material__57.tres +++ b/thirdparty/sponza/Material__57.tres @@ -1,6 +1,6 @@ [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://cj1vtf8mboe12"] -[ext_resource type="Texture2D" uid="uid://drdycbp6gcpjn" path="res://thirdparty/sponza/textures/vase_plant.webp" id="1_bpr0x"] +[ext_resource type="Texture2D" uid="uid://dalcyia3mcbag" path="res://thirdparty/sponza/textures/vase_plant.webp" id="1_bpr0x"] [resource] resource_name = "Material__57" diff --git a/thirdparty/sponza/arch.tres b/thirdparty/sponza/arch.tres index 025de18..c41cbeb 100644 --- a/thirdparty/sponza/arch.tres +++ b/thirdparty/sponza/arch.tres @@ -1,6 +1,6 @@ [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://bxra8tljpa4eg"] -[ext_resource type="Texture2D" uid="uid://bgvqoi1hqfkk" path="res://thirdparty/sponza/textures/sponza_arch_diff.webp" id="1_1ftcv"] +[ext_resource type="Texture2D" uid="uid://d0uvi1xyjs8bl" path="res://thirdparty/sponza/textures/sponza_arch_diff.webp" id="1_1ftcv"] [resource] resource_name = "arch" diff --git a/thirdparty/sponza/bricks.tres b/thirdparty/sponza/bricks.tres index 58bf653..d9e363f 100644 --- a/thirdparty/sponza/bricks.tres +++ b/thirdparty/sponza/bricks.tres @@ -1,6 +1,6 @@ [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://cvym4sc3s4aet"] -[ext_resource type="Texture2D" uid="uid://62k2ptb2o6mb" path="res://thirdparty/sponza/textures/spnza_bricks_a_diff.webp" id="1_3516i"] +[ext_resource type="Texture2D" uid="uid://d4f5j1x1gh7ee" path="res://thirdparty/sponza/textures/spnza_bricks_a_diff.webp" id="1_3516i"] [resource] resource_name = "bricks" diff --git a/thirdparty/sponza/ceiling.tres b/thirdparty/sponza/ceiling.tres index 3c76af9..c2e7bc9 100644 --- a/thirdparty/sponza/ceiling.tres +++ b/thirdparty/sponza/ceiling.tres @@ -1,6 +1,6 @@ [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://cq7to4no56eux"] -[ext_resource type="Texture2D" uid="uid://bp6u702m0hn1g" path="res://thirdparty/sponza/textures/sponza_ceiling_a_diff.webp" id="1_qqtfa"] +[ext_resource type="Texture2D" uid="uid://dylb0y22dioxq" path="res://thirdparty/sponza/textures/sponza_ceiling_a_diff.webp" id="1_qqtfa"] [resource] resource_name = "ceiling" diff --git a/thirdparty/sponza/chain.tres b/thirdparty/sponza/chain.tres index b6024cf..972388f 100644 --- a/thirdparty/sponza/chain.tres +++ b/thirdparty/sponza/chain.tres @@ -1,7 +1,7 @@ [gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://cfx2ekbwhhggp"] -[ext_resource type="Texture2D" uid="uid://dcxb6tmdvaoeh" path="res://thirdparty/sponza/textures/chain_texture.webp" id="1_eqp7h"] -[ext_resource type="Texture2D" uid="uid://cdy41v8ops2yo" path="res://thirdparty/sponza/textures/chain_texture_ddn.webp" id="2_2kx3d"] +[ext_resource type="Texture2D" uid="uid://cahwai6iktk52" path="res://thirdparty/sponza/textures/chain_texture.webp" id="1_eqp7h"] +[ext_resource type="Texture2D" uid="uid://h5vhlxdy14rc" path="res://thirdparty/sponza/textures/chain_texture_ddn.webp" id="2_2kx3d"] [resource] resource_name = "chain" diff --git a/thirdparty/sponza/column_a.tres b/thirdparty/sponza/column_a.tres index b688ab8..a734164 100644 --- a/thirdparty/sponza/column_a.tres +++ b/thirdparty/sponza/column_a.tres @@ -1,7 +1,7 @@ [gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://ucu8bs3r1jif"] -[ext_resource type="Texture2D" uid="uid://brbt3nvc6l8m2" path="res://thirdparty/sponza/textures/sponza_column_a_diff.webp" id="1_p6qpp"] -[ext_resource type="Texture2D" uid="uid://df5jk5wj07bh3" path="res://thirdparty/sponza/textures/sponza_column_a_ddn.webp" id="2_myx5k"] +[ext_resource type="Texture2D" uid="uid://nh5iykn5xi4w" path="res://thirdparty/sponza/textures/sponza_column_a_diff.webp" id="1_p6qpp"] +[ext_resource type="Texture2D" uid="uid://cc8rd7jf7g6q3" path="res://thirdparty/sponza/textures/sponza_column_a_ddn.webp" id="2_myx5k"] [resource] resource_name = "column_a" diff --git a/thirdparty/sponza/column_b.tres b/thirdparty/sponza/column_b.tres index 3e446fe..2997407 100644 --- a/thirdparty/sponza/column_b.tres +++ b/thirdparty/sponza/column_b.tres @@ -1,7 +1,7 @@ [gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://dfacanouflrfy"] -[ext_resource type="Texture2D" uid="uid://cmytc08hduswr" path="res://thirdparty/sponza/textures/sponza_column_b_diff.webp" id="1_p23kf"] -[ext_resource type="Texture2D" uid="uid://ebr4li6258pp" path="res://thirdparty/sponza/textures/sponza_column_b_ddn.webp" id="2_fuuma"] +[ext_resource type="Texture2D" uid="uid://c2r8w86rfxk4x" path="res://thirdparty/sponza/textures/sponza_column_b_diff.webp" id="1_p23kf"] +[ext_resource type="Texture2D" uid="uid://bhdmxc5rikwba" path="res://thirdparty/sponza/textures/sponza_column_b_ddn.webp" id="2_fuuma"] [resource] resource_name = "column_b" diff --git a/thirdparty/sponza/column_c.tres b/thirdparty/sponza/column_c.tres index a7d2f54..0564d65 100644 --- a/thirdparty/sponza/column_c.tres +++ b/thirdparty/sponza/column_c.tres @@ -1,7 +1,7 @@ [gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://bc543ekonhvyf"] -[ext_resource type="Texture2D" uid="uid://ch2qtl5gaiaf1" path="res://thirdparty/sponza/textures/sponza_column_c_diff.webp" id="1_n7bhk"] -[ext_resource type="Texture2D" uid="uid://bdrybxhvb125c" path="res://thirdparty/sponza/textures/sponza_column_c_ddn.webp" id="2_jx7v4"] +[ext_resource type="Texture2D" uid="uid://dlmup25jjvhhc" path="res://thirdparty/sponza/textures/sponza_column_c_diff.webp" id="1_n7bhk"] +[ext_resource type="Texture2D" uid="uid://kjyyeuqjai8u" path="res://thirdparty/sponza/textures/sponza_column_c_ddn.webp" id="2_jx7v4"] [resource] resource_name = "column_c" diff --git a/thirdparty/sponza/details.tres b/thirdparty/sponza/details.tres index ddc5206..5163e70 100644 --- a/thirdparty/sponza/details.tres +++ b/thirdparty/sponza/details.tres @@ -1,6 +1,6 @@ [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://bxledl2mfrmyo"] -[ext_resource type="Texture2D" uid="uid://ekrij1dc03uk" path="res://thirdparty/sponza/textures/sponza_details_diff.webp" id="1_xyq0w"] +[ext_resource type="Texture2D" uid="uid://cpt8nd7od6e1t" path="res://thirdparty/sponza/textures/sponza_details_diff.webp" id="1_xyq0w"] [resource] resource_name = "details" diff --git a/thirdparty/sponza/fabric_a.tres b/thirdparty/sponza/fabric_a.tres index 310bfdb..f0d19f6 100644 --- a/thirdparty/sponza/fabric_a.tres +++ b/thirdparty/sponza/fabric_a.tres @@ -1,6 +1,6 @@ [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://b2k5wm0umiyg"] -[ext_resource type="Texture2D" uid="uid://d0cd8gxluuab7" path="res://thirdparty/sponza/textures/sponza_fabric_diff.webp" id="1_roq6h"] +[ext_resource type="Texture2D" uid="uid://bbi7pw21x25h5" path="res://thirdparty/sponza/textures/sponza_fabric_diff.webp" id="1_roq6h"] [resource] resource_name = "fabric_a" diff --git a/thirdparty/sponza/fabric_c.tres b/thirdparty/sponza/fabric_c.tres index ce8b152..e3822db 100644 --- a/thirdparty/sponza/fabric_c.tres +++ b/thirdparty/sponza/fabric_c.tres @@ -1,6 +1,6 @@ [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://bgrv88wce7ond"] -[ext_resource type="Texture2D" uid="uid://o4gr4nm52rlo" path="res://thirdparty/sponza/textures/sponza_curtain_diff.webp" id="1_pw5sx"] +[ext_resource type="Texture2D" uid="uid://b1xu7jewqh8mf" path="res://thirdparty/sponza/textures/sponza_curtain_diff.webp" id="1_pw5sx"] [resource] resource_name = "fabric_c" diff --git a/thirdparty/sponza/fabric_d.tres b/thirdparty/sponza/fabric_d.tres index 681472c..cbea7b4 100644 --- a/thirdparty/sponza/fabric_d.tres +++ b/thirdparty/sponza/fabric_d.tres @@ -1,6 +1,6 @@ [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://1b35kbua7c1l"] -[ext_resource type="Texture2D" uid="uid://qcdx5nms8qye" path="res://thirdparty/sponza/textures/sponza_fabric_blue_diff.webp" id="1_weenx"] +[ext_resource type="Texture2D" uid="uid://ca14n8tvyesc" path="res://thirdparty/sponza/textures/sponza_fabric_blue_diff.webp" id="1_weenx"] [resource] resource_name = "fabric_d" diff --git a/thirdparty/sponza/fabric_e.tres b/thirdparty/sponza/fabric_e.tres index 20c59e5..4dc48bc 100644 --- a/thirdparty/sponza/fabric_e.tres +++ b/thirdparty/sponza/fabric_e.tres @@ -1,6 +1,6 @@ [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://dxghi28dk231n"] -[ext_resource type="Texture2D" uid="uid://eke5bnjw2wmu" path="res://thirdparty/sponza/textures/sponza_fabric_green_diff.webp" id="1_vx7aa"] +[ext_resource type="Texture2D" uid="uid://c2aa716m18kun" path="res://thirdparty/sponza/textures/sponza_fabric_green_diff.webp" id="1_vx7aa"] [resource] resource_name = "fabric_e" diff --git a/thirdparty/sponza/fabric_f.tres b/thirdparty/sponza/fabric_f.tres index cd0cfc7..80c5634 100644 --- a/thirdparty/sponza/fabric_f.tres +++ b/thirdparty/sponza/fabric_f.tres @@ -1,6 +1,6 @@ [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://wob3ru8lvm6t"] -[ext_resource type="Texture2D" uid="uid://tc1y3mhctyw1" path="res://thirdparty/sponza/textures/sponza_curtain_green_diff.webp" id="1_wibte"] +[ext_resource type="Texture2D" uid="uid://e7nljjp7ia2j" path="res://thirdparty/sponza/textures/sponza_curtain_green_diff.webp" id="1_wibte"] [resource] resource_name = "fabric_f" diff --git a/thirdparty/sponza/fabric_g.tres b/thirdparty/sponza/fabric_g.tres index b1ea2d3..0d2841c 100644 --- a/thirdparty/sponza/fabric_g.tres +++ b/thirdparty/sponza/fabric_g.tres @@ -1,6 +1,6 @@ [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://yyr032hvmw4v"] -[ext_resource type="Texture2D" uid="uid://km0r414keg4m" path="res://thirdparty/sponza/textures/sponza_curtain_blue_diff.webp" id="1_mmtlw"] +[ext_resource type="Texture2D" uid="uid://c6fn16xu6jiin" path="res://thirdparty/sponza/textures/sponza_curtain_blue_diff.webp" id="1_mmtlw"] [resource] resource_name = "fabric_g" diff --git a/thirdparty/sponza/flagpole.tres b/thirdparty/sponza/flagpole.tres index f29d341..ecfb92d 100644 --- a/thirdparty/sponza/flagpole.tres +++ b/thirdparty/sponza/flagpole.tres @@ -1,6 +1,6 @@ [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://cwatjyk4hqkhn"] -[ext_resource type="Texture2D" uid="uid://pvlycu0rk1d4" path="res://thirdparty/sponza/textures/sponza_flagpole_diff.webp" id="1_tvdlb"] +[ext_resource type="Texture2D" uid="uid://xisl0qrj1h1u" path="res://thirdparty/sponza/textures/sponza_flagpole_diff.webp" id="1_tvdlb"] [resource] resource_name = "flagpole" diff --git a/thirdparty/sponza/leaf.tres b/thirdparty/sponza/leaf.tres index d5f9abf..e3c17a6 100644 --- a/thirdparty/sponza/leaf.tres +++ b/thirdparty/sponza/leaf.tres @@ -1,7 +1,7 @@ [gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://bfeekuxw8xn3c"] -[ext_resource type="Texture2D" uid="uid://4ddsefheyfvd" path="res://thirdparty/sponza/textures/sponza_thorn_diff.webp" id="1_1xbna"] -[ext_resource type="Texture2D" uid="uid://bjksnrd26o88d" path="res://thirdparty/sponza/textures/sponza_thorn_ddn.webp" id="2_wijuo"] +[ext_resource type="Texture2D" uid="uid://bdqmxodvt6h5o" path="res://thirdparty/sponza/textures/sponza_thorn_diff.webp" id="1_1xbna"] +[ext_resource type="Texture2D" uid="uid://o2hkv5gf0g5w" path="res://thirdparty/sponza/textures/sponza_thorn_ddn.webp" id="2_wijuo"] [resource] resource_name = "leaf" diff --git a/thirdparty/sponza/roof.tres b/thirdparty/sponza/roof.tres index 3457c52..b20c7a9 100644 --- a/thirdparty/sponza/roof.tres +++ b/thirdparty/sponza/roof.tres @@ -1,6 +1,6 @@ [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://c4tpifbg7wrtp"] -[ext_resource type="Texture2D" uid="uid://chjkjxwkaiah4" path="res://thirdparty/sponza/textures/sponza_roof_diff.webp" id="1_kngsu"] +[ext_resource type="Texture2D" uid="uid://8cw1nbwrke7s" path="res://thirdparty/sponza/textures/sponza_roof_diff.webp" id="1_kngsu"] [resource] resource_name = "roof" diff --git a/thirdparty/sponza/sponza.glb.import b/thirdparty/sponza/sponza.glb.import index 712ff66..fd5dcd1 100644 --- a/thirdparty/sponza/sponza.glb.import +++ b/thirdparty/sponza/sponza.glb.import @@ -17,6 +17,7 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=0.125 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,6 +29,7 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={ "materials": { @@ -133,5 +135,8 @@ _subresources={ } } } +fbx/importer=0 +fbx/allow_geometry_helper_nodes=false +fbx/embedded_image_handling=1 gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/thirdparty/sponza/vase.tres b/thirdparty/sponza/vase.tres index 47081d3..a7dce6b 100644 --- a/thirdparty/sponza/vase.tres +++ b/thirdparty/sponza/vase.tres @@ -1,6 +1,6 @@ [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://b4mtplnrkl1as"] -[ext_resource type="Texture2D" uid="uid://vaytd7kjqbwg" path="res://thirdparty/sponza/textures/vase_dif.webp" id="1_5avvo"] +[ext_resource type="Texture2D" uid="uid://bngm73rp5d85s" path="res://thirdparty/sponza/textures/vase_dif.webp" id="1_5avvo"] [resource] resource_name = "vase" diff --git a/thirdparty/sponza/vase_hanging.tres b/thirdparty/sponza/vase_hanging.tres index 66b367c..ead7f7a 100644 --- a/thirdparty/sponza/vase_hanging.tres +++ b/thirdparty/sponza/vase_hanging.tres @@ -1,6 +1,6 @@ [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://cd4pd12nq12s5"] -[ext_resource type="Texture2D" uid="uid://cfp60mj1hdyak" path="res://thirdparty/sponza/textures/vase_hanging.webp" id="1_n4gyf"] +[ext_resource type="Texture2D" uid="uid://2vnletmqed4r" path="res://thirdparty/sponza/textures/vase_hanging.webp" id="1_n4gyf"] [resource] resource_name = "vase_hanging" diff --git a/thirdparty/sponza/vase_round.tres b/thirdparty/sponza/vase_round.tres index 648c230..4ccdb66 100644 --- a/thirdparty/sponza/vase_round.tres +++ b/thirdparty/sponza/vase_round.tres @@ -1,7 +1,7 @@ [gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://b6sk1020hpgjf"] -[ext_resource type="Texture2D" uid="uid://c5u8mhvddloaj" path="res://thirdparty/sponza/textures/vase_round.webp" id="1_oxsla"] -[ext_resource type="Texture2D" uid="uid://cgqojvgx21ehy" path="res://thirdparty/sponza/textures/vase_round_ddn.webp" id="2_y24cy"] +[ext_resource type="Texture2D" uid="uid://cb4d4c4o65xnd" path="res://thirdparty/sponza/textures/vase_round.webp" id="1_oxsla"] +[ext_resource type="Texture2D" uid="uid://bng4xf0v8qk77" path="res://thirdparty/sponza/textures/vase_round_ddn.webp" id="2_y24cy"] [resource] resource_name = "vase_round"