Replace FixedMAP mapLOD with xr_vector.

Author: intorr

src/Layers/xrRender/D3DXRenderBase.h

@@ -67,7 +67,6 @@ class D3DXRenderBase : public IRender, public pureFrame
     xr_vector<R_dsgraph::mapMatrixStates::value_type *> matStates;
     xr_vector<R_dsgraph::mapMatrixTextures::value_type *> matTextures;
     xr_vector<R_dsgraph::mapMatrixTextures::value_type *> matTexturesTemp;
-    xr_vector<R_dsgraph::_LodItem> lstLODs;
     xr_vector<int> lstLODgroups;
     xr_vector<ISpatial*> lstRenderables;
     xr_vector<ISpatial*> lstSpatial;
@@ -127,7 +126,6 @@ class D3DXRenderBase : public IRender, public pureFrame
         matTextures.clear();
         matTexturesTemp.clear();
 
-        lstLODs.clear();
         lstLODgroups.clear();
         lstRenderables.clear();
         lstSpatial.clear();
@@ -142,7 +140,7 @@ class D3DXRenderBase : public IRender, public pureFrame
         }
         mapSorted.destroy();
         mapHUD.destroy();
-        mapLOD.destroy();
+        mapLOD.clear();
         mapDistort.destroy();
 
 #if RENDER != R_R1

src/Layers/xrRender/r__dsgraph_build.cpp

@@ -519,9 +519,7 @@ void CRender::add_leafs_Static(dxRender_Visual* pVisual)
         {
             if (ssa < r_ssaDISCARD)
                 return;
-            mapLOD_Node* N = mapLOD.insertInAnyWay(D);
-            N->val.ssa = ssa;
-            N->val.pVisual = pVisual;
+            mapLOD.emplace_back(std::make_pair(D, _LodItem({ ssa, pVisual })));
         }
 #if RENDER != R_R1
         if (ssa > r_ssaLOD_B || phase == PHASE_SMAP)
@@ -737,9 +735,7 @@ void CRender::add_Static(dxRender_Visual* pVisual, u32 planes)
         {
             if (ssa < r_ssaDISCARD)
                 return;
-            mapLOD_Node* N = mapLOD.insertInAnyWay(D);
-            N->val.ssa = ssa;
-            N->val.pVisual = pVisual;
+            mapLOD.emplace_back(std::make_pair(D, _LodItem({ ssa, pVisual })));
         }
 #if RENDER != R_R1
         if (ssa > r_ssaLOD_B || phase == PHASE_SMAP)

src/Layers/xrRender/r__dsgraph_render_lods.cpp

@@ -12,19 +12,24 @@
 extern float r_ssaLOD_A;
 extern float r_ssaLOD_B;
 
+template <class T> IC bool cmp_first_l(const T &lhs, const T &rhs) { return (lhs.first < rhs.first); }
+template <class T> IC bool cmp_first_h(const T &lhs, const T &rhs) { return (lhs.first > rhs.first); }
+
 ICF bool pred_dot(const std::pair<float, u32>& _1, const std::pair<float, u32>& _2) { return _1.first < _2.first; }
