Add some more helper functions and use it.

Author: intorr

src/Layers/xrRender/r__dsgraph_render.cpp

@@ -15,18 +15,6 @@ ICF float calcLOD(float ssa /*fDistSq*/, float /*R*/)
     return _sqrt(clampr((ssa - r_ssaGLOD_end) / (r_ssaGLOD_start - r_ssaGLOD_end), 0.f, 1.f));
 }
 
-// ALPHA
-void __fastcall sorted_L1(mapSorted_T::value_type &N)
-{
-    dxRender_Visual* V = N.second.pVisual;
-    VERIFY(V && V->shader._get());
-    RCache.set_Element(N.second.se);
-    RCache.set_xform_world(N.second.Matrix);
-    RImplementation.apply_object(N.second.pObject);
-    RImplementation.apply_lmaterial();
-    V->Render(calcLOD(N.first, V->vis.sphere.R));
-}
-
 template <class T> IC bool cmp_second_ssa(const T &lhs, const T &rhs) { return (lhs->second.ssa > rhs->second.ssa); }
 template <class T> IC bool cmp_ssa       (const T &lhs, const T &rhs) { return (lhs.ssa         > rhs.ssa        ); }
 
@@ -342,6 +330,9 @@ void D3DXRenderBase::r_dsgraph_render_graph(u32 _priority)
     BasicStats.Primitives.End();
 }
 
+//////////////////////////////////////////////////////////////////////////
+// Helper classes and functions
+
 /*
 Предназначен для установки режима отрисовки HUD и возврата оригинального после отрисовки.
 */
@@ -378,8 +369,39 @@ class hud_transform_helper
     }
 };
 
+template<class T>
+IC void render_item(T &item)
+{
+    dxRender_Visual* V = item.second.pVisual;
+    VERIFY(V && V->shader._get());
+    RCache.set_Element(item.second.se);
+    RCache.set_xform_world(item.second.Matrix);
+    RImplementation.apply_object(item.second.pObject);
+    RImplementation.apply_lmaterial();
+    V->Render(calcLOD(item.first, V->vis.sphere.R));
+}
+
 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); }
+
+template<class T>
+IC void sort_front_to_back_render_and_clean(T &vec)
+{
+    std::sort(vec.begin(), vec.end(), cmp_first_l<T::value_type>); // front-to-back
+    for (auto &i : vec)
+        render_item(i);
+    vec.clear();
+}
+
+template<class T>
+IC void sort_back_to_front_render_and_clean(T &vec)
+{
+    std::sort(vec.begin(), vec.end(), cmp_first_h<T::value_type>); // back-to-front
+    for (auto &i : vec)
+        render_item(i);
+    vec.clear();
+}
+
 //////////////////////////////////////////////////////////////////////////
 // HUD render
 void D3DXRenderBase::r_dsgraph_render_hud()
@@ -388,10 +410,7 @@ void D3DXRenderBase::r_dsgraph_render_hud()
 
     hud_transform_helper helper;
 
-    std::sort(mapHUD.begin(), mapHUD.end(), cmp_first_l<R_dsgraph::mapHUD_T::value_type>); // front-to-back
-    for (auto &i : mapHUD)
-        sorted_L1(i);
-    mapHUD.clear();
+    sort_front_to_back_render_and_clean(mapHUD);
 
 #if RENDER == R_R1
     if (g_hud && g_hud->RenderActiveItemUIQuery())
@@ -432,17 +451,12 @@ void D3DXRenderBase::r_dsgraph_render_hud_ui()
 void D3DXRenderBase::r_dsgraph_render_sorted()
 {
     PIX_EVENT(r_dsgraph_render_sorted);
-    std::sort(mapSorted.begin(), mapSorted.end(), cmp_first_h<R_dsgraph::mapSorted_T::value_type>); // back-to-front
-    for (auto &i : mapSorted)
-        sorted_L1(i);
-    mapSorted.clear();
+
+    sort_back_to_front_render_and_clean(mapSorted);
 
     hud_transform_helper helper;
 
-    std::sort(mapHUDSorted.begin(), mapHUDSorted.end(), cmp_first_h<R_dsgraph::mapSorted_T::value_type>); // back-to-front
-    for (auto &i : mapHUDSorted)
-        sorted_L1(i);
-    mapHUDSorted.clear();
+    sort_back_to_front_render_and_clean(mapHUDSorted);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -451,17 +465,12 @@ void D3DXRenderBase::r_dsgraph_render_emissive()
 {
 #if RENDER != R_R1
     PIX_EVENT(r_dsgraph_render_emissive);
-    std::sort(mapEmissive.begin(), mapEmissive.end(), cmp_first_l<R_dsgraph::mapSorted_T::value_type>); // front-to-back
-    for (auto &i : mapEmissive)
-        sorted_L1(i);
-    mapEmissive.clear();
+
+    sort_front_to_back_render_and_clean(mapEmissive);
 
     hud_transform_helper helper;
 
-    std::sort(mapHUDEmissive.begin(), mapHUDEmissive.end(), cmp_first_l<R_dsgraph::mapSorted_T::value_type>); // front-to-back
-    for (auto &i : mapHUDEmissive)
-        sorted_L1(i);
-    mapHUDEmissive.clear();
+    sort_front_to_back_render_and_clean(mapHUDEmissive);
 #endif
 }
 
@@ -471,10 +480,8 @@ void D3DXRenderBase::r_dsgraph_render_wmarks()
 {
 #if RENDER != R_R1
     PIX_EVENT(r_dsgraph_render_wmarks);
-    std::sort(mapWmark.begin(), mapWmark.end(), cmp_first_l<R_dsgraph::mapSorted_T::value_type>); // front-to-back
-    for (auto &i : mapWmark)
-        sorted_L1(i);
-    mapWmark.clear();
+
+    sort_front_to_back_render_and_clean(mapWmark);
 #endif
 }
 
@@ -483,10 +490,8 @@ void D3DXRenderBase::r_dsgraph_render_wmarks()
 void D3DXRenderBase::r_dsgraph_render_distort()
 {
     PIX_EVENT(r_dsgraph_render_distort);
-    std::sort(mapDistort.begin(), mapDistort.end(), cmp_first_h<R_dsgraph::mapSorted_T::value_type>); // back-to-front
-    for (auto &i : mapDistort)
-        sorted_L1(i);
-    mapDistort.clear();
+
+    sort_back_to_front_render_and_clean(mapDistort);
 }
 
 //////////////////////////////////////////////////////////////////////////