Refactor parts of texture system against white textures #2

Author: Dutchman101

Client/game_sa/CRenderWareSA.TextureReplacing.cpp

@@ -738,17 +738,24 @@ namespace
             id = pSlot->usParentIndex;
         }
 
+        bool bChainComplete = true;
         for (std::size_t i = chainLen; i > 0; --i)
         {
             RwTexDictionary* pChainTxd = CTxdStore_GetTxd(chain[i - 1]);
             if (pChainTxd)
                 MergeCachedTxdTextureMap(chain[i - 1], pChainTxd, targetTxdMap);
+            else
+                bChainComplete = false;
         }
 
         if (ShouldUseVehicleTxdFallback(usModelId))
             AddVehicleTxdFallback(targetTxdMap);
 
-        if (!targetTxdMap.empty())
+        // Only accept a non-empty map when every ancestor in the chain
+        // was loaded. A partial chain can produce a map that looks valid
+        // but is missing textures from unloaded ancestors, which leads
+        // to white surfaces after rebind.
+        if (!targetTxdMap.empty() && bChainComplete)
             return true;
 
         TextureNameSet modelTextureNames;
@@ -3943,11 +3950,14 @@ namespace
         }
 
         TxdTextureMap txdTextureMap;
+        bool          bChainComplete = true;
         for (std::size_t i = chainLen; i > 0; --i)
         {
             RwTexDictionary* pChainTxd = CTxdStore_GetTxd(chain[i - 1]);
             if (pChainTxd)
                 MergeCachedTxdTextureMap(chain[i - 1], pChainTxd, txdTextureMap);
+            else
+                bChainComplete = false;
         }
 
         bool bNeedVehicleFallback = (usFirstParentId != static_cast<unsigned short>(-1)) && TxdChainContainsVehicleTxd(usFirstParentId);
@@ -3971,6 +3981,16 @@ namespace
         if (bNeedVehicleFallback)
             AddVehicleTxdFallback(txdTextureMap);
 