+
 void D3DXRenderBase::r_dsgraph_render_lods(bool _setup_zb, bool _clear)
 {
+    if (mapLOD.empty())
+        return;
+
     if (_setup_zb)
-        mapLOD.getLR(lstLODs); // front-to-back
+        std::sort(mapLOD.begin(), mapLOD.end(), cmp_first_l<R_dsgraph::mapLOD_T::value_type>); // front-to-back
     else
-        mapLOD.getRL(lstLODs); // back-to-front
-    if (lstLODs.empty())
-        return;
+        std::sort(mapLOD.begin(), mapLOD.end(), cmp_first_h<R_dsgraph::mapLOD_T::value_type>); // back-to-front
 
     // *** Fill VB and generate groups
     u32 shid = _setup_zb ? SE_R1_LMODELS : SE_R1_NORMAL_LQ;
-    FLOD* firstV = (FLOD*)lstLODs[0].pVisual;
+    FLOD* firstV = (FLOD*)mapLOD[0].second.pVisual;
     ref_selement cur_S = firstV->shader->E[shid];
     float ssaRange = r_ssaLOD_A - r_ssaLOD_B;
     if (ssaRange < EPS_S)
@@ -37,9 +42,9 @@ void D3DXRenderBase::r_dsgraph_render_lods(bool _setup_zb, bool _clear)
     //Msg("dbg_lods: shader[%X]",u32((void*)firstV->shader._get()));
     //Msg("dbg_lods: shader_E[%X]",u32((void*)cur_S._get()));
 
-    for (u32 i = 0; i < lstLODs.size(); i++)
+    for (u32 i = 0; i < mapLOD.size(); i++)
     {
-        const u32 iBatchSize = std::min(lstLODs.size() - i, (size_t)uiImpostersFit);
+        const u32 iBatchSize = std::min(mapLOD.size() - i, (size_t)uiImpostersFit);
         int cur_count = 0;
         u32 vOffset;
         FLOD::_hw* V =
@@ -48,7 +53,7 @@ void D3DXRenderBase::r_dsgraph_render_lods(bool _setup_zb, bool _clear)
         for (u32 j = 0; j < iBatchSize; ++j, ++i)
         {
             // sort out redundancy
-            R_dsgraph::_LodItem& P = lstLODs[i];
+            R_dsgraph::_LodItem& P = mapLOD[i].second;
             if (P.pVisual->shader->E[shid] == cur_S)
                 cur_count++;
             else
@@ -121,10 +126,10 @@ void D3DXRenderBase::r_dsgraph_render_lods(bool _setup_zb, bool _clear)
             for (u32 g = 0; g < lstLODgroups.size(); g++)
             {
                 int p_count = lstLODgroups[g];
-                u32 uiNumPasses = lstLODs[current].pVisual->shader->E[shid]->passes.size();
+                u32 uiNumPasses = mapLOD[current].second.pVisual->shader->E[shid]->passes.size();
                 if (uiPass < uiNumPasses)
                 {
-                    RCache.set_Element(lstLODs[current].pVisual->shader->E[shid], uiPass);
+                    RCache.set_Element(mapLOD[current].second.pVisual->shader->E[shid], uiPass);
                     RCache.set_Geometry(firstV->geom);
                     RCache.Render(D3DPT_TRIANGLELIST, vCurOffset, 0, 4 * p_count, 0, 2 * p_count);
                 }
@@ -137,8 +142,6 @@ void D3DXRenderBase::r_dsgraph_render_lods(bool _setup_zb, bool _clear)
         lstLODgroups.clear();
     }
 
-    lstLODs.clear();
-
     if (_clear)
         mapLOD.clear();
 }

src/Layers/xrRender/r__dsgraph_types.h

@@ -163,6 +163,5 @@ using mapSorted_Node = mapSorted_T::TNode;
 using mapHUD_T = FixedMAP<float, _MatrixItemS>;
 using mapHUD_Node = mapHUD_T::TNode;
 
-using mapLOD_T = FixedMAP<float, _LodItem>;
-using mapLOD_Node = mapLOD_T::TNode;
+using mapLOD_T = xr_vector<std::pair<float, _LodItem>>;
 }

src/Layers/xrRenderPC_R2/r2_loader.cpp

@@ -102,7 +102,6 @@ void CRender::level_Load(IReader* fs)
     pApp->LoadEnd();
 
     // sanity-clear
-    lstLODs.clear();
     lstLODgroups.clear();
     mapLOD.clear();
 

src/Layers/xrRenderPC_R3/r3_loader.cpp

@@ -108,7 +108,6 @@ void CRender::level_Load(IReader* fs)
     pApp->LoadEnd();
 
     // sanity-clear
-    lstLODs.clear();
     lstLODgroups.clear();
     mapLOD.clear();
 

src/Layers/xrRenderPC_R4/r4_loader.cpp

@@ -108,7 +108,6 @@ void CRender::level_Load(IReader* fs)
     pApp->LoadEnd();
 
     // sanity-clear
-    lstLODs.clear();
     lstLODgroups.clear();
     mapLOD.clear();