From f3859e69523e8421573b836ebb9859c94bc6777b Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Tue, 28 Apr 2026 00:01:05 +0200 Subject: [PATCH 1/9] fix: iw3 vert lists are sometimes not complete --- src/ObjWriting/XModel/XModelDumper.cpp.template | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/ObjWriting/XModel/XModelDumper.cpp.template b/src/ObjWriting/XModel/XModelDumper.cpp.template index 4150f784..f95effd3 100644 --- a/src/ObjWriting/XModel/XModelDumper.cpp.template +++ b/src/ObjWriting/XModel/XModelDumper.cpp.template @@ -198,7 +198,15 @@ namespace return false; const auto& vertList = surface.vertList[0]; +#ifdef FEATURE_IW3 + // IW3 has some models that are missing 1 (a single) tri in its first lod. + // It is not contained in any vert list or blend + // I think this is a bug (?), so omit anyway. + // The "one tri missing" is not supported by the exporter anyway. + if (vertList.boneOffset != 0 || vertList.triOffset != 0 || vertList.vertCount != surface.vertCount) +#else if (vertList.boneOffset != 0 || vertList.triOffset != 0 || vertList.triCount != surface.triCount || vertList.vertCount != surface.vertCount) +#endif return false; } From 618592e411e2a9f1ac07ff7d02df76d8c944844a Mon Sep 17 00:00:00 2001 From: Michael Oliver Date: Sun, 3 May 2026 10:45:54 +0200 Subject: [PATCH 2/9] fix: only omit default armature if it can be omitted for all lods --- src/ObjWriting/XModel/XModelDumper.cpp.template | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/ObjWriting/XModel/XModelDumper.cpp.template b/src/ObjWriting/XModel/XModelDumper.cpp.template index f95effd3..c53ed33e 100644 --- a/src/ObjWriting/XModel/XModelDumper.cpp.template +++ b/src/ObjWriting/XModel/XModelDumper.cpp.template @@ -180,7 +180,7 @@ namespace return true; } - bool HasDefaultArmature(const XModel* model, const unsigned lod) + bool HasDefaultArmatureForLod(const XModel* model, const unsigned lod) { if (model->numRootBones != 1 || model->numBones != 1) return false; @@ -212,6 +212,17 @@ namespace return true; } + + bool HasDefaultArmatureForAllLods(const XModel* model) + { + for (auto lod = 0u; lod < model->numLods; lod++) + { + if (!HasDefaultArmatureForLod(model, lod)) + return false; + } + + return true; + } void OmitDefaultArmature(XModelCommon& common) { @@ -557,7 +568,9 @@ namespace AddXModelVertices(out, model, lod); AddXModelFaces(out, model, lod); - if (!CanOmitDefaultArmature() || !HasDefaultArmature(model, lod)) + // Keep armature handling consistent across all LODs so dumped GLTF/GLB round-trips + // preserve the same bone layout when re-imported. + if (!CanOmitDefaultArmature() || !HasDefaultArmatureForAllLods(model)) { AddXModelBones(out, context, model); AddXModelVertexBoneWeights(out, model, lod); From d6a736eb5d224600342a20c35e20f425804b5478 Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Sun, 3 May 2026 11:44:56 +0200 Subject: [PATCH 3/9] feat: preserve root bone name when dumping xmodels with omitted default armature --- src/ObjCommon/XModel/JsonXModel.h.template | 2 + .../XModel/XModelDumper.cpp.template | 64 ++++++++++++------- 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/src/ObjCommon/XModel/JsonXModel.h.template b/src/ObjCommon/XModel/JsonXModel.h.template index 08c28ef5..cd8caedc 100644 --- a/src/ObjCommon/XModel/JsonXModel.h.template +++ b/src/ObjCommon/XModel/JsonXModel.h.template @@ -56,6 +56,7 @@ namespace GAME public: std::optional type; std::vector lods; + std::optional rootBoneName; std::optional collLod; std::optional physPreset; #if defined(FEATURE_IW4) || defined(FEATURE_IW5) @@ -74,6 +75,7 @@ namespace GAME JsonXModel, type, lods, + rootBoneName, collLod, physPreset, #if defined(FEATURE_IW4) || defined(FEATURE_IW5) diff --git a/src/ObjWriting/XModel/XModelDumper.cpp.template b/src/ObjWriting/XModel/XModelDumper.cpp.template index c53ed33e..30eab361 100644 --- a/src/ObjWriting/XModel/XModelDumper.cpp.template +++ b/src/ObjWriting/XModel/XModelDumper.cpp.template @@ -161,28 +161,28 @@ namespace return GetImageFromTextureDef(*potentialTextureDefs[0]); } - bool GetSurfaces(const XModel* model, const unsigned lod, XSurface*& surfs, unsigned& surfCount) + bool GetSurfaces(const XModel& model, const unsigned lod, XSurface*& surfs, unsigned& surfCount) { #if defined(FEATURE_IW4) || defined(FEATURE_IW5) - if (!model->lodInfo[lod].modelSurfs || !model->lodInfo[lod].modelSurfs->surfs) + if (!model.lodInfo[lod].modelSurfs || !model.lodInfo[lod].modelSurfs->surfs) return false; - surfs = model->lodInfo[lod].modelSurfs->surfs; - surfCount = model->lodInfo[lod].modelSurfs->numsurfs; + surfs = model.lodInfo[lod].modelSurfs->surfs; + surfCount = model.lodInfo[lod].modelSurfs->numsurfs; #else - if (!model->surfs) + if (!model.surfs) return false; - surfs = &model->surfs[model->lodInfo[lod].surfIndex]; - surfCount = model->lodInfo[lod].numsurfs; + surfs = &model.surfs[model.lodInfo[lod].surfIndex]; + surfCount = model.lodInfo[lod].numsurfs; #endif return true; } - bool HasDefaultArmatureForLod(const XModel* model, const unsigned lod) + bool HasDefaultArmatureForLod(const XModel& model, const unsigned lod) { - if (model->numRootBones != 1 || model->numBones != 1) + if (model.numRootBones != 1 || model.numBones != 1) return false; XSurface* surfs; @@ -213,9 +213,9 @@ namespace return true; } - bool HasDefaultArmatureForAllLods(const XModel* model) + bool HasDefaultArmatureForAllLods(const XModel& model) { - for (auto lod = 0u; lod < model->numLods; lod++) + for (auto lod = 0u; lod < model.numLods; lod++) { if (!HasDefaultArmatureForLod(model, lod)) return false; @@ -348,7 +348,7 @@ namespace { XSurface* surfs; unsigned surfCount; - if (!GetSurfaces(model, lod, surfs, surfCount)) + if (!GetSurfaces(*model, lod, surfs, surfCount)) return; for (auto surfIndex = 0u; surfIndex < surfCount; surfIndex++) @@ -376,7 +376,7 @@ namespace { XSurface* surfs; unsigned surfCount; - if (!GetSurfaces(model, lod, surfs, surfCount)) + if (!GetSurfaces(*model, lod, surfs, surfCount)) return; auto totalWeightCount = 0u; @@ -410,7 +410,7 @@ namespace { XSurface* surfs; unsigned surfCount; - if (!GetSurfaces(model, lod, surfs, surfCount)) + if (!GetSurfaces(*model, lod, surfs, surfCount)) return; auto& weightCollection = out.m_bone_weight_data; @@ -529,7 +529,7 @@ namespace { XSurface* surfs; unsigned surfCount; - if (!GetSurfaces(model, lod, surfs, surfCount)) + if (!GetSurfaces(*model, lod, surfs, surfCount)) return; for (auto surfIndex = 0u; surfIndex < surfCount; surfIndex++) @@ -570,7 +570,7 @@ namespace // Keep armature handling consistent across all LODs so dumped GLTF/GLB round-trips // preserve the same bone layout when re-imported. - if (!CanOmitDefaultArmature() || !HasDefaultArmatureForAllLods(model)) + if (!CanOmitDefaultArmature() || !HasDefaultArmatureForAllLods(*model)) { AddXModelBones(out, context, model); AddXModelVertexBoneWeights(out, model, lod); @@ -698,15 +698,15 @@ namespace class JsonDumper { public: - JsonDumper(AssetDumpingContext& context, std::ostream& stream) + explicit JsonDumper(std::ostream& stream) : m_stream(stream) { } - void Dump(const XModel* xmodel) const + void Dump(AssetDumpingContext& context, const XModel* xmodel) const { JsonXModel jsonXModel; - CreateJsonXModel(jsonXModel, *xmodel); + CreateJsonXModel(context, jsonXModel, *xmodel); nlohmann::json jRoot = jsonXModel; jRoot["$schema"] = "http://openassettools.dev/schema/xmodel.v1.json"; @@ -819,13 +819,33 @@ namespace return JsonXModelType::ANIMATED; } + + static void SetJsonRootBoneName(AssetDumpingContext& context, JsonXModel& jXModel, const XModel& xmodel) + { + assert(xmodel.boneNames); + assert(xmodel.boneNames[0] < context.m_zone.m_script_strings.Count()); + assert(xmodel.numRootBones <= 1); + + if (!xmodel.boneNames || xmodel.boneNames[0] >= context.m_zone.m_script_strings.Count() || xmodel.numRootBones == 0) + return; + + jXModel.rootBoneName = context.m_zone.m_script_strings[xmodel.boneNames[0]]; + } - static void CreateJsonXModel(JsonXModel& jXModel, const XModel& xmodel) + static void CreateJsonXModel(AssetDumpingContext& context, JsonXModel& jXModel, const XModel& xmodel) { if (xmodel.collLod >= 0) jXModel.collLod = xmodel.collLod; jXModel.type = GetType(xmodel); + + if (CanOmitDefaultArmature() && HasDefaultArmatureForAllLods(xmodel)) + { + // If we are going to omit the armature, we need to make sure we remember the root bone name. + // It does not follow a specific pattern, may not be identical to the xmodel name and + // may be required for attaching the xmodel. + SetJsonRootBoneName(context, jXModel, xmodel); + } for (auto lodNumber = 0u; lodNumber < xmodel.numLods; lodNumber++) { @@ -868,8 +888,8 @@ namespace if (!assetFile) return; - const JsonDumper dumper(context, *assetFile); - dumper.Dump(asset.Asset()); + const JsonDumper dumper(*assetFile); + dumper.Dump(context, asset.Asset()); } } // namespace From 2527f23c1099b6465712196fc1935a70107b7079 Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Sun, 3 May 2026 12:54:45 +0200 Subject: [PATCH 4/9] chore: use references when possible in xmodel dumper --- .../XModel/XModelDumper.cpp.template | 180 +++++++++--------- 1 file changed, 90 insertions(+), 90 deletions(-) diff --git a/src/ObjWriting/XModel/XModelDumper.cpp.template b/src/ObjWriting/XModel/XModelDumper.cpp.template index 30eab361..baa6f785 100644 --- a/src/ObjWriting/XModel/XModelDumper.cpp.template +++ b/src/ObjWriting/XModel/XModelDumper.cpp.template @@ -236,18 +236,18 @@ namespace } } - void AddXModelBones(XModelCommon& out, const AssetDumpingContext& context, const XModel* model) + void AddXModelBones(XModelCommon& out, const AssetDumpingContext& context, const XModel& model) { - for (auto boneNum = 0u; boneNum < model->numBones; boneNum++) + 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]]; + 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 = static_cast(boneNum - static_cast(model->parentList[boneNum - model->numRootBones])); + if (boneNum >= model.numRootBones) + bone.parentIndex = static_cast(boneNum - static_cast(model.parentList[boneNum - model.numRootBones])); else bone.parentIndex = std::nullopt; @@ -255,7 +255,7 @@ namespace bone.scale[1] = 1.0f; bone.scale[2] = 1.0f; - const auto& baseMat = model->baseMat[boneNum]; + const auto& baseMat = model.baseMat[boneNum]; bone.globalOffset[0] = baseMat.trans.x; bone.globalOffset[1] = baseMat.trans.y; bone.globalOffset[2] = baseMat.trans.z; @@ -266,7 +266,7 @@ namespace .w = baseMat.quat.w, }; - if (boneNum < model->numRootBones) + if (boneNum < model.numRootBones) { bone.localOffset[0] = 0; bone.localOffset[1] = 0; @@ -275,12 +275,12 @@ namespace } else { - const auto* trans = &model->trans[(boneNum - model->numRootBones) * 3]; + 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]; + const auto& quat = model.quats[boneNum - model.numRootBones]; bone.localRotation = { .x = QuatInt16::ToFloat(quat.v[0]), .y = QuatInt16::ToFloat(quat.v[1]), @@ -301,11 +301,11 @@ namespace return input; } - void AddXModelMaterials(XModelCommon& out, DistinctMapper& materialMapper, const XModel* model) + void AddXModelMaterials(XModelCommon& out, DistinctMapper& materialMapper, const XModel& model) { - for (auto surfaceMaterialNum = 0u; surfaceMaterialNum < model->numsurfs; surfaceMaterialNum++) + for (auto surfaceMaterialNum = 0u; surfaceMaterialNum < model.numsurfs; surfaceMaterialNum++) { - Material* material = model->materialHandles[surfaceMaterialNum]; + Material* material = model.materialHandles[surfaceMaterialNum]; if (materialMapper.Add(material)) { XModelMaterial xMaterial; @@ -329,10 +329,10 @@ namespace } } - void AddXModelObjects(XModelCommon& out, const XModel* model, const unsigned lod, const DistinctMapper& materialMapper) + 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; + const auto surfCount = model.lodInfo[lod].numsurfs; + const auto baseSurfaceIndex = model.lodInfo[lod].surfIndex; for (auto surfIndex = 0u; surfIndex < surfCount; surfIndex++) { @@ -344,11 +344,11 @@ namespace } } - void AddXModelVertices(XModelCommon& out, const XModel* model, const unsigned lod) + void AddXModelVertices(XModelCommon& out, const XModel& model, const unsigned lod) { XSurface* surfs; unsigned surfCount; - if (!GetSurfaces(*model, lod, surfs, surfCount)) + if (!GetSurfaces(model, lod, surfs, surfCount)) return; for (auto surfIndex = 0u; surfIndex < surfCount; surfIndex++) @@ -372,11 +372,11 @@ namespace } } - void AllocateXModelBoneWeights(const XModel* model, const unsigned lod, XModelVertexBoneWeightCollection& weightCollection) + void AllocateXModelBoneWeights(const XModel& model, const unsigned lod, XModelVertexBoneWeightCollection& weightCollection) { XSurface* surfs; unsigned surfCount; - if (!GetSurfaces(*model, lod, surfs, surfCount)) + if (!GetSurfaces(model, lod, surfs, surfCount)) return; auto totalWeightCount = 0u; @@ -406,11 +406,11 @@ namespace return static_cast(value) / static_cast(std::numeric_limits::max()); } - void AddXModelVertexBoneWeights(XModelCommon& out, const XModel* model, const unsigned lod) + void AddXModelVertexBoneWeights(XModelCommon& out, const XModel& model, const unsigned lod) { XSurface* surfs; unsigned surfCount; - if (!GetSurfaces(*model, lod, surfs, surfCount)) + if (!GetSurfaces(model, lod, surfs, surfCount)) return; auto& weightCollection = out.m_bone_weight_data; @@ -525,11 +525,11 @@ namespace } } - void AddXModelFaces(XModelCommon& out, const XModel* model, const unsigned lod) + void AddXModelFaces(XModelCommon& out, const XModel& model, const unsigned lod) { XSurface* surfs; unsigned surfCount; - if (!GetSurfaces(*model, lod, surfs, surfCount)) + if (!GetSurfaces(model, lod, surfs, surfCount)) return; for (auto surfIndex = 0u; surfIndex < surfCount; surfIndex++) @@ -557,12 +557,12 @@ namespace && ObjWriting::Configuration.ModelOutputFormat != ObjWriting::Configuration_t::ModelOutputFormat_e::XMODEL_BIN; } - void PopulateXModelWriter(XModelCommon& out, const AssetDumpingContext& context, const unsigned lod, const XModel* model) + void PopulateXModelWriter(XModelCommon& out, const AssetDumpingContext& context, const unsigned lod, const XModel& model) { - DistinctMapper materialMapper(model->numsurfs); + DistinctMapper materialMapper(model.numsurfs); AllocateXModelBoneWeights(model, lod, out.m_bone_weight_data); - out.m_name = std::format("{}_lod{}", model->name, lod); + out.m_name = std::format("{}_lod{}", model.name, lod); AddXModelMaterials(out, materialMapper, model); AddXModelObjects(out, model, lod, materialMapper); AddXModelVertices(out, model, lod); @@ -570,7 +570,7 @@ namespace // Keep armature handling consistent across all LODs so dumped GLTF/GLB round-trips // preserve the same bone layout when re-imported. - if (!CanOmitDefaultArmature() || !HasDefaultArmatureForAllLods(*model)) + if (!CanOmitDefaultArmature() || !HasDefaultArmatureForAllLods(model)) { AddXModelBones(out, context, model); AddXModelVertexBoneWeights(out, model, lod); @@ -583,39 +583,39 @@ namespace 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)); + const auto& model = *asset.Asset(); + const auto mtlFile = context.OpenAssetFile(std::format("model_export/{}.mtl", model.name)); if (!mtlFile) return; const auto* game = IGame::GetGameById(context.m_zone.m_game_id); const auto writer = obj::CreateMtlWriter(*mtlFile, game->GetShortName(), context.m_zone.m_name); - DistinctMapper materialMapper(model->numsurfs); + 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")); + const auto& model = *asset.Asset(); + const auto assetFile = context.OpenAssetFile(GetFileNameForLod(model.name, lod, ".obj")); if (!assetFile) return; const auto* game = IGame::GetGameById(context.m_zone.m_game_id); const auto writer = - obj::CreateObjWriter(*assetFile, std::format("{}.mtl", model->name), game->GetShortName(), context.m_zone.m_name); - DistinctMapper materialMapper(model->numsurfs); + obj::CreateObjWriter(*assetFile, std::format("{}.mtl", model.name), 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")); + const auto model = *asset.Asset(); + const auto assetFile = context.OpenAssetFile(GetFileNameForLod(model.name, lod, ".xmodel_export")); if (!assetFile) return; @@ -627,8 +627,8 @@ namespace void DumpXModelBinLod(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_bin")); + const auto& model = *asset.Asset(); + const auto assetFile = context.OpenAssetFile(GetFileNameForLod(model.name, lod, ".xmodel_bin")); if (!assetFile) return; @@ -642,8 +642,8 @@ namespace 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)); + const auto& model = *asset.Asset(); + const auto assetFile = context.OpenAssetFile(GetFileNameForLod(model.name, lod, extension)); if (!assetFile) return; @@ -657,12 +657,12 @@ namespace void DumpXModelSurfs(const AssetDumpingContext& context, const XAssetInfo& asset) { - const auto* model = asset.Asset(); + const auto& model = *asset.Asset(); - for (auto currentLod = 0u; currentLod < model->numLods; currentLod++) + for (auto currentLod = 0u; currentLod < model.numLods; currentLod++) { XModelCommon common; - PopulateXModelWriter(common, context, currentLod, asset.Asset()); + PopulateXModelWriter(common, context, currentLod, model); switch (ObjWriting::Configuration.ModelOutputFormat) { @@ -703,10 +703,10 @@ namespace { } - void Dump(AssetDumpingContext& context, const XModel* xmodel) const + void Dump(AssetDumpingContext& context, const XModel& model) const { JsonXModel jsonXModel; - CreateJsonXModel(context, jsonXModel, *xmodel); + CreateJsonXModel(context, jsonXModel, model); nlohmann::json jRoot = jsonXModel; jRoot["$schema"] = "http://openassettools.dev/schema/xmodel.v1.json"; @@ -746,26 +746,26 @@ namespace } } - static bool IsAnimated(const XModel& xmodel) + static bool IsAnimated(const XModel& model) { #if defined(FEATURE_IW4) || defined(FEATURE_IW5) - for (auto i = 0u; i < xmodel.numLods; i++) + for (auto i = 0u; i < model.numLods; i++) { - const auto& lod = xmodel.lodInfo[i]; + const auto& lod = model.lodInfo[i]; if (lod.modelSurfs == nullptr || lod.modelSurfs->surfs == nullptr) continue; for (auto j = 0u; j < lod.modelSurfs->numsurfs; j++) { - const auto& surf = xmodel.lodInfo[i].modelSurfs->surfs[j]; + const auto& surf = model.lodInfo[i].modelSurfs->surfs[j]; if (surf.vertInfo.vertsBlend) return true; } } #else - for (auto i = 0u; i < xmodel.numsurfs; i++) + for (auto i = 0u; i < model.numsurfs; i++) { - const auto& surf = xmodel.surfs[i]; + const auto& surf = model.surfs[i]; if (surf.vertInfo.vertsBlend) return true; } @@ -774,29 +774,29 @@ namespace return false; } - static bool HasNulledTrans(const XModel& xmodel) + static bool HasNulledTrans(const XModel& model) { - if (xmodel.trans == nullptr) + if (model.trans == nullptr) return true; - const auto transCount = (xmodel.numBones - xmodel.numRootBones) * 3u; + const auto transCount = (model.numBones - model.numRootBones) * 3u; for (auto i = 0u; i < transCount; i++) { - if (xmodel.trans[i] != 0) + if (model.trans[i] != 0) return false; } return true; } - static bool HasNonNullBoneInfoTrans(const XModel& xmodel) + static bool HasNonNullBoneInfoTrans(const XModel& model) { - if (xmodel.boneInfo == nullptr) + if (model.boneInfo == nullptr) return false; - for (auto i = 0u; i < xmodel.numBones; i++) + for (auto i = 0u; i < model.numBones; i++) { - const auto& boneInfo = xmodel.boneInfo[i]; + const auto& boneInfo = model.boneInfo[i]; #if defined(FEATURE_IW4) || defined(FEATURE_IW5) if (boneInfo.bounds.midPoint.x != 0 || boneInfo.bounds.midPoint.y != 0 || boneInfo.bounds.midPoint.z != 0) return true; @@ -809,73 +809,73 @@ namespace return false; } - static JsonXModelType GetType(const XModel& xmodel) + static JsonXModelType GetType(const XModel& model) { - if (!IsAnimated(xmodel)) + if (!IsAnimated(model)) return JsonXModelType::RIGID; - if (HasNulledTrans(xmodel) && HasNonNullBoneInfoTrans(xmodel)) + if (HasNulledTrans(model) && HasNonNullBoneInfoTrans(model)) return JsonXModelType::VIEWHANDS; return JsonXModelType::ANIMATED; } - static void SetJsonRootBoneName(AssetDumpingContext& context, JsonXModel& jXModel, const XModel& xmodel) + static void SetJsonRootBoneName(AssetDumpingContext& context, JsonXModel& jXModel, const XModel& model) { - assert(xmodel.boneNames); - assert(xmodel.boneNames[0] < context.m_zone.m_script_strings.Count()); - assert(xmodel.numRootBones <= 1); + assert(model.boneNames); + assert(model.boneNames[0] < context.m_zone.m_script_strings.Count()); + assert(model.numRootBones <= 1); - if (!xmodel.boneNames || xmodel.boneNames[0] >= context.m_zone.m_script_strings.Count() || xmodel.numRootBones == 0) + if (!model.boneNames || model.boneNames[0] >= context.m_zone.m_script_strings.Count() || model.numRootBones == 0) return; - jXModel.rootBoneName = context.m_zone.m_script_strings[xmodel.boneNames[0]]; + jXModel.rootBoneName = context.m_zone.m_script_strings[model.boneNames[0]]; } - static void CreateJsonXModel(AssetDumpingContext& context, JsonXModel& jXModel, const XModel& xmodel) + static void CreateJsonXModel(AssetDumpingContext& context, JsonXModel& jXModel, const XModel& model) { - if (xmodel.collLod >= 0) - jXModel.collLod = xmodel.collLod; + if (model.collLod >= 0) + jXModel.collLod = model.collLod; - jXModel.type = GetType(xmodel); + jXModel.type = GetType(model); - if (CanOmitDefaultArmature() && HasDefaultArmatureForAllLods(xmodel)) + if (CanOmitDefaultArmature() && HasDefaultArmatureForAllLods(model)) { // If we are going to omit the armature, we need to make sure we remember the root bone name. // It does not follow a specific pattern, may not be identical to the xmodel name and // may be required for attaching the xmodel. - SetJsonRootBoneName(context, jXModel, xmodel); + SetJsonRootBoneName(context, jXModel, model); } - for (auto lodNumber = 0u; lodNumber < xmodel.numLods; lodNumber++) + for (auto lodNumber = 0u; lodNumber < model.numLods; lodNumber++) { JsonXModelLod lod; - lod.file = std::format("model_export/{}_lod{}{}", xmodel.name, lodNumber, GetExtensionForModelByConfig()); - lod.distance = xmodel.lodInfo[lodNumber].dist; + lod.file = std::format("model_export/{}_lod{}{}", model.name, lodNumber, GetExtensionForModelByConfig()); + lod.distance = model.lodInfo[lodNumber].dist; jXModel.lods.emplace_back(std::move(lod)); } - if (xmodel.physPreset && xmodel.physPreset->name) - jXModel.physPreset = AssetName(xmodel.physPreset->name); + if (model.physPreset && model.physPreset->name) + jXModel.physPreset = AssetName(model.physPreset->name); #if defined(FEATURE_IW4) || defined(FEATURE_IW5) - if (xmodel.physCollmap && xmodel.physCollmap->name) - jXModel.physCollmap = AssetName(xmodel.physCollmap->name); + if (model.physCollmap && model.physCollmap->name) + jXModel.physCollmap = AssetName(model.physCollmap->name); #endif #if defined(FEATURE_T5) || defined(FEATURE_T6) - if (xmodel.physConstraints && xmodel.physConstraints->name) - jXModel.physConstraints = AssetName(xmodel.physConstraints->name); + if (model.physConstraints && model.physConstraints->name) + jXModel.physConstraints = AssetName(model.physConstraints->name); #endif - jXModel.flags = xmodel.flags; + jXModel.flags = model.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; + jXModel.lightingOriginOffset.x = model.lightingOriginOffset.x; + jXModel.lightingOriginOffset.y = model.lightingOriginOffset.y; + jXModel.lightingOriginOffset.z = model.lightingOriginOffset.z; + jXModel.lightingOriginRange = model.lightingOriginRange; #endif } @@ -889,7 +889,7 @@ namespace return; const JsonDumper dumper(*assetFile); - dumper.Dump(context, asset.Asset()); + dumper.Dump(context, *asset.Asset()); } } // namespace From 4886767e676a38a10e478f8d1711cc27eac0a618 Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Sun, 3 May 2026 13:02:48 +0200 Subject: [PATCH 5/9] chore: get rid of unnecessary class in XModelDumper --- .../XModel/XModelDumper.cpp.template | 286 ++++++++---------- 1 file changed, 131 insertions(+), 155 deletions(-) diff --git a/src/ObjWriting/XModel/XModelDumper.cpp.template b/src/ObjWriting/XModel/XModelDumper.cpp.template index baa6f785..0c5038ba 100644 --- a/src/ObjWriting/XModel/XModelDumper.cpp.template +++ b/src/ObjWriting/XModel/XModelDumper.cpp.template @@ -694,202 +694,178 @@ namespace } } } - - class JsonDumper + + const char* GetExtensionForModelByConfig() { - public: - explicit JsonDumper(std::ostream& stream) - : m_stream(stream) + switch (ObjWriting::Configuration.ModelOutputFormat) { + case ObjWriting::Configuration_t::ModelOutputFormat_e::XMODEL_EXPORT: + return ".xmodel_export"; + case ObjWriting::Configuration_t::ModelOutputFormat_e::XMODEL_BIN: + return ".xmodel_bin"; + case ObjWriting::Configuration_t::ModelOutputFormat_e::OBJ: + return ".obj"; + case ObjWriting::Configuration_t::ModelOutputFormat_e::GLTF: + return ".gltf"; + case ObjWriting::Configuration_t::ModelOutputFormat_e::GLB: + return ".glb"; + default: + assert(false); + return ""; } - - void Dump(AssetDumpingContext& context, const XModel& model) const - { - JsonXModel jsonXModel; - CreateJsonXModel(context, jsonXModel, model); - nlohmann::json jRoot = jsonXModel; - - jRoot["$schema"] = "http://openassettools.dev/schema/xmodel.v1.json"; - jRoot["_type"] = "xmodel"; - jRoot["_version"] = 2; - jRoot["_game"] = GAME_LOWER; - - m_stream << std::setw(4) << jRoot << "\n"; - } - - private: - static const char* AssetName(const char* input) - { - if (input && input[0] == ',') - return &input[1]; - - return input; - } - - static const char* GetExtensionForModelByConfig() - { - switch (ObjWriting::Configuration.ModelOutputFormat) - { - case ObjWriting::Configuration_t::ModelOutputFormat_e::XMODEL_EXPORT: - return ".xmodel_export"; - case ObjWriting::Configuration_t::ModelOutputFormat_e::XMODEL_BIN: - return ".xmodel_bin"; - case ObjWriting::Configuration_t::ModelOutputFormat_e::OBJ: - return ".obj"; - case ObjWriting::Configuration_t::ModelOutputFormat_e::GLTF: - return ".gltf"; - case ObjWriting::Configuration_t::ModelOutputFormat_e::GLB: - return ".glb"; - default: - assert(false); - return ""; - } - } - - static bool IsAnimated(const XModel& model) - { + } + + bool IsAnimated(const XModel& model) + { #if defined(FEATURE_IW4) || defined(FEATURE_IW5) - for (auto i = 0u; i < model.numLods; i++) - { - const auto& lod = model.lodInfo[i]; - if (lod.modelSurfs == nullptr || lod.modelSurfs->surfs == nullptr) - continue; + for (auto i = 0u; i < model.numLods; i++) + { + const auto& lod = model.lodInfo[i]; + if (lod.modelSurfs == nullptr || lod.modelSurfs->surfs == nullptr) + continue; - for (auto j = 0u; j < lod.modelSurfs->numsurfs; j++) - { - const auto& surf = model.lodInfo[i].modelSurfs->surfs[j]; - if (surf.vertInfo.vertsBlend) - return true; - } - } -#else - for (auto i = 0u; i < model.numsurfs; i++) + for (auto j = 0u; j < lod.modelSurfs->numsurfs; j++) { - const auto& surf = model.surfs[i]; + const auto& surf = model.lodInfo[i].modelSurfs->surfs[j]; if (surf.vertInfo.vertsBlend) return true; } -#endif - - return false; } - - static bool HasNulledTrans(const XModel& model) - { - if (model.trans == nullptr) - return true; - - const auto transCount = (model.numBones - model.numRootBones) * 3u; - for (auto i = 0u; i < transCount; i++) - { - if (model.trans[i] != 0) - return false; - } - - return true; - } - - static bool HasNonNullBoneInfoTrans(const XModel& model) - { - if (model.boneInfo == nullptr) - return false; - - for (auto i = 0u; i < model.numBones; i++) - { - const auto& boneInfo = model.boneInfo[i]; -#if defined(FEATURE_IW4) || defined(FEATURE_IW5) - if (boneInfo.bounds.midPoint.x != 0 || boneInfo.bounds.midPoint.y != 0 || boneInfo.bounds.midPoint.z != 0) - return true; #else - if (boneInfo.offset.x != 0 || boneInfo.offset.y != 0 || boneInfo.offset.z != 0) - return true; + for (auto i = 0u; i < model.numsurfs; i++) + { + const auto& surf = model.surfs[i]; + if (surf.vertInfo.vertsBlend) + return true; + } #endif - } + return false; + } + + bool HasNulledTrans(const XModel& model) + { + if (model.trans == nullptr) + return true; + + const auto transCount = (model.numBones - model.numRootBones) * 3u; + for (auto i = 0u; i < transCount; i++) + { + if (model.trans[i] != 0) + return false; + } + + return true; + } + + bool HasNonNullBoneInfoTrans(const XModel& model) + { + if (model.boneInfo == nullptr) return false; - } - static JsonXModelType GetType(const XModel& model) + for (auto i = 0u; i < model.numBones; i++) { - if (!IsAnimated(model)) - return JsonXModelType::RIGID; - - if (HasNulledTrans(model) && HasNonNullBoneInfoTrans(model)) - return JsonXModelType::VIEWHANDS; - - return JsonXModelType::ANIMATED; + const auto& boneInfo = model.boneInfo[i]; +#if defined(FEATURE_IW4) || defined(FEATURE_IW5) + if (boneInfo.bounds.midPoint.x != 0 || boneInfo.bounds.midPoint.y != 0 || boneInfo.bounds.midPoint.z != 0) + return true; +#else + if (boneInfo.offset.x != 0 || boneInfo.offset.y != 0 || boneInfo.offset.z != 0) + return true; +#endif } + + return false; + } + + JsonXModelType GetType(const XModel& model) + { + if (!IsAnimated(model)) + return JsonXModelType::RIGID; + + if (HasNulledTrans(model) && HasNonNullBoneInfoTrans(model)) + return JsonXModelType::VIEWHANDS; + + return JsonXModelType::ANIMATED; + } + + void SetJsonRootBoneName(AssetDumpingContext& context, JsonXModel& jXModel, const XModel& model) + { + assert(model.boneNames); + assert(model.boneNames[0] < context.m_zone.m_script_strings.Count()); + assert(model.numRootBones <= 1); - static void SetJsonRootBoneName(AssetDumpingContext& context, JsonXModel& jXModel, const XModel& model) + if (!model.boneNames || model.boneNames[0] >= context.m_zone.m_script_strings.Count() || model.numRootBones == 0) + return; + + jXModel.rootBoneName = context.m_zone.m_script_strings[model.boneNames[0]]; + } + + void CreateJsonXModel(AssetDumpingContext& context, JsonXModel& jXModel, const XModel& model) + { + if (model.collLod >= 0) + jXModel.collLod = model.collLod; + + jXModel.type = GetType(model); + + if (CanOmitDefaultArmature() && HasDefaultArmatureForAllLods(model)) { - assert(model.boneNames); - assert(model.boneNames[0] < context.m_zone.m_script_strings.Count()); - assert(model.numRootBones <= 1); - - if (!model.boneNames || model.boneNames[0] >= context.m_zone.m_script_strings.Count() || model.numRootBones == 0) - return; - - jXModel.rootBoneName = context.m_zone.m_script_strings[model.boneNames[0]]; + // If we are going to omit the armature, we need to make sure we remember the root bone name. + // It does not follow a specific pattern, may not be identical to the xmodel name and + // may be required for attaching the xmodel. + SetJsonRootBoneName(context, jXModel, model); } - static void CreateJsonXModel(AssetDumpingContext& context, JsonXModel& jXModel, const XModel& model) + for (auto lodNumber = 0u; lodNumber < model.numLods; lodNumber++) { - if (model.collLod >= 0) - jXModel.collLod = model.collLod; + JsonXModelLod lod; + lod.file = std::format("model_export/{}_lod{}{}", model.name, lodNumber, GetExtensionForModelByConfig()); + lod.distance = model.lodInfo[lodNumber].dist; - jXModel.type = GetType(model); - - if (CanOmitDefaultArmature() && HasDefaultArmatureForAllLods(model)) - { - // If we are going to omit the armature, we need to make sure we remember the root bone name. - // It does not follow a specific pattern, may not be identical to the xmodel name and - // may be required for attaching the xmodel. - SetJsonRootBoneName(context, jXModel, model); - } + jXModel.lods.emplace_back(std::move(lod)); + } - for (auto lodNumber = 0u; lodNumber < model.numLods; lodNumber++) - { - JsonXModelLod lod; - lod.file = std::format("model_export/{}_lod{}{}", model.name, lodNumber, GetExtensionForModelByConfig()); - lod.distance = model.lodInfo[lodNumber].dist; - - jXModel.lods.emplace_back(std::move(lod)); - } - - if (model.physPreset && model.physPreset->name) - jXModel.physPreset = AssetName(model.physPreset->name); + if (model.physPreset && model.physPreset->name) + jXModel.physPreset = AssetName(model.physPreset->name); #if defined(FEATURE_IW4) || defined(FEATURE_IW5) - if (model.physCollmap && model.physCollmap->name) - jXModel.physCollmap = AssetName(model.physCollmap->name); + if (model.physCollmap && model.physCollmap->name) + jXModel.physCollmap = AssetName(model.physCollmap->name); #endif #if defined(FEATURE_T5) || defined(FEATURE_T6) - if (model.physConstraints && model.physConstraints->name) - jXModel.physConstraints = AssetName(model.physConstraints->name); + if (model.physConstraints && model.physConstraints->name) + jXModel.physConstraints = AssetName(model.physConstraints->name); #endif - jXModel.flags = model.flags; + jXModel.flags = model.flags; #ifdef FEATURE_T6 - jXModel.lightingOriginOffset.x = model.lightingOriginOffset.x; - jXModel.lightingOriginOffset.y = model.lightingOriginOffset.y; - jXModel.lightingOriginOffset.z = model.lightingOriginOffset.z; - jXModel.lightingOriginRange = model.lightingOriginRange; + jXModel.lightingOriginOffset.x = model.lightingOriginOffset.x; + jXModel.lightingOriginOffset.y = model.lightingOriginOffset.y; + jXModel.lightingOriginOffset.z = model.lightingOriginOffset.z; + jXModel.lightingOriginRange = model.lightingOriginRange; #endif - } - - std::ostream& m_stream; - }; + } void DumpXModelJson(AssetDumpingContext& context, const XAssetInfo& asset) { const auto assetFile = context.OpenAssetFile(xmodel::GetJsonFileNameForAssetName(asset.m_name)); if (!assetFile) return; + + const auto& model = *asset.Asset(); - const JsonDumper dumper(*assetFile); - dumper.Dump(context, *asset.Asset()); + JsonXModel jsonXModel; + CreateJsonXModel(context, jsonXModel, model); + nlohmann::json jRoot = jsonXModel; + + jRoot["$schema"] = "http://openassettools.dev/schema/xmodel.v1.json"; + jRoot["_type"] = "xmodel"; + jRoot["_version"] = 2; + jRoot["_game"] = GAME_LOWER; + + *assetFile << std::setw(4) << jRoot << "\n"; } } // namespace From b7a22973e68c5dfa8439f51ae3841fa4517e7bd3 Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Sun, 3 May 2026 13:05:00 +0200 Subject: [PATCH 6/9] chore: make sure xmodel flags are unsigned --- src/Common/Game/IW3/IW3_Assets.h | 2 +- src/Common/Game/IW4/IW4_Assets.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Common/Game/IW3/IW3_Assets.h b/src/Common/Game/IW3/IW3_Assets.h index a1c2448b..0d4062e9 100644 --- a/src/Common/Game/IW3/IW3_Assets.h +++ b/src/Common/Game/IW3/IW3_Assets.h @@ -530,7 +530,7 @@ namespace IW3 int16_t collLod; XModelStreamInfo streamInfo; int memUsage; - char flags; + unsigned char flags; bool bad; PhysPreset* physPreset; PhysGeomList* physGeoms; diff --git a/src/Common/Game/IW4/IW4_Assets.h b/src/Common/Game/IW4/IW4_Assets.h index f24b869f..40aa6a87 100644 --- a/src/Common/Game/IW4/IW4_Assets.h +++ b/src/Common/Game/IW4/IW4_Assets.h @@ -586,7 +586,7 @@ namespace IW4 char maxLoadedLod; unsigned char numLods; char collLod; - char flags; + unsigned char flags; XModelCollSurf_s* collSurfs; int numCollSurfs; int contents; From 989d29b359a0409c3e32d42f25dc7d1b37459659 Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Sun, 3 May 2026 13:27:35 +0200 Subject: [PATCH 7/9] feat: support root bone name from xmodel json --- src/ObjLoading/XModel/LoaderXModel.cpp.template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ObjLoading/XModel/LoaderXModel.cpp.template b/src/ObjLoading/XModel/LoaderXModel.cpp.template index 3fbd4e43..3a3e3666 100644 --- a/src/ObjLoading/XModel/LoaderXModel.cpp.template +++ b/src/ObjLoading/XModel/LoaderXModel.cpp.template @@ -156,14 +156,14 @@ namespace return nullptr; } - static void AutoGenerateArmature(XModelCommon& common) + static void AutoGenerateArmature(XModelCommon& common, const JsonXModel& jXModel) { assert(common.m_bones.empty()); assert(common.m_bone_weight_data.weights.empty()); assert(common.m_vertex_bone_weights.size() == common.m_vertices.size()); XModelBone rootBone{ - .name = "root", + .name = jXModel.rootBoneName.value_or("root"), .parentIndex = std::nullopt, .scale = {1.0f, 1.0f, 1.0f}, .globalOffset = {0.0f, 0.0f, 0.0f}, @@ -171,7 +171,7 @@ namespace .globalRotation = {.x = 0.0f, .y = 0.0f, .z = 0.0f, .w = 1.0f}, .localRotation = {.x = 0.0f, .y = 0.0f, .z = 0.0f, .w = 1.0f}, }; - common.m_bones.emplace_back(rootBone); + common.m_bones.emplace_back(std::move(rootBone)); XModelBoneWeight rootWeight{.boneIndex = 0, .weight = 1.0f}; common.m_bone_weight_data.weights.emplace_back(rootWeight); @@ -814,7 +814,7 @@ namespace } if (common->m_bones.empty()) - AutoGenerateArmature(*common); + AutoGenerateArmature(*common, jXModel); if (lodNumber == 0u) { From ed1ed73c73058ca2bd98b6849746152d20c12f46 Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Sun, 3 May 2026 13:40:31 +0200 Subject: [PATCH 8/9] chore: warn about mismatching root bone name between model and xmodel json --- src/ObjLoading/XModel/LoaderXModel.cpp.template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/ObjLoading/XModel/LoaderXModel.cpp.template b/src/ObjLoading/XModel/LoaderXModel.cpp.template index 3a3e3666..6188cf0a 100644 --- a/src/ObjLoading/XModel/LoaderXModel.cpp.template +++ b/src/ObjLoading/XModel/LoaderXModel.cpp.template @@ -183,6 +183,21 @@ namespace } } + static void CheckSpecifiedRootBoneName(XModelCommon& common, const JsonXModel& jXModel) + { + assert(!common.m_bones.empty()); + + if (!jXModel.rootBoneName) + return; + + if (*jXModel.rootBoneName != common.m_bones[0].name) + { + con::warn( + "Root bone name of model json {} does not match the model's root bone name. The name from the xmodel json is ignored and can be removed!", + common.m_name); + } + } + static void ApplyBasePose(DObjAnimMat& baseMat, const XModelBone& bone) { baseMat.trans.x = bone.globalOffset[0]; @@ -815,6 +830,8 @@ namespace if (common->m_bones.empty()) AutoGenerateArmature(*common, jXModel); + else + CheckSpecifiedRootBoneName(*common, jXModel); if (lodNumber == 0u) { From 0c1bc747dc1b04626604a7f7d34a23707167badd Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Sun, 3 May 2026 13:51:56 +0200 Subject: [PATCH 9/9] chore: update default root bone name to empty string and do not specify if matching default name --- src/ObjCommon/XModel/XModelCommon.h | 4 +++- src/ObjLoading/XModel/LoaderXModel.cpp.template | 2 +- src/ObjWriting/XModel/XModelDumper.cpp.template | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/ObjCommon/XModel/XModelCommon.h b/src/ObjCommon/XModel/XModelCommon.h index 46ebf3bb..04718be2 100644 --- a/src/ObjCommon/XModel/XModelCommon.h +++ b/src/ObjCommon/XModel/XModelCommon.h @@ -132,5 +132,7 @@ typedef DistinctMapper VertexMerger; namespace xmodel { + constexpr auto DEFAULT_XMODEL_ROOT_BONE_NAME = ""; + std::string GetJsonFileNameForAssetName(const std::string& assetName); -} +} // namespace xmodel diff --git a/src/ObjLoading/XModel/LoaderXModel.cpp.template b/src/ObjLoading/XModel/LoaderXModel.cpp.template index 6188cf0a..b23fbd2b 100644 --- a/src/ObjLoading/XModel/LoaderXModel.cpp.template +++ b/src/ObjLoading/XModel/LoaderXModel.cpp.template @@ -163,7 +163,7 @@ namespace assert(common.m_vertex_bone_weights.size() == common.m_vertices.size()); XModelBone rootBone{ - .name = jXModel.rootBoneName.value_or("root"), + .name = jXModel.rootBoneName.value_or(xmodel::DEFAULT_XMODEL_ROOT_BONE_NAME), .parentIndex = std::nullopt, .scale = {1.0f, 1.0f, 1.0f}, .globalOffset = {0.0f, 0.0f, 0.0f}, diff --git a/src/ObjWriting/XModel/XModelDumper.cpp.template b/src/ObjWriting/XModel/XModelDumper.cpp.template index 0c5038ba..9b0b1bba 100644 --- a/src/ObjWriting/XModel/XModelDumper.cpp.template +++ b/src/ObjWriting/XModel/XModelDumper.cpp.template @@ -797,8 +797,11 @@ namespace if (!model.boneNames || model.boneNames[0] >= context.m_zone.m_script_strings.Count() || model.numRootBones == 0) return; + + const auto& rootBoneName = context.m_zone.m_script_strings[model.boneNames[0]]; - jXModel.rootBoneName = context.m_zone.m_script_strings[model.boneNames[0]]; + if (rootBoneName != xmodel::DEFAULT_XMODEL_ROOT_BONE_NAME) + jXModel.rootBoneName = rootBoneName; } void CreateJsonXModel(AssetDumpingContext& context, JsonXModel& jXModel, const XModel& model)