zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-05-09 22:14:56 +00:00
Code Issues Packages Projects Wiki Activity

Check not only texture semantic but also name start and end to ensure to pick colormap for exporting models

Browse Source
This commit is contained in:
Jan 2021-08-13 23:58:56 +02:00
parent a43d8bdd34
commit bd9110fbb3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.cpp
View File

@ -41,7 +41,8 @@ void AssetDumperXModel::AddObjMaterials(ObjWriter& writer, DistinctMapper<Materi
switch (texture.semantic) switch (texture.semantic)
{ {
case TS_COLOR_MAP: case TS_COLOR_MAP:
colorMap = texture.u.image; if (texture.nameStart == 'c' && texture.nameEnd == 'p')
colorMap = texture.u.image;
break; break;
// Disabled due to looking weird in Blender // Disabled due to looking weird in Blender
@ -92,11 +93,9 @@ void AssetDumperXModel::AddObjVertices(ObjWriter& writer, const XModelSurfs* mod
const auto& v = surface.verts0[vertexIndex]; const auto& v = surface.verts0[vertexIndex];
vec2_t uv; vec2_t uv;
vec3_t normalVec; vec3_t normalVec;
vec4_t color;
Common::Vec2UnpackTexCoords(v.texCoord, &uv); Common::Vec2UnpackTexCoords(v.texCoord, &uv);
Common::Vec3UnpackUnitVec(v.normal, &normalVec); Common::Vec3UnpackUnitVec(v.normal, &normalVec);
Common::Vec4UnpackGfxColor(v.color, &color);
ObjVertex objVertex{}; ObjVertex objVertex{};
ObjNormal objNormal{}; ObjNormal objNormal{};
@ -254,7 +253,7 @@ void AssetDumperXModel::AddXModelMaterials(AbstractXModelWriter& writer, Distinc
for (auto textureIndex = 0; textureIndex < material->textureCount; textureIndex++) for (auto textureIndex = 0; textureIndex < material->textureCount; textureIndex++)
{ {
const auto* textureTableEntry = &material->textureTable[textureIndex]; const auto* textureTableEntry = &material->textureTable[textureIndex];
if (textureTableEntry->semantic == TS_COLOR_MAP && textureTableEntry->u.image) if (textureTableEntry->semantic == TS_COLOR_MAP && textureTableEntry->nameStart == 'c' && textureTableEntry->nameEnd == 'p' && textureTableEntry->u.image)
{ {
xMaterial.colorMapName = textureTableEntry->u.image->name; xMaterial.colorMapName = textureTableEntry->u.image->name;
break; break;