From 855825c6de7b6c200e9186998df53d40bd425331 Mon Sep 17 00:00:00 2001 From: LJW-Dev <48092720+LJW-Dev@users.noreply.github.com> Date: Sun, 19 Apr 2026 20:12:58 +0800 Subject: [PATCH] fix: always make an a material a textured one --- src/ObjLoading/Game/T6/BSP/BSPCreator.cpp | 28 +++++------------------ 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/src/ObjLoading/Game/T6/BSP/BSPCreator.cpp b/src/ObjLoading/Game/T6/BSP/BSPCreator.cpp index 2935adc3..f75f759e 100644 --- a/src/ObjLoading/Game/T6/BSP/BSPCreator.cpp +++ b/src/ObjLoading/Game/T6/BSP/BSPCreator.cpp @@ -985,32 +985,16 @@ namespace else throw GltfLoadException("Materials must have a name."); - if (jsMaterial.pbrMetallicRoughness) + material.materialType = MATERIAL_TYPE_TEXTURE; + if (jsMaterial.pbrMetallicRoughness && jsMaterial.pbrMetallicRoughness->baseColorFactor) { - if (jsMaterial.pbrMetallicRoughness->baseColorFactor) - { - material.materialColour.x = (*jsMaterial.pbrMetallicRoughness->baseColorFactor)[0]; - material.materialColour.y = (*jsMaterial.pbrMetallicRoughness->baseColorFactor)[1]; - material.materialColour.z = (*jsMaterial.pbrMetallicRoughness->baseColorFactor)[2]; - material.materialColour.w = (*jsMaterial.pbrMetallicRoughness->baseColorFactor)[3]; - } - else - { - - material.materialColour.x = 1.0f; - material.materialColour.y = 1.0f; - material.materialColour.z = 1.0f; - material.materialColour.w = 1.0f; - } - - if (jsMaterial.pbrMetallicRoughness->baseColorTexture) - material.materialType = MATERIAL_TYPE_TEXTURE; - else - material.materialType = MATERIAL_TYPE_COLOUR; + material.materialColour.x = (*jsMaterial.pbrMetallicRoughness->baseColorFactor)[0]; + material.materialColour.y = (*jsMaterial.pbrMetallicRoughness->baseColorFactor)[1]; + material.materialColour.z = (*jsMaterial.pbrMetallicRoughness->baseColorFactor)[2]; + material.materialColour.w = (*jsMaterial.pbrMetallicRoughness->baseColorFactor)[3]; } else { - material.materialType = MATERIAL_TYPE_COLOUR; material.materialColour.x = 1.0f; material.materialColour.y = 1.0f; material.materialColour.z = 1.0f;