From a2735b4f23ff811bdc1fc5857e720f2272b9a870 Mon Sep 17 00:00:00 2001 From: Jan Date: Fri, 13 Sep 2024 21:51:12 +0200 Subject: [PATCH] chore: use generic xmodel loader and dumper code for t5 --- src/Common/Game/T5/T5_Assets.h | 47 +- src/ObjCommon/Game/T5/XModel/JsonXModel.h | 31 ++ .../T5/AssetLoaders/AssetLoaderXModel.cpp | 42 ++ .../Game/T5/AssetLoaders/AssetLoaderXModel.h | 19 + src/ObjLoading/Game/T5/ObjLoaderT5.cpp | 3 +- .../Game/T5/XModel/XModelLoaderT5.cpp | 49 ++ .../Game/T5/XModel/XModelLoaderT5.h | 13 + .../XModel/GenericXModelLoader.inc.h | 3 + .../T5/AssetDumpers/AssetDumperXModel.cpp | 514 +----------------- .../Game/T5/XModel/XModelDumperT5.cpp | 17 + .../Game/T5/XModel/XModelDumperT5.h | 9 + .../Game/T6/XModel/XModelDumperT6.cpp | 3 +- .../XModel/GenericXModelDumper.inc.h | 34 +- 13 files changed, 243 insertions(+), 541 deletions(-) create mode 100644 src/ObjCommon/Game/T5/XModel/JsonXModel.h create mode 100644 src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderXModel.cpp create mode 100644 src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderXModel.h create mode 100644 src/ObjLoading/Game/T5/XModel/XModelLoaderT5.cpp create mode 100644 src/ObjLoading/Game/T5/XModel/XModelLoaderT5.h create mode 100644 src/ObjWriting/Game/T5/XModel/XModelDumperT5.cpp create mode 100644 src/ObjWriting/Game/T5/XModel/XModelDumperT5.h diff --git a/src/Common/Game/T5/T5_Assets.h b/src/Common/Game/T5/T5_Assets.h index 4c6de811..f055f58c 100644 --- a/src/Common/Game/T5/T5_Assets.h +++ b/src/Common/Game/T5/T5_Assets.h @@ -208,6 +208,8 @@ namespace T5 typedef char cbrushedge_t; typedef tdef_align(128) unsigned int raw_uint128; + typedef uint16_t ScriptString; + struct PhysPreset { const char* name; @@ -459,8 +461,8 @@ namespace T5 struct DObjAnimMat { - float quat[4]; - float trans[3]; + vec4_t quat; + vec3_t trans; float transWeight; }; @@ -490,7 +492,7 @@ namespace T5 struct type_align(16) GfxPackedVertex { - float xyz[3]; + vec3_t xyz; float binormalSign; GfxColor color; PackedTexCoords texCoord; @@ -535,7 +537,12 @@ namespace T5 XSurfaceCollisionTree* collisionTree; }; - typedef tdef_align(16) uint16_t r_index16_t; + struct XSurfaceTri + { + uint16_t i[3]; + }; + + typedef tdef_align(16) XSurfaceTri XSurfaceTri16; struct XSurface { @@ -546,7 +553,7 @@ namespace T5 uint16_t triCount; uint16_t baseTriIndex; uint16_t baseVertIndex; - r_index16_t (*triIndices)[3]; + XSurfaceTri16* triIndices; XSurfaceVertexInfo vertInfo; GfxPackedVertex* verts0; void /*IDirect3DVertexBuffer9*/* vb0; @@ -587,8 +594,8 @@ namespace T5 struct XBoneInfo { - float bounds[2][3]; - float offset[3]; + vec3_t bounds[2]; + vec3_t offset; float radiusSquared; char collmap; }; @@ -657,6 +664,14 @@ namespace T5 PhysGeomList* geomList; }; + enum XModelLodRampType : unsigned char + { + XMODEL_LOD_RAMP_RIGID = 0x0, + XMODEL_LOD_RAMP_SKINNED = 0x1, + + XMODEL_LOD_RAMP_COUNT + }; + struct XModelQuat { int16_t v[4]; @@ -668,12 +683,12 @@ namespace T5 unsigned char numBones; unsigned char numRootBones; unsigned char numsurfs; - char lodRampType; - uint16_t* boneNames; - char* parentList; + XModelLodRampType lodRampType; + ScriptString* boneNames; + unsigned char* parentList; XModelQuat* quats; float* trans; - char* partClassification; + unsigned char* partClassification; DObjAnimMat* baseMat; XSurface* surfs; Material** materialHandles; @@ -684,13 +699,13 @@ namespace T5 int contents; XBoneInfo* boneInfo; float radius; - float mins[3]; - float maxs[3]; + vec3_t mins; + vec3_t maxs; uint16_t numLods; - uint16_t collLod; + int16_t collLod; XModelStreamInfo streamInfo; int memUsage; - int flags; + unsigned int flags; bool bad; PhysPreset* physPreset; unsigned char numCollmaps; @@ -775,7 +790,7 @@ namespace T5 char nameStart; char nameEnd; char samplerState; - char semantic; + unsigned char semantic; // TextureSemantic char isMatureContent; char pad[3]; MaterialTextureDefInfo u; diff --git a/src/ObjCommon/Game/T5/XModel/JsonXModel.h b/src/ObjCommon/Game/T5/XModel/JsonXModel.h new file mode 100644 index 00000000..5b52ca9a --- /dev/null +++ b/src/ObjCommon/Game/T5/XModel/JsonXModel.h @@ -0,0 +1,31 @@ +#pragma once + +#include "Json/JsonCommon.h" +#include +#include +#include +#include + +namespace T5 +{ + class JsonXModelLod + { + public: + std::string file; + float distance; + }; + + NLOHMANN_DEFINE_TYPE_EXTENSION(JsonXModelLod, file, distance); + + class JsonXModel + { + public: + std::vector lods; + std::optional collLod; + std::optional physPreset; + std::optional physConstraints; + unsigned flags; + }; + + NLOHMANN_DEFINE_TYPE_EXTENSION(JsonXModel, lods, collLod, physPreset, physConstraints, flags); +} // namespace T5 diff --git a/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderXModel.cpp b/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderXModel.cpp new file mode 100644 index 00000000..d419ce67 --- /dev/null +++ b/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderXModel.cpp @@ -0,0 +1,42 @@ +#include "AssetLoaderXModel.h" + +#include "Game/T5/T5.h" +#include "Game/T5/XModel/XModelLoaderT5.h" +#include "Pool/GlobalAssetPool.h" + +#include +#include +#include + +using namespace T5; + +void* AssetLoaderXModel::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} + +bool AssetLoaderXModel::CanLoadFromRaw() const +{ + return true; +} + +bool AssetLoaderXModel::LoadFromRaw( + const std::string& assetName, ISearchPath* searchPath, MemoryManager* memory, IAssetLoadingManager* manager, Zone* zone) const +{ + const auto file = searchPath->Open(std::format("xmodel/{}.json", assetName)); + if (!file.IsOpen()) + return false; + + auto* xmodel = memory->Alloc(); + xmodel->name = memory->Dup(assetName.c_str()); + + std::vector dependencies; + if (LoadXModel(*file.m_stream, *xmodel, memory, manager, dependencies)) + manager->AddAsset(assetName, xmodel, std::move(dependencies)); + else + std::cerr << std::format("Failed to load xmodel \"{}\"\n", assetName); + + return true; +} diff --git a/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderXModel.h b/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderXModel.h new file mode 100644 index 00000000..4a669630 --- /dev/null +++ b/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderXModel.h @@ -0,0 +1,19 @@ +#pragma once +#include "AssetLoading/BasicAssetLoader.h" +#include "AssetLoading/IAssetLoadingManager.h" +#include "Game/T5/T5.h" +#include "SearchPath/ISearchPath.h" + +namespace T5 +{ + class AssetLoaderXModel final : public BasicAssetLoader + { + static std::string GetFileNameForAsset(const std::string& assetName); + + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + _NODISCARD bool CanLoadFromRaw() const override; + bool + LoadFromRaw(const std::string& assetName, ISearchPath* searchPath, MemoryManager* memory, IAssetLoadingManager* manager, Zone* zone) const override; + }; +} // namespace T5 diff --git a/src/ObjLoading/Game/T5/ObjLoaderT5.cpp b/src/ObjLoading/Game/T5/ObjLoaderT5.cpp index 16b38fb2..0b98c959 100644 --- a/src/ObjLoading/Game/T5/ObjLoaderT5.cpp +++ b/src/ObjLoading/Game/T5/ObjLoaderT5.cpp @@ -3,6 +3,7 @@ #include "AssetLoaders/AssetLoaderLocalizeEntry.h" #include "AssetLoaders/AssetLoaderRawFile.h" #include "AssetLoaders/AssetLoaderStringTable.h" +#include "AssetLoaders/AssetLoaderXModel.h" #include "AssetLoading/AssetLoadingManager.h" #include "Game/T5/GameAssetPoolT5.h" #include "Game/T5/GameT5.h" @@ -27,7 +28,7 @@ ObjLoader::ObjLoader() REGISTER_ASSET_LOADER(BasicAssetLoader) REGISTER_ASSET_LOADER(BasicAssetLoader) REGISTER_ASSET_LOADER(BasicAssetLoader) - REGISTER_ASSET_LOADER(BasicAssetLoader) + REGISTER_ASSET_LOADER(AssetLoaderXModel) REGISTER_ASSET_LOADER(BasicAssetLoader) REGISTER_ASSET_LOADER(BasicAssetLoader) REGISTER_ASSET_LOADER(BasicAssetLoader) diff --git a/src/ObjLoading/Game/T5/XModel/XModelLoaderT5.cpp b/src/ObjLoading/Game/T5/XModel/XModelLoaderT5.cpp new file mode 100644 index 00000000..55f19595 --- /dev/null +++ b/src/ObjLoading/Game/T5/XModel/XModelLoaderT5.cpp @@ -0,0 +1,49 @@ +#include "XModelLoaderT5.h" + +#include "Game/T5/CommonT5.h" +#include "Game/T5/XModel/JsonXModel.h" + +#define GAME_NAMESPACE T5 + +namespace T5 +{ + const char* HITLOC_NAMES[]{ + // clang-format off + "none", + "helmet", + "head", + "neck", + "torso_upper", + "torso_lower", + "right_arm_upper", + "left_arm_upper", + "right_arm_lower", + "left_arm_lower", + "right_hand", + "left_hand", + "right_leg_upper", + "left_leg_upper", + "right_leg_lower", + "left_leg_lower", + "right_foot", + "left_foot", + "gun", + // clang-format on + }; + static_assert(std::extent_v == HITLOC_COUNT); +} // namespace T5 + +#include "XModel/GenericXModelLoader.inc.h" + +namespace T5 +{ + bool LoadXModel(std::istream& stream, XModel& xmodel, MemoryManager* memory, IAssetLoadingManager* manager, std::vector& dependencies) + { + std::set dependenciesSet; + XModelLoader loader(stream, *memory, *manager, dependenciesSet); + + dependencies.assign(dependenciesSet.cbegin(), dependenciesSet.cend()); + + return loader.Load(xmodel); + } +} // namespace T5 diff --git a/src/ObjLoading/Game/T5/XModel/XModelLoaderT5.h b/src/ObjLoading/Game/T5/XModel/XModelLoaderT5.h new file mode 100644 index 00000000..cf1c3951 --- /dev/null +++ b/src/ObjLoading/Game/T5/XModel/XModelLoaderT5.h @@ -0,0 +1,13 @@ +#pragma once + +#include "AssetLoading/IAssetLoadingManager.h" +#include "Game/T5/T5.h" +#include "Utils/MemoryManager.h" + +#include +#include + +namespace T5 +{ + bool LoadXModel(std::istream& stream, XModel& xmodel, MemoryManager* memory, IAssetLoadingManager* manager, std::vector& dependencies); +} diff --git a/src/ObjLoading/XModel/GenericXModelLoader.inc.h b/src/ObjLoading/XModel/GenericXModelLoader.inc.h index 74ac5fd0..2c9610c5 100644 --- a/src/ObjLoading/XModel/GenericXModelLoader.inc.h +++ b/src/ObjLoading/XModel/GenericXModelLoader.inc.h @@ -773,10 +773,13 @@ namespace GAME_NAMESPACE } xmodel.flags = jXModel.flags; + +#ifdef FEATURE_T6 xmodel.lightingOriginOffset.x = jXModel.lightingOriginOffset.x; xmodel.lightingOriginOffset.y = jXModel.lightingOriginOffset.y; xmodel.lightingOriginOffset.z = jXModel.lightingOriginOffset.z; xmodel.lightingOriginRange = jXModel.lightingOriginRange; +#endif return true; } diff --git a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperXModel.cpp b/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperXModel.cpp index b7d80214..8eb958bb 100644 --- a/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperXModel.cpp +++ b/src/ObjWriting/Game/T5/AssetDumpers/AssetDumperXModel.cpp @@ -1,519 +1,9 @@ #include "AssetDumperXModel.h" -#include "Game/T5/CommonT5.h" -#include "ObjWriting.h" -#include "Utils/DistinctMapper.h" -#include "Utils/QuatInt16.h" -#include "XModel/Export/XModelExportWriter.h" -#include "XModel/Gltf/GltfBinOutput.h" -#include "XModel/Gltf/GltfTextOutput.h" -#include "XModel/Gltf/GltfWriter.h" -#include "XModel/Obj/ObjWriter.h" -#include "XModel/XModelWriter.h" - -#include -#include +#include "Game/T5/XModel/XModelDumperT5.h" using namespace T5; -namespace -{ - std::string GetFileNameForLod(const std::string& modelName, const unsigned lod, const std::string& extension) - { - return std::format("model_export/{}_lod{}{}", modelName, lod, extension); - } - - GfxImage* GetMaterialColorMap(const Material* material) - { - std::vector potentialTextureDefs; - - for (auto textureIndex = 0u; textureIndex < material->textureCount; textureIndex++) - { - MaterialTextureDef* def = &material->textureTable[textureIndex]; - - if (def->semantic == TS_COLOR_MAP || def->semantic >= TS_COLOR0_MAP && def->semantic <= TS_COLOR15_MAP) - potentialTextureDefs.push_back(def); - } - - if (potentialTextureDefs.empty()) - return nullptr; - if (potentialTextureDefs.size() == 1) - return potentialTextureDefs[0]->u.image; - - for (const auto* def : potentialTextureDefs) - { - if (def->nameStart == 'c' && def->nameEnd == 'p') - return def->u.image; - } - - return potentialTextureDefs[0]->u.image; - } - - GfxImage* GetMaterialNormalMap(const Material* material) - { - std::vector potentialTextureDefs; - - for (auto textureIndex = 0u; textureIndex < material->textureCount; textureIndex++) - { - MaterialTextureDef* def = &material->textureTable[textureIndex]; - - if (def->semantic == TS_NORMAL_MAP) - potentialTextureDefs.push_back(def); - } - - if (potentialTextureDefs.empty()) - return nullptr; - if (potentialTextureDefs.size() == 1) - return potentialTextureDefs[0]->u.image; - - for (const auto* def : potentialTextureDefs) - { - if (def->nameStart == 'n' && def->nameEnd == 'p') - return def->u.image; - } - - return potentialTextureDefs[0]->u.image; - } - - GfxImage* GetMaterialSpecularMap(const Material* material) - { - std::vector potentialTextureDefs; - - for (auto textureIndex = 0u; textureIndex < material->textureCount; textureIndex++) - { - MaterialTextureDef* def = &material->textureTable[textureIndex]; - - if (def->semantic == TS_SPECULAR_MAP) - potentialTextureDefs.push_back(def); - } - - if (potentialTextureDefs.empty()) - return nullptr; - if (potentialTextureDefs.size() == 1) - return potentialTextureDefs[0]->u.image; - - for (const auto* def : potentialTextureDefs) - { - if (def->nameStart == 's' && def->nameEnd == 'p') - return def->u.image; - } - - return potentialTextureDefs[0]->u.image; - } - - void AddXModelBones(XModelCommon& out, const AssetDumpingContext& context, const XModel* model) - { - for (auto boneNum = 0u; boneNum < model->numBones; boneNum++) - { - XModelBone bone; - if (model->boneNames[boneNum] < context.m_zone->m_script_strings.Count()) - bone.name = context.m_zone->m_script_strings[model->boneNames[boneNum]]; - else - bone.name = "INVALID_BONE_NAME"; - - if (boneNum >= model->numRootBones) - bone.parentIndex = boneNum - static_cast(model->parentList[boneNum - model->numRootBones]); - else - bone.parentIndex = std::nullopt; - - bone.scale[0] = 1.0f; - bone.scale[1] = 1.0f; - bone.scale[2] = 1.0f; - - bone.globalOffset[0] = model->baseMat[boneNum].trans[0]; - bone.globalOffset[1] = model->baseMat[boneNum].trans[1]; - bone.globalOffset[2] = model->baseMat[boneNum].trans[2]; - bone.globalRotation = { - model->baseMat[boneNum].quat[0], - model->baseMat[boneNum].quat[1], - model->baseMat[boneNum].quat[2], - model->baseMat[boneNum].quat[3], - }; - - if (boneNum < model->numRootBones) - { - bone.localOffset[0] = 0; - bone.localOffset[1] = 0; - bone.localOffset[2] = 0; - bone.localRotation = {0, 0, 0, 1}; - } - else - { - const auto* trans = &model->trans[(boneNum - model->numRootBones) * 3]; - bone.localOffset[0] = trans[0]; - bone.localOffset[1] = trans[1]; - bone.localOffset[2] = trans[2]; - - const auto& quat = model->quats[boneNum - model->numRootBones]; - bone.localRotation = { - QuatInt16::ToFloat(quat.v[0]), - QuatInt16::ToFloat(quat.v[1]), - QuatInt16::ToFloat(quat.v[2]), - QuatInt16::ToFloat(quat.v[3]), - }; - } - - out.m_bones.emplace_back(std::move(bone)); - } - } - - const char* AssetName(const char* input) - { - if (input && input[0] == ',') - return &input[1]; - - return input; - } - - void AddXModelMaterials(XModelCommon& out, DistinctMapper& materialMapper, const XModel* model) - { - for (auto surfaceMaterialNum = 0; surfaceMaterialNum < model->numsurfs; surfaceMaterialNum++) - { - Material* material = model->materialHandles[surfaceMaterialNum]; - if (materialMapper.Add(material)) - { - XModelMaterial xMaterial; - xMaterial.ApplyDefaults(); - - xMaterial.name = AssetName(material->info.name); - const auto* colorMap = GetMaterialColorMap(material); - if (colorMap) - xMaterial.colorMapName = AssetName(colorMap->name); - - const auto* normalMap = GetMaterialNormalMap(material); - if (normalMap) - xMaterial.normalMapName = AssetName(normalMap->name); - - const auto* specularMap = GetMaterialSpecularMap(material); - if (specularMap) - xMaterial.specularMapName = AssetName(specularMap->name); - - out.m_materials.emplace_back(std::move(xMaterial)); - } - } - } - - void AddXModelObjects(XModelCommon& out, const XModel* model, const unsigned lod, const DistinctMapper& materialMapper) - { - const auto surfCount = model->lodInfo[lod].numsurfs; - const auto baseSurfaceIndex = model->lodInfo[lod].surfIndex; - - for (auto surfIndex = 0u; surfIndex < surfCount; surfIndex++) - { - XModelObject object; - object.name = std::format("surf{}", surfIndex); - object.materialIndex = static_cast(materialMapper.GetDistinctPositionByInputPosition(surfIndex + baseSurfaceIndex)); - - out.m_objects.emplace_back(std::move(object)); - } - } - - void AddXModelVertices(XModelCommon& out, const XModel* model, const unsigned lod) - { - const auto* surfs = &model->surfs[model->lodInfo[lod].surfIndex]; - const auto surfCount = model->lodInfo[lod].numsurfs; - - for (auto surfIndex = 0u; surfIndex < surfCount; surfIndex++) - { - const auto& surface = surfs[surfIndex]; - - for (auto vertexIndex = 0u; vertexIndex < surface.vertCount; vertexIndex++) - { - const auto& v = surface.verts0[vertexIndex]; - - XModelVertex vertex{}; - vertex.coordinates[0] = v.xyz[0]; - vertex.coordinates[1] = v.xyz[1]; - vertex.coordinates[2] = v.xyz[2]; - Common::Vec3UnpackUnitVec(v.normal, vertex.normal); - Common::Vec4UnpackGfxColor(v.color, vertex.color); - Common::Vec2UnpackTexCoords(v.texCoord, vertex.uv); - - out.m_vertices.emplace_back(vertex); - } - } - } - - void AllocateXModelBoneWeights(const XModel* model, const unsigned lod, XModelVertexBoneWeightCollection& weightCollection) - { - const auto* surfs = &model->surfs[model->lodInfo[lod].surfIndex]; - const auto surfCount = model->lodInfo[lod].numsurfs; - - auto totalWeightCount = 0u; - for (auto surfIndex = 0u; surfIndex < surfCount; surfIndex++) - { - const auto& surface = surfs[surfIndex]; - - if (surface.vertList) - { - totalWeightCount += surface.vertListCount; - } - - if (surface.vertInfo.vertsBlend) - { - totalWeightCount += surface.vertInfo.vertCount[0] * 1; - totalWeightCount += surface.vertInfo.vertCount[1] * 2; - totalWeightCount += surface.vertInfo.vertCount[2] * 3; - totalWeightCount += surface.vertInfo.vertCount[3] * 4; - } - } - - weightCollection.weights.resize(totalWeightCount); - } - - float BoneWeight16(const uint16_t value) - { - return static_cast(value) / static_cast(std::numeric_limits::max()); - } - - void AddXModelVertexBoneWeights(XModelCommon& out, const XModel* model, const unsigned lod) - { - const auto* surfs = &model->surfs[model->lodInfo[lod].surfIndex]; - const auto surfCount = model->lodInfo[lod].numsurfs; - auto& weightCollection = out.m_bone_weight_data; - - size_t weightOffset = 0u; - - for (auto surfIndex = 0u; surfIndex < surfCount; surfIndex++) - { - const auto& surface = surfs[surfIndex]; - auto handledVertices = 0u; - - if (surface.vertList) - { - for (auto vertListIndex = 0u; vertListIndex < surface.vertListCount; vertListIndex++) - { - const auto& vertList = surface.vertList[vertListIndex]; - const auto boneWeightOffset = weightOffset; - - weightCollection.weights[weightOffset++] = XModelBoneWeight{vertList.boneOffset / sizeof(DObjSkelMat), 1.0f}; - - for (auto vertListVertexOffset = 0u; vertListVertexOffset < vertList.vertCount; vertListVertexOffset++) - { - out.m_vertex_bone_weights.emplace_back(boneWeightOffset, 1); - } - handledVertices += vertList.vertCount; - } - } - - auto vertsBlendOffset = 0u; - if (surface.vertInfo.vertsBlend) - { - // 1 bone weight - for (auto vertIndex = 0; vertIndex < surface.vertInfo.vertCount[0]; vertIndex++) - { - const auto boneWeightOffset = weightOffset; - const auto boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat); - weightCollection.weights[weightOffset++] = XModelBoneWeight{boneIndex0, 1.0f}; - - vertsBlendOffset += 1; - - out.m_vertex_bone_weights.emplace_back(boneWeightOffset, 1); - } - - // 2 bone weights - for (auto vertIndex = 0; vertIndex < surface.vertInfo.vertCount[1]; vertIndex++) - { - const auto boneWeightOffset = weightOffset; - const auto boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat); - const auto boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat); - const auto boneWeight1 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 2]); - const auto boneWeight0 = 1.0f - boneWeight1; - - weightCollection.weights[weightOffset++] = XModelBoneWeight{boneIndex0, boneWeight0}; - weightCollection.weights[weightOffset++] = XModelBoneWeight{boneIndex1, boneWeight1}; - - vertsBlendOffset += 3; - - out.m_vertex_bone_weights.emplace_back(boneWeightOffset, 2); - } - - // 3 bone weights - for (auto vertIndex = 0; vertIndex < surface.vertInfo.vertCount[2]; vertIndex++) - { - const auto boneWeightOffset = weightOffset; - const auto boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat); - const auto boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat); - const auto boneWeight1 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 2]); - const auto boneIndex2 = surface.vertInfo.vertsBlend[vertsBlendOffset + 3] / sizeof(DObjSkelMat); - const auto boneWeight2 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 4]); - const auto boneWeight0 = 1.0f - boneWeight1 - boneWeight2; - - weightCollection.weights[weightOffset++] = XModelBoneWeight{boneIndex0, boneWeight0}; - weightCollection.weights[weightOffset++] = XModelBoneWeight{boneIndex1, boneWeight1}; - weightCollection.weights[weightOffset++] = XModelBoneWeight{boneIndex2, boneWeight2}; - - vertsBlendOffset += 5; - - out.m_vertex_bone_weights.emplace_back(boneWeightOffset, 3); - } - - // 4 bone weights - for (auto vertIndex = 0; vertIndex < surface.vertInfo.vertCount[3]; vertIndex++) - { - const auto boneWeightOffset = weightOffset; - const auto boneIndex0 = surface.vertInfo.vertsBlend[vertsBlendOffset + 0] / sizeof(DObjSkelMat); - const auto boneIndex1 = surface.vertInfo.vertsBlend[vertsBlendOffset + 1] / sizeof(DObjSkelMat); - const auto boneWeight1 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 2]); - const auto boneIndex2 = surface.vertInfo.vertsBlend[vertsBlendOffset + 3] / sizeof(DObjSkelMat); - const auto boneWeight2 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 4]); - const auto boneIndex3 = surface.vertInfo.vertsBlend[vertsBlendOffset + 5] / sizeof(DObjSkelMat); - const auto boneWeight3 = BoneWeight16(surface.vertInfo.vertsBlend[vertsBlendOffset + 6]); - const auto boneWeight0 = 1.0f - boneWeight1 - boneWeight2 - boneWeight3; - - weightCollection.weights[weightOffset++] = XModelBoneWeight{boneIndex0, boneWeight0}; - weightCollection.weights[weightOffset++] = XModelBoneWeight{boneIndex1, boneWeight1}; - weightCollection.weights[weightOffset++] = XModelBoneWeight{boneIndex2, boneWeight2}; - weightCollection.weights[weightOffset++] = XModelBoneWeight{boneIndex3, boneWeight3}; - - vertsBlendOffset += 7; - - out.m_vertex_bone_weights.emplace_back(boneWeightOffset, 4); - } - - handledVertices += - surface.vertInfo.vertCount[0] + surface.vertInfo.vertCount[1] + surface.vertInfo.vertCount[2] + surface.vertInfo.vertCount[3]; - } - - for (; handledVertices < surface.vertCount; handledVertices++) - { - out.m_vertex_bone_weights.emplace_back(0, 0); - } - } - } - - void AddXModelFaces(XModelCommon& out, const XModel* model, const unsigned lod) - { - const auto* surfs = &model->surfs[model->lodInfo[lod].surfIndex]; - const auto surfCount = model->lodInfo[lod].numsurfs; - - for (auto surfIndex = 0u; surfIndex < surfCount; surfIndex++) - { - const auto& surface = surfs[surfIndex]; - auto& object = out.m_objects[surfIndex]; - object.m_faces.reserve(surface.triCount); - - for (auto triIndex = 0u; triIndex < surface.triCount; triIndex++) - { - const auto& tri = surface.triIndices[triIndex]; - - XModelFace face{}; - face.vertexIndex[0] = tri[0] + surface.baseVertIndex; - face.vertexIndex[1] = tri[1] + surface.baseVertIndex; - face.vertexIndex[2] = tri[2] + surface.baseVertIndex; - object.m_faces.emplace_back(face); - } - } - } - - void PopulateXModelWriter(XModelCommon& out, const AssetDumpingContext& context, const unsigned lod, const XModel* model) - { - DistinctMapper materialMapper(model->numsurfs); - AllocateXModelBoneWeights(model, lod, out.m_bone_weight_data); - - out.m_name = std::format("{}_lod{}", model->name, lod); - AddXModelBones(out, context, model); - AddXModelMaterials(out, materialMapper, model); - AddXModelObjects(out, model, lod, materialMapper); - AddXModelVertices(out, model, lod); - AddXModelVertexBoneWeights(out, model, lod); - AddXModelFaces(out, model, lod); - } - - void DumpObjMtl(const XModelCommon& common, const AssetDumpingContext& context, const XAssetInfo* asset) - { - const auto* model = asset->Asset(); - const auto mtlFile = context.OpenAssetFile(std::format("model_export/{}.mtl", model->name)); - - if (!mtlFile) - return; - - const auto writer = obj::CreateMtlWriter(*mtlFile, context.m_zone->m_game->GetShortName(), context.m_zone->m_name); - DistinctMapper materialMapper(model->numsurfs); - - writer->Write(common); - } - - void DumpObjLod(const XModelCommon& common, const AssetDumpingContext& context, const XAssetInfo* asset, const unsigned lod) - { - const auto* model = asset->Asset(); - const auto assetFile = context.OpenAssetFile(GetFileNameForLod(model->name, lod, ".obj")); - - if (!assetFile) - return; - - const auto writer = - obj::CreateObjWriter(*assetFile, std::format("{}.mtl", model->name), context.m_zone->m_game->GetShortName(), context.m_zone->m_name); - DistinctMapper materialMapper(model->numsurfs); - - writer->Write(common); - } - - void DumpXModelExportLod(const XModelCommon& common, const AssetDumpingContext& context, const XAssetInfo* asset, const unsigned lod) - { - const auto* model = asset->Asset(); - const auto assetFile = context.OpenAssetFile(GetFileNameForLod(model->name, lod, ".XMODEL_EXPORT")); - - if (!assetFile) - return; - - const auto writer = xmodel_export::CreateWriterForVersion6(*assetFile, context.m_zone->m_game->GetShortName(), context.m_zone->m_name); - writer->Write(common); - } - - template - void DumpGltfLod( - const XModelCommon& common, const AssetDumpingContext& context, const XAssetInfo* asset, const unsigned lod, const std::string& extension) - { - const auto* model = asset->Asset(); - const auto assetFile = context.OpenAssetFile(GetFileNameForLod(model->name, lod, extension)); - - if (!assetFile) - return; - - const auto output = std::make_unique(*assetFile); - const auto writer = gltf::Writer::CreateWriter(output.get(), context.m_zone->m_game->GetShortName(), context.m_zone->m_name); - - writer->Write(common); - } - - void DumpXModelSurfs(const AssetDumpingContext& context, const XAssetInfo* asset) - { - const auto* model = asset->Asset(); - - for (auto currentLod = 0u; currentLod < model->numLods; currentLod++) - { - XModelCommon common; - PopulateXModelWriter(common, context, currentLod, asset->Asset()); - - switch (ObjWriting::Configuration.ModelOutputFormat) - { - case ObjWriting::Configuration_t::ModelOutputFormat_e::OBJ: - DumpObjLod(common, context, asset, currentLod); - if (currentLod == 0u) - DumpObjMtl(common, context, asset); - break; - - case ObjWriting::Configuration_t::ModelOutputFormat_e::XMODEL_EXPORT: - DumpXModelExportLod(common, context, asset, currentLod); - break; - - case ObjWriting::Configuration_t::ModelOutputFormat_e::GLTF: - DumpGltfLod(common, context, asset, currentLod, ".gltf"); - break; - - case ObjWriting::Configuration_t::ModelOutputFormat_e::GLB: - DumpGltfLod(common, context, asset, currentLod, ".glb"); - break; - - default: - assert(false); - break; - } - } - } -} // namespace - bool AssetDumperXModel::ShouldDump(XAssetInfo* asset) { return !asset->m_name.empty() && asset->m_name[0] != ','; @@ -521,5 +11,5 @@ bool AssetDumperXModel::ShouldDump(XAssetInfo* asset) void AssetDumperXModel::DumpAsset(AssetDumpingContext& context, XAssetInfo* asset) { - DumpXModelSurfs(context, asset); + DumpXModel(context, asset); } diff --git a/src/ObjWriting/Game/T5/XModel/XModelDumperT5.cpp b/src/ObjWriting/Game/T5/XModel/XModelDumperT5.cpp new file mode 100644 index 00000000..a29f79f6 --- /dev/null +++ b/src/ObjWriting/Game/T5/XModel/XModelDumperT5.cpp @@ -0,0 +1,17 @@ +#include "XModelDumperT5.h" + +#include "Game/T5/CommonT5.h" +#include "Game/T5/XModel/JsonXModel.h" + +#define GAME_NAMESPACE T5 + +#include "XModel/GenericXModelDumper.inc.h" + +namespace T5 +{ + void DumpXModel(AssetDumpingContext& context, XAssetInfo* asset) + { + DumpXModelJson(context, asset); + DumpXModelSurfs(context, asset); + } +} // namespace T5 diff --git a/src/ObjWriting/Game/T5/XModel/XModelDumperT5.h b/src/ObjWriting/Game/T5/XModel/XModelDumperT5.h new file mode 100644 index 00000000..a5198e38 --- /dev/null +++ b/src/ObjWriting/Game/T5/XModel/XModelDumperT5.h @@ -0,0 +1,9 @@ +#pragma once + +#include "Dumping/AssetDumpingContext.h" +#include "Game/T5/T5.h" + +namespace T5 +{ + void DumpXModel(AssetDumpingContext& context, XAssetInfo* asset); +} diff --git a/src/ObjWriting/Game/T6/XModel/XModelDumperT6.cpp b/src/ObjWriting/Game/T6/XModel/XModelDumperT6.cpp index 7ccdd75d..e629d886 100644 --- a/src/ObjWriting/Game/T6/XModel/XModelDumperT6.cpp +++ b/src/ObjWriting/Game/T6/XModel/XModelDumperT6.cpp @@ -1,9 +1,10 @@ #include "XModelDumperT6.h" #include "Game/T6/CommonT6.h" -#include "Game/T6/Json/JsonXModel.h" +#include "Game/T6/XModel/JsonXModel.h" #define GAME_NAMESPACE T6 +#define FEATURE_T6 #include "XModel/GenericXModelDumper.inc.h" diff --git a/src/ObjWriting/XModel/GenericXModelDumper.inc.h b/src/ObjWriting/XModel/GenericXModelDumper.inc.h index 6a128bbe..9e44946e 100644 --- a/src/ObjWriting/XModel/GenericXModelDumper.inc.h +++ b/src/ObjWriting/XModel/GenericXModelDumper.inc.h @@ -25,6 +25,15 @@ namespace GAME_NAMESPACE return std::format("model_export/{}_lod{}{}", modelName, lod, extension); } + inline GfxImage* GetImageFromTextureDef(const MaterialTextureDef& textureDef) + { +#ifdef FEATURE_T6 + return textureDef.image; +#else + return textureDef.u.image; +#endif + } + inline GfxImage* GetMaterialColorMap(const Material* material) { std::vector potentialTextureDefs; @@ -40,27 +49,27 @@ namespace GAME_NAMESPACE if (potentialTextureDefs.empty()) return nullptr; if (potentialTextureDefs.size() == 1) - return potentialTextureDefs[0]->image; + return GetImageFromTextureDef(*potentialTextureDefs[0]); for (const auto* def : potentialTextureDefs) { if (tolower(def->nameStart) == 'c' && tolower(def->nameEnd) == 'p') - return def->image; + return GetImageFromTextureDef(*def); } for (const auto* def : potentialTextureDefs) { if (tolower(def->nameStart) == 'r' && tolower(def->nameEnd) == 'k') - return def->image; + return GetImageFromTextureDef(*def); } for (const auto* def : potentialTextureDefs) { if (tolower(def->nameStart) == 'd' && tolower(def->nameEnd) == 'p') - return def->image; + return GetImageFromTextureDef(*def); } - return potentialTextureDefs[0]->image; + return GetImageFromTextureDef(*potentialTextureDefs[0]); } inline GfxImage* GetMaterialNormalMap(const Material* material) @@ -78,15 +87,15 @@ namespace GAME_NAMESPACE if (potentialTextureDefs.empty()) return nullptr; if (potentialTextureDefs.size() == 1) - return potentialTextureDefs[0]->image; + return GetImageFromTextureDef(*potentialTextureDefs[0]); for (const auto* def : potentialTextureDefs) { if (def->nameStart == 'n' && def->nameEnd == 'p') - return def->image; + return GetImageFromTextureDef(*def); } - return potentialTextureDefs[0]->image; + return GetImageFromTextureDef(*potentialTextureDefs[0]); } inline GfxImage* GetMaterialSpecularMap(const Material* material) @@ -104,15 +113,15 @@ namespace GAME_NAMESPACE if (potentialTextureDefs.empty()) return nullptr; if (potentialTextureDefs.size() == 1) - return potentialTextureDefs[0]->image; + return GetImageFromTextureDef(*potentialTextureDefs[0]); for (const auto* def : potentialTextureDefs) { if (def->nameStart == 's' && def->nameEnd == 'p') - return def->image; + return GetImageFromTextureDef(*def); } - return potentialTextureDefs[0]->image; + return GetImageFromTextureDef(*potentialTextureDefs[0]); } inline bool HasDefaultArmature(const XModel* model, const unsigned lod) @@ -654,10 +663,13 @@ namespace GAME_NAMESPACE jXModel.physConstraints = AssetName(xmodel.physConstraints->name); jXModel.flags = xmodel.flags; + +#ifdef FEATURE_T6 jXModel.lightingOriginOffset.x = xmodel.lightingOriginOffset.x; jXModel.lightingOriginOffset.y = xmodel.lightingOriginOffset.y; jXModel.lightingOriginOffset.z = xmodel.lightingOriginOffset.z; jXModel.lightingOriginRange = xmodel.lightingOriginRange; +#endif } std::ostream& m_stream;