Removed submesh override migration that dropped model textures

eduardodoria · eduardodoria · commit 07f603367490 · 2026-08-08T00:51:59.000-03:00
diff --git a/editor/Catalog.cpp b/editor/Catalog.cpp
@@ -168,13 +168,10 @@ namespace {
         return false;
     }
 
-    // What an override addresses: the owning model, the live submesh, and the mesh node a
-    // not-yet-migrated entry was keyed with.
+    // What an override addresses: the owning model and the live submesh.
     struct SubmeshOverrideTarget {
         ModelComponent* model = nullptr;
         const Submesh* submesh = nullptr;
-        unsigned int submeshIndex = 0;
-        int migrateNode = -1;
         std::string sourceName;
     };
 
@@ -191,34 +188,14 @@ namespace {
 
         target.model = &registry->getComponent<ModelComponent>(modelEntity);
         target.submesh = &mesh->submeshes[submeshIndex];
-        target.submeshIndex = submeshIndex;
-        target.migrateNode = -1;
         target.sourceName = MeshSystem::getSourceName(*target.model, target.submesh->sourceNode, target.submesh->sourcePrimitive);
 
-        if (entity != modelEntity) {
-            for (const auto& meshNode : target.model->meshNodesMapping) {
-                if (meshNode.second == entity) {
-                    target.migrateNode = meshNode.first;
-                    break;
-                }
-            }
-        }
-
         return true;
     }
 
-    // Mirrors MeshSystem's matching: a recorded entry through the primitive stamped on the submesh,
-    // one still to migrate through the node and position it was built with.
+    // Mirrors MeshSystem's matching, through the primitive stamped on the submesh.
     SubmeshOverride* findSubmeshOverrideEntry(const SubmeshOverrideTarget& target) {
         for (auto& submeshOverride : target.model->submeshOverrides) {
-            if (submeshOverride.needMigrate) {
-                if (submeshOverride.nodeIndex == target.migrateNode &&
-                        submeshOverride.primitiveIndex == target.submeshIndex) {
-                    return &submeshOverride;
-                }
-                continue;
-            }
-
             // Identity decides here too: an orphaned entry can still hold the numeric key of a
             // primitive that now belongs to someone else.
             if (submeshOverride.nodeIndex == target.submesh->sourceNode &&
@@ -3741,8 +3718,6 @@ void editor::Catalog::recordSubmeshOverride(EntityRegistry* registry, Entity ent
         entry->sourceName = target.sourceName;
     }
 
-    // An entry still to migrate is edited in place: it already carries every field, and the load
-    // reduces it to whatever differs from the model file, this edit included.
     entry->fields |= fields;
     storeSubmeshOverrideValues(*entry, *target.submesh);
 }
diff --git a/editor/Factory.cpp b/editor/Factory.cpp
@@ -1901,9 +1901,6 @@ std::string editor::Factory::createModelComponent(int indentSpaces, EntityRegist
         code << subInd << "submeshOverride.primitiveIndex = " << formatUInt(submeshOverride.primitiveIndex) << ";\n";
         code << subInd << "submeshOverride.sourceName = " << formatString(submeshOverride.sourceName) << ";\n";
         code << subInd << "submeshOverride.fields = " << formatUInt(fields) << ";\n";
-        if (submeshOverride.needMigrate) {
-            code << subInd << "submeshOverride.needMigrate = true;\n";
-        }
 
         if (fields & SubmeshOverride_BaseColorFactor)
             code << subInd << "submeshOverride.material.baseColorFactor = " << formatVector4(material.baseColorFactor) << ";\n";
diff --git a/editor/Stream.cpp b/editor/Stream.cpp
@@ -1436,43 +1436,6 @@ Submesh editor::Stream::decodeSubmesh(const YAML::Node& node, const Submesh* old
     return submesh;
 }
 
-// Rebuilds override entries from the submesh values of a model saved before overrides existed, so
-// the load stops wiping the user's edits. Every field is carried over: the model file is not in
-// memory yet, so MeshSystem reduces each entry to the real differences once it loads.
-void editor::Stream::migrateSubmeshOverrides(EntityRegistry* registry, Entity entity) {
-    ModelComponent* model = registry->findComponent<ModelComponent>(entity);
-    if (!model || model->filename.empty() || !model->submeshOverrides.empty()) {
-        return;
-    }
-
-    auto collectMesh = [registry, model](Entity meshEntity, int nodeIndex) {
-        MeshComponent* mesh = registry->findComponent<MeshComponent>(meshEntity);
-        if (!mesh) {
-            return;
-        }
-
-        for (unsigned int i = 0; i < mesh->numSubmeshes; i++) {
-            SubmeshOverride submeshOverride;
-            submeshOverride.nodeIndex = nodeIndex;
-            submeshOverride.primitiveIndex = i;
-            submeshOverride.fields = SubmeshOverride_All;
-            submeshOverride.material = mesh->submeshes[i].material;
-            submeshOverride.faceCulling = mesh->submeshes[i].faceCulling;
-            submeshOverride.textureShadow = mesh->submeshes[i].textureShadow;
-            submeshOverride.primitiveType = mesh->submeshes[i].primitiveType;
-            submeshOverride.needMigrate = true;
-
-            model->submeshOverrides.push_back(submeshOverride);
-        }
-    };
-
-    // The root mesh (single-node and merged models) has no node of its own.
-    collectMesh(entity, -1);
-    for (const auto& meshNode : model->meshNodesMapping) {
-        collectMesh(meshNode.second, meshNode.first);
-    }
-}
-
 // Only the fields the user changed are written; the rest keeps following the model file.
 YAML::Node editor::Stream::encodeSubmeshOverride(const SubmeshOverride& submeshOverride) {
     YAML::Node node;
@@ -1486,10 +1449,6 @@ YAML::Node editor::Stream::encodeSubmeshOverride(const SubmeshOverride& submeshO
         node["sourceName"] = submeshOverride.sourceName;
     }
     node["fields"] = fields;
-    // A migration that never ran (the model file failed to load) must stay a migration.
-    if (submeshOverride.needMigrate) {
-        node["needMigrate"] = true;
-    }
 
     if (fields & SubmeshOverride_BaseColorFactor) node["baseColorFactor"] = encodeVector4(material.baseColorFactor);
     if (fields & SubmeshOverride_MetallicFactor) node["metallicFactor"] = material.metallicFactor;
@@ -1522,7 +1481,6 @@ SubmeshOverride editor::Stream::decodeSubmeshOverride(const YAML::Node& node) {
     if (node["primitiveIndex"]) submeshOverride.primitiveIndex = node["primitiveIndex"].as<unsigned int>();
     if (node["sourceName"]) submeshOverride.sourceName = node["sourceName"].as<std::string>();
     if (node["fields"]) submeshOverride.fields = node["fields"].as<uint32_t>();
-    if (node["needMigrate"]) submeshOverride.needMigrate = node["needMigrate"].as<bool>();
 
     Material& material = submeshOverride.material;
 
@@ -2859,14 +2817,8 @@ std::vector<Entity> editor::Stream::decodeEntity(const YAML::Node& entityNode, E
         std::string name = entityNode["name"].as<std::string>();
         registry->setEntityName(entity, name);
 
-        bool migrateOverrides = false;
         if (entityNode["components"]){
             decodeComponents(entity, parent, registry, entityNode["components"]);
-
-            // A model saved before overrides existed still keeps the user's edits in its submesh
-            // arrays.
-            YAML::Node modelNode = entityNode["components"][Catalog::getComponentName(ComponentType::ModelComponent, true)];
-            migrateOverrides = modelNode && !modelNode["submeshOverrides"];
         }
 
         // Components added to a live entity after it was encoded, like a script calling
@@ -2900,11 +2852,6 @@ std::vector<Entity> editor::Stream::decodeEntity(const YAML::Node& entityNode, E
                 std::copy(childEntities.begin(), childEntities.end(), std::back_inserter(allEntities));
             }
         }
-
-        // Runs after the children: a model's generated meshes carry submesh values of their own.
-        if (migrateOverrides) {
-            migrateSubmeshOverrides(registry, entity);
-        }
     }
 
     return allEntities;
@@ -4856,15 +4803,13 @@ YAML::Node editor::Stream::encodeModelComponent(const ModelComponent& model) {
         node["mergeStaticMeshes"] = true;
     }
 
-    // Written even when empty: a missing key marks a scene saved before overrides existed.
-    YAML::Node overridesNode(YAML::NodeType::Sequence);
-    for (const auto& submeshOverride : model.submeshOverrides) {
-        if (submeshOverride.fields == 0) {
-            continue;
+    if (!model.submeshOverrides.empty()) {
+        YAML::Node overridesNode;
+        for (const auto& submeshOverride : model.submeshOverrides) {
+            overridesNode.push_back(encodeSubmeshOverride(submeshOverride));
         }
-        overridesNode.push_back(encodeSubmeshOverride(submeshOverride));
+        node["submeshOverrides"] = overridesNode;
     }
-    node["submeshOverrides"] = overridesNode;
 
     node["skeleton"] = static_cast<uint32_t>(model.skeleton);
 
@@ -4924,11 +4869,9 @@ ModelComponent editor::Stream::decodeModelComponent(const YAML::Node& node, cons
     if (node["mergeStaticMeshes"]) model.mergeStaticMeshes = node["mergeStaticMeshes"].as<bool>();
     if (node["skeleton"]) model.skeleton = static_cast<Entity>(node["skeleton"].as<uint32_t>());
 
-    if (node["submeshOverrides"]) {
-        model.submeshOverrides.clear();
-        for (const auto& overrideNode : node["submeshOverrides"]) {
-            model.submeshOverrides.push_back(decodeSubmeshOverride(overrideNode));
-        }
+    model.submeshOverrides.clear();
+    for (const auto& overrideNode : node["submeshOverrides"]) {
+        model.submeshOverrides.push_back(decodeSubmeshOverride(overrideNode));
     }
 
     if (node["animations"]) {
diff --git a/editor/Stream.h b/editor/Stream.h
@@ -157,8 +157,6 @@ namespace doriax::editor {
         static YAML::Node encodeSubmesh(const Submesh& submesh, bool embedTextureData = true);
         static Submesh decodeSubmesh(const YAML::Node& node, const Submesh* oldSubmesh = nullptr);
 
-        static void migrateSubmeshOverrides(EntityRegistry* registry, Entity entity);
-
         static YAML::Node encodeSubmeshOverride(const SubmeshOverride& submeshOverride);
         static SubmeshOverride decodeSubmeshOverride(const YAML::Node& node);
 
diff --git a/engine/core/component/ModelComponent.h b/engine/core/component/ModelComponent.h
@@ -43,10 +43,7 @@ namespace doriax{
                                    SubmeshOverride_EmissiveFactor | SubmeshOverride_AlphaMode |
                                    SubmeshOverride_MaterialName | SubmeshOverride_BaseColorTexture |
                                    SubmeshOverride_EmissiveTexture | SubmeshOverride_MetallicRoughnessTexture |
-                                   SubmeshOverride_OcclusionTexture | SubmeshOverride_NormalTexture,
-
-        SubmeshOverride_All = SubmeshOverride_Material | SubmeshOverride_FaceCulling |
-                              SubmeshOverride_TextureShadow | SubmeshOverride_PrimitiveType
+                                   SubmeshOverride_OcclusionTexture | SubmeshOverride_NormalTexture
     };
 
     // Material texture slots, so override code does not spell all five out every time.
@@ -79,10 +76,6 @@ namespace doriax{
         bool faceCulling = true;
         bool textureShadow = false;
         PrimitiveType primitiveType = PrimitiveType::TRIANGLES;
-
-        // Rebuilt from a scene saved before overrides existed: no key yet, so the first load
-        // matches it by position and reduces it to the real differences.
-        bool needMigrate = false;
     };
 
     struct DORIAX_API ModelComponent{
diff --git a/engine/core/subsystem/MeshSystem.cpp b/engine/core/subsystem/MeshSystem.cpp
@@ -246,20 +246,11 @@ unsigned int MeshSystem::countSourceName(const ModelComponent& model, const std:
 }
 
 // Finds the override that patches a loaded submesh: by source key, then by name for a reordered
-// asset, then by position for entries recovered from an old scene.
-SubmeshOverride* MeshSystem::matchSubmeshOverride(ModelComponent& model, const Submesh& submesh, unsigned int submeshIndex) {
+// asset.
+SubmeshOverride* MeshSystem::matchSubmeshOverride(ModelComponent& model, const Submesh& submesh) {
     const std::string sourceName = getSourceName(model, submesh.sourceNode, submesh.sourcePrimitive);
 
     for (auto& submeshOverride : model.submeshOverrides) {
-        if (submeshOverride.needMigrate) {
-            // No source key yet: rebuilt from the submesh array of a scene saved before overrides.
-            if (submeshOverride.primitiveIndex == submeshIndex &&
-                    (submeshOverride.nodeIndex < 0 || submeshOverride.nodeIndex == submesh.sourceNode)) {
-                return &submeshOverride;
-            }
-            continue;
-        }
-
         // The key is only trusted while the recorded name agrees: deleting a primitive shifts the
         // ones behind it, and a rename cannot be told from a deletion.
         if (submeshOverride.nodeIndex == submesh.sourceNode &&
@@ -277,7 +268,7 @@ SubmeshOverride* MeshSystem::matchSubmeshOverride(ModelComponent& model, const S
 
     SubmeshOverride* match = nullptr;
     for (auto& submeshOverride : model.submeshOverrides) {
-        if (submeshOverride.needMigrate || submeshOverride.sourceName != sourceName) {
+        if (submeshOverride.sourceName != sourceName) {
             continue;
         }
         if (match) {
@@ -290,52 +281,6 @@ SubmeshOverride* MeshSystem::matchSubmeshOverride(ModelComponent& model, const S
     return match;
 }
 
-// Reduces an entry recovered from an old scene to the fields that really differ from the file.
-void MeshSystem::migrateSubmeshOverride(SubmeshOverride& submeshOverride, const Submesh& submesh) {
-    // Saved values lose a few bits in text; an exact compare would flag untouched fields.
-    auto sameFloat = [](float a, float b) { return std::fabs(a - b) <= 1e-5f; };
-    auto sameVector3 = [&sameFloat](const Vector3& a, const Vector3& b) {
-        return sameFloat(a.x, b.x) && sameFloat(a.y, b.y) && sameFloat(a.z, b.z);
-    };
-    auto sameVector4 = [&sameFloat](const Vector4& a, const Vector4& b) {
-        return sameFloat(a.x, b.x) && sameFloat(a.y, b.y) && sameFloat(a.z, b.z) && sameFloat(a.w, b.w);
-    };
-
-    const Material& material = submesh.material;
-    uint32_t fields = submeshOverride.fields;
-
-    if (sameVector4(submeshOverride.material.baseColorFactor, material.baseColorFactor))
-        fields &= ~SubmeshOverride_BaseColorFactor;
-    if (sameFloat(submeshOverride.material.metallicFactor, material.metallicFactor))
-        fields &= ~SubmeshOverride_MetallicFactor;
-    if (sameFloat(submeshOverride.material.roughnessFactor, material.roughnessFactor))
-        fields &= ~SubmeshOverride_RoughnessFactor;
-    if (sameFloat(submeshOverride.material.alphaCutoff, material.alphaCutoff))
-        fields &= ~SubmeshOverride_AlphaCutoff;
-    if (sameVector3(submeshOverride.material.emissiveFactor, material.emissiveFactor))
-        fields &= ~SubmeshOverride_EmissiveFactor;
-    if (submeshOverride.material.alphaMode == material.alphaMode)
-        fields &= ~SubmeshOverride_AlphaMode;
-    if (submeshOverride.material.name == material.name)
-        fields &= ~SubmeshOverride_MaterialName;
-
-    for (const SubmeshOverrideTextureSlot& slot : submeshOverrideTextureSlots) {
-        if (submeshOverride.material.*slot.texture == material.*slot.texture) {
-            fields &= ~slot.field;
-        }
-    }
-
-    if (submeshOverride.faceCulling == submesh.faceCulling)
-        fields &= ~SubmeshOverride_FaceCulling;
-    if (submeshOverride.textureShadow == submesh.textureShadow)
-        fields &= ~SubmeshOverride_TextureShadow;
-    if (submeshOverride.primitiveType == submesh.primitiveType)
-        fields &= ~SubmeshOverride_PrimitiveType;
-
-    submeshOverride.fields = fields;
-    submeshOverride.needMigrate = false;
-}
-
 // Re-applies the user's edits after a load, once per MeshComponent the loaders filled.
 void MeshSystem::applySubmeshOverrides(ModelComponent& model, MeshComponent& mesh) {
     if (model.submeshOverrides.empty() || mesh.numSubmeshes == 0) {
@@ -345,15 +290,11 @@ void MeshSystem::applySubmeshOverrides(ModelComponent& model, MeshComponent& mes
     for (unsigned int i = 0; i < mesh.numSubmeshes; i++) {
         Submesh& submesh = mesh.submeshes[i];
 
-        SubmeshOverride* submeshOverride = matchSubmeshOverride(model, submesh, i);
+        SubmeshOverride* submeshOverride = matchSubmeshOverride(model, submesh);
         if (!submeshOverride) {
             continue;
         }
 
-        if (submeshOverride->needMigrate) {
-            migrateSubmeshOverride(*submeshOverride, submesh);
-        }
-
         // Re-key to where the primitive lives now: a name match should not have to happen twice.
         submeshOverride->nodeIndex = submesh.sourceNode;
         submeshOverride->primitiveIndex = submesh.sourcePrimitive;
@@ -388,14 +329,6 @@ void MeshSystem::applySubmeshOverrides(ModelComponent& model, MeshComponent& mes
 
         submesh.needUpdateTexture = true;
     }
-
-    // A migrated entry that matched the model file everywhere was never an edit.
-    model.submeshOverrides.erase(
-        std::remove_if(model.submeshOverrides.begin(), model.submeshOverrides.end(),
-            [](const SubmeshOverride& submeshOverride) {
-                return submeshOverride.fields == 0 && !submeshOverride.needMigrate;
-            }),
-        model.submeshOverrides.end());
 }
 
 bool MeshSystem::createSprite(SpriteComponent& sprite, MeshComponent& mesh, CameraComponent& camera){
diff --git a/engine/core/subsystem/MeshSystem.h b/engine/core/subsystem/MeshSystem.h
@@ -75,8 +75,7 @@ namespace doriax{
         static void applyDefaultGLTFMaterial(Material& material);
         static void applyDefaultObjMaterial(Submesh& submesh);
         static unsigned int countSourceName(const ModelComponent& model, const std::string& sourceName);
-        static SubmeshOverride* matchSubmeshOverride(ModelComponent& model, const Submesh& submesh, unsigned int submeshIndex);
-        static void migrateSubmeshOverride(SubmeshOverride& submeshOverride, const Submesh& submesh);
+        static SubmeshOverride* matchSubmeshOverride(ModelComponent& model, const Submesh& submesh);
         static void applySubmeshOverrides(ModelComponent& model, MeshComponent& mesh);
         void addSubmeshAttribute(Submesh& submesh, const std::string& bufferName, AttributeType attribute, unsigned int elements, AttributeDataType dataType, size_t size, size_t offset, bool normalized);
         bool loadGLTFBuffer(int bufferViewIndex, MeshComponent& mesh, ModelComponent& model, const int stride, std::vector<std::string>& loadedBuffers);