+        // Skip rebind when any ancestor in the chain was not loaded.
+        // A partial map would replace some textures but leave others
+        // as white until the missing ancestors stream in.
+        if (!bChainComplete)
+        {
+            AddReportLog(9402, SString("RebindLoadedModelToCurrentTxd: incomplete TXD chain for model %u TXD %u (chain length %u)", pModelInfo->GetModel(),
+                                       usTxdId, static_cast<unsigned int>(chainLen)));
+            return;
+        }
+
         if (txdTextureMap.empty())
         {
             AddReportLog(9402, SString("RebindLoadedModelToCurrentTxd: empty texture map for model %u TXD %u (chain length %u)", pModelInfo->GetModel(),
@@ -4233,12 +4253,45 @@ void CRenderWareSA::ProcessPendingIsolatedModels(bool bBlockingParentLoad)
                     pModelInfo->SetTextureDictionaryID(childTxdId);
                 }
 
-                RwTexDictionary* pChildTxd = CTxdStore_GetTxd(childTxdId);
-                TxdTextureMap    txdTextureMap;
-                if (pParentTxd)
-                    MergeCachedTxdTextureMap(parentTxdId, pParentTxd, txdTextureMap);
-                if (pChildTxd)
-                    MergeCachedTxdTextureMap(childTxdId, pChildTxd, txdTextureMap);
+                // Walk the full TXD parent chain from childTxdId so all loaded
+                // ancestors contribute textures, not just the immediate parent.
+                TxdTextureMap txdTextureMap;
+                {
+                    constexpr std::size_t kMaxChainDepth = 16;
+                    unsigned short        chainIds[kMaxChainDepth];
+                    std::size_t           chainLen = 0;
+
+                    for (unsigned short id = childTxdId; chainLen < kMaxChainDepth;)
+                    {
+                        bool bCycle = false;
+                        for (std::size_t j = 0; j < chainLen; ++j)
+                        {
+                            if (chainIds[j] == id)
+                            {
+                                bCycle = true;
+                                break;
+                            }
+                        }
+                        if (bCycle)
+                            break;
+
+                        chainIds[chainLen++] = id;
+
+                        CTextureDictonarySAInterface* pChainSlot = pTxdPoolSA->GetTextureDictonarySlot(id);
+                        if (!pChainSlot || pChainSlot->usParentIndex == static_cast<unsigned short>(-1))
+                            break;
+
+                        id = pChainSlot->usParentIndex;
+                    }
+
+                    // Root-to-child order so child textures override ancestors on name conflict.
+                    for (std::size_t i = chainLen; i > 0; --i)
+                    {
+                        RwTexDictionary* pChainTxd = CTxdStore_GetTxd(chainIds[i - 1]);
+                        if (pChainTxd)
+                            MergeCachedTxdTextureMap(chainIds[i - 1], pChainTxd, txdTextureMap);
+                    }
+                }
 
                 bool bNeedVehicleFallback = TxdChainContainsVehicleTxd(parentTxdId);
                 if (!bNeedVehicleFallback && pModelInfo)
@@ -4420,12 +4473,45 @@ void CRenderWareSA::ProcessPendingIsolatedModels(bool bBlockingParentLoad)
             pModelInfo->SetTextureDictionaryID(childTxdId);
         }
 
-        RwTexDictionary* pChildTxd = CTxdStore_GetTxd(childTxdId);
-        TxdTextureMap    txdTextureMap;
-        if (pParentTxd)
-            MergeCachedTxdTextureMap(parentTxdId, pParentTxd, txdTextureMap);
-        if (pChildTxd)
-            MergeCachedTxdTextureMap(childTxdId, pChildTxd, txdTextureMap);
+        // Walk the full TXD parent chain from childTxdId so all loaded
+        // ancestors contribute textures, not just the immediate parent.
+        TxdTextureMap txdTextureMap;
+        {
+            constexpr std::size_t kMaxChainDepth = 16;
+            unsigned short        chainIds[kMaxChainDepth];
+            std::size_t           chainLen = 0;
+
+            for (unsigned short id = childTxdId; chainLen < kMaxChainDepth;)
+            {
+                bool bCycle = false;
+                for (std::size_t j = 0; j < chainLen; ++j)
+                {
+                    if (chainIds[j] == id)
+                    {
+                        bCycle = true;
+                        break;
+                    }
+                }
+                if (bCycle)
+                    break;
+
+                chainIds[chainLen++] = id;
+
+                CTextureDictonarySAInterface* pChainSlot = pTxdPoolSA->GetTextureDictonarySlot(id);
+                if (!pChainSlot || pChainSlot->usParentIndex == static_cast<unsigned short>(-1))
+                    break;
+
+                id = pChainSlot->usParentIndex;
+            }
+
+            // Root-to-child order so child textures override ancestors on name conflict.
+            for (std::size_t i = chainLen; i > 0; --i)
+            {
+                RwTexDictionary* pChainTxd = CTxdStore_GetTxd(chainIds[i - 1]);
+                if (pChainTxd)
+                    MergeCachedTxdTextureMap(chainIds[i - 1], pChainTxd, txdTextureMap);
+            }
+        }
 
         bool bNeedVehicleFallback = TxdChainContainsVehicleTxd(parentTxdId);
         if (!bNeedVehicleFallback && pModelInfo)
@@ -6967,10 +7053,22 @@ void CRenderWareSA::ModelInfoTXDRemoveTextures(SReplacementTextures* pReplacemen
                 g_GlobalMtaRasterCache.insert(pMaster->raster);
         }
 
+        // Re-resolve loaded models to their current TXD so geometry materiale
+        // no longer reference stale replacement textures from the old session.
+        for (const unsigned short usModelId : pReplacementTextures->usedInModelIds)
+        {
+            auto* pModelInfo = static_cast<CModelInfoSA*>(pGame->GetModelInfo(usModelId));
+            if (!pModelInfo)
+                continue;
+
+            const unsigned short usTxdId = pModelInfo->GetTextureDictionaryID();
+            RebindLoadedModelToCurrentTxd(pModelInfo, usTxdId);
+        }
+
         pReplacementTextures->textures.clear();
         pReplacementTextures->perTxdList.clear();
         pReplacementTextures->usedInTxdIds.clear();
-        pReplacementTextures->usedInModelIds.clear();
+        // Keep usedInModelIds for the caller's restream pass, matching the normal cleanup path.
         pReplacementTextures->bHasRequestedSpace = false;
         return;
     }

Client/game_sa/CRenderWareSA.cpp

@@ -701,11 +701,15 @@ namespace
         }
 
         // Iter from root (outermost parent) to child so child textures win on name conflict.
+        bool bChainComplete = true;
         for (std::size_t i = chainLen; i > 0; --i)
         {
             RwTexDictionary* pChainTxd = CTxdStore_GetTxd(chain[i - 1]);
             if (!pChainTxd)
+            {
+                bChainComplete = false;
                 continue;
+            }
 
             std::vector<RwTexture*> txdTextures;
             CRenderWareSA::GetTxdTextures(txdTextures, pChainTxd);
@@ -721,6 +725,12 @@ namespace
             }
         }
 
+        // A partial chain means some ancestors were not loaded, so the map
+        // is missing their textures. Return empty to prevent partial rebinds
+        // that leave unresolved textures white.
+        if (!bChainComplete)
+            result.clear();
+
         return result;
     }