zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-06-06 08:42:35 +00:00
Code Activity

fix: always make an a material a textured one

Browse Source
This commit is contained in:
LJW-Dev
2026-04-19 20:12:58 +08:00
committed by Jan Laupetin
parent 1191322abe
commit 855825c6de
1 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjLoading/Game/T6/BSP/BSPCreator.cpp
+2 -18
View File
@@ -985,9 +985,8 @@ namespace
else else
throw GltfLoadException("Materials must have a name."); 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.x = (*jsMaterial.pbrMetallicRoughness->baseColorFactor)[0];
material.materialColour.y = (*jsMaterial.pbrMetallicRoughness->baseColorFactor)[1]; material.materialColour.y = (*jsMaterial.pbrMetallicRoughness->baseColorFactor)[1];
@@ -996,21 +995,6 @@ namespace
} }
else 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;
}
else
{
material.materialType = MATERIAL_TYPE_COLOUR;
material.materialColour.x = 1.0f; material.materialColour.x = 1.0f;
material.materialColour.y = 1.0f; material.materialColour.y = 1.0f;
material.materialColour.z = 1.0f; material.materialColour.z = 1.0f;