Replaced _min and _max with std::min and std::max

Author: Xottab-DUTY

src/Layers/xrRender/r__dsgraph_render_lods.cpp

@@ -39,7 +39,7 @@ void D3DXRenderBase::r_dsgraph_render_lods(bool _setup_zb, bool _clear)
 
     for (u32 i = 0; i < lstLODs.size(); i++)
     {
-        const u32 iBatchSize = _min(lstLODs.size() - i, uiImpostersFit);
+        const u32 iBatchSize = std::min(lstLODs.size() - i, uiImpostersFit);
         int cur_count = 0;
         u32 vOffset;
         FLOD::_hw* V =

src/Layers/xrRenderDX10/StateManager/dx10ShaderResourceStateCache.cpp

@@ -102,8 +102,8 @@ void dx10ShaderResourceStateCache::SetPSResource(u32 uiSlot, ID3DShaderResourceV
         m_PSViews[uiSlot] = pRes;
         if (m_bUpdatePSViews)
         {
-            m_uiMinPSView = _min(m_uiMinPSView, uiSlot);
-            m_uiMaxPSView = _max(m_uiMaxPSView, uiSlot);
+            m_uiMinPSView = std::min(m_uiMinPSView, uiSlot);
+            m_uiMaxPSView = std::max(m_uiMaxPSView, uiSlot);
         }
         else
         {
@@ -123,8 +123,8 @@ void dx10ShaderResourceStateCache::SetGSResource(u32 uiSlot, ID3DShaderResourceV
         m_GSViews[uiSlot] = pRes;
         if (m_bUpdateGSViews)
         {
-            m_uiMinGSView = _min(m_uiMinGSView, uiSlot);
-            m_uiMaxGSView = _max(m_uiMaxGSView, uiSlot);
+            m_uiMinGSView = std::min(m_uiMinGSView, uiSlot);
+            m_uiMaxGSView = std::max(m_uiMaxGSView, uiSlot);
         }
         else
         {
@@ -144,8 +144,8 @@ void dx10ShaderResourceStateCache::SetVSResource(u32 uiSlot, ID3DShaderResourceV
         m_VSViews[uiSlot] = pRes;
         if (m_bUpdateVSViews)
         {
-            m_uiMinVSView = _min(m_uiMinVSView, uiSlot);
-            m_uiMaxVSView = _max(m_uiMaxVSView, uiSlot);
+            m_uiMinVSView = std::min(m_uiMinVSView, uiSlot);
+            m_uiMaxVSView = std::max(m_uiMaxVSView, uiSlot);
         }
         else
         {

src/Layers/xrRenderPC_R1/LightShadows.cpp

@@ -236,7 +236,7 @@ void CLightShadows::calculate()
             float p_near = p_dist - p_R - eps;
             // float		p_nearR	=	C.C.distance_to(L.source->position) + p_R*0.85f + eps;
             //			p_nearR =	p_near;
-            float p_far = _min(Lrange, _max(p_dist + S_fade, p_dist + p_R));
+            float p_far = std::min(Lrange, std::max(p_dist + S_fade, p_dist + p_R));
             if (p_near < eps)
                 continue;
             if (p_far < (p_near + eps))

src/Layers/xrRenderPC_R2/Light_Render_Direct_ComputeXFS.cpp

@@ -88,7 +88,7 @@ void CLight_Compute_XFORM_and_VIS::compute_xf_spot(light* L)
 
     // _min(L->cone + deg2rad(4.5f), PI*0.98f) - Here, it is needed to enlarge the shadow map frustum to include also
     // displaced pixels and the pixels neighbor to the examining one.
-    L->X.S.project.build_projection(_min(L->cone + deg2rad(5.f), PI * 0.98f), 1.f, SMAP_near_plane, L->range + EPS_S);
+    L->X.S.project.build_projection(std::min(L->cone + deg2rad(5.f), PI * 0.98f), 1.f, SMAP_near_plane, L->range + EPS_S);
 
     L->X.S.combine.mul(L->X.S.project, L->X.S.view);
 }

src/Layers/xrRenderPC_R2/r2_R_sun.cpp

@@ -71,12 +71,12 @@ struct BoundingBox
     void Centroid(D3DXVECTOR3* vec) const { *vec = 0.5f * (minPt + maxPt); }
     void Merge(const D3DXVECTOR3* vec)
     {
-        minPt.x = _min(minPt.x, vec->x);
-        minPt.y = _min(minPt.y, vec->y);
-        minPt.z = _min(minPt.z, vec->z);
-        maxPt.x = _max(maxPt.x, vec->x);
-        maxPt.y = _max(maxPt.y, vec->y);
-        maxPt.z = _max(maxPt.z, vec->z);
+        minPt.x = std::min(minPt.x, vec->x);
+        minPt.y = std::min(minPt.y, vec->y);
+        minPt.z = std::min(minPt.z, vec->z);
+        maxPt.x = std::max(maxPt.x, vec->x);
+        maxPt.y = std::max(maxPt.y, vec->y);
+        maxPt.z = std::max(maxPt.z, vec->z);
     }
     D3DXVECTOR3 Point(int i) const
     {
@@ -286,7 +286,7 @@ class FixedConvexVolume
                 Fvector tmp_point = view_frustum_rays[i].P;
 
                 tmp_dist = light_cuboid_polys[align_planes[p]].plane.classify(tmp_point);
-                min_dist = _min(tmp_dist, min_dist);
+                min_dist = std::min(tmp_dist, min_dist);
             }
 
             Fvector shift = light_cuboid_polys[align_planes[p]].plane.n;
@@ -747,8 +747,8 @@ D3DXVECTOR2 BuildTSMProjectionMatrix_caster_depth_bounds(D3DXMATRIX& lightSpaceB
         {
             s_casters[c].getpoint(e, pt);
             pt = wform(minmax_xform, pt);
-            min_z = _min(min_z, pt.z);
-            max_z = _max(max_z, pt.z);
+            min_z = std::min(min_z, pt.z);
+            max_z = std::max(max_z, pt.z);
         }
     }
     return D3DXVECTOR2(min_z, max_z);

src/Layers/xrRenderPC_R3/Light_Render_Direct_ComputeXFS.cpp

@@ -88,6 +88,6 @@ void CLight_Compute_XFORM_and_VIS::compute_xf_spot(light* L)
 
     // _min(L->cone + deg2rad(4.5f), PI*0.98f) - Here, it is needed to enlarge the shadow map frustum to include also
     // displaced pixels and the pixels neighbor to the examining one.
-    L->X.S.project.build_projection(_min(L->cone + deg2rad(5.f), PI * 0.98f), 1.f, SMAP_near_plane, L->range + EPS_S);
+    L->X.S.project.build_projection(std::min(L->cone + deg2rad(5.f), PI * 0.98f), 1.f, SMAP_near_plane, L->range + EPS_S);
     L->X.S.combine.mul(L->X.S.project, L->X.S.view);
 }

src/Layers/xrRenderPC_R3/r2_R_sun.cpp

@@ -72,12 +72,12 @@ struct BoundingBox
     void Centroid(D3DXVECTOR3* vec) const { *vec = 0.5f * (minPt + maxPt); }
     void Merge(const D3DXVECTOR3* vec)
     {
-        minPt.x = _min(minPt.x, vec->x);
-        minPt.y = _min(minPt.y, vec->y);
-        minPt.z = _min(minPt.z, vec->z);
-        maxPt.x = _max(maxPt.x, vec->x);
-        maxPt.y = _max(maxPt.y, vec->y);
-        maxPt.z = _max(maxPt.z, vec->z);
+        minPt.x = std::min(minPt.x, vec->x);
+        minPt.y = std::min(minPt.y, vec->y);
+        minPt.z = std::min(minPt.z, vec->z);
+        maxPt.x = std::max(maxPt.x, vec->x);
+        maxPt.y = std::max(maxPt.y, vec->y);
+        maxPt.z = std::max(maxPt.z, vec->z);
     }
     D3DXVECTOR3 Point(int i) const
     {
@@ -304,8 +304,8 @@ D3DXVECTOR2 BuildTSMProjectionMatrix_caster_depth_bounds(D3DXMATRIX& lightSpaceB
         {
             s_casters[c].getpoint(e, pt);
             pt = wform(minmax_xform, pt);
-            min_z = _min(min_z, pt.z);
-            max_z = _max(max_z, pt.z);
+            min_z = std::min(min_z, pt.z);
+            max_z = std::max(max_z, pt.z);
         }
     }
     return D3DXVECTOR2(min_z, max_z);

src/Layers/xrRenderPC_R3/r3_R_sun_support.h

@@ -96,7 +96,7 @@ class FixedConvexVolume
                 Fvector tmp_point = view_frustum_rays[i].P;
 
                 tmp_dist = light_cuboid_polys[align_planes[p]].plane.classify(tmp_point);
-                min_dist = _min(tmp_dist, min_dist);
+                min_dist = std::min(tmp_dist, min_dist);
             }
 
             Fvector shift = light_cuboid_polys[align_planes[p]].plane.n;

src/Layers/xrRenderPC_R4/Light_Render_Direct_ComputeXFS.cpp

@@ -88,6 +88,6 @@ void CLight_Compute_XFORM_and_VIS::compute_xf_spot(light* L)
 
     // _min(L->cone + deg2rad(4.5f), PI*0.98f) - Here, it is needed to enlarge the shadow map frustum to include also
     // displaced pixels and the pixels neighbor to the examining one.
-    L->X.S.project.build_projection(_min(L->cone + deg2rad(5.f), PI * 0.98f), 1.f, SMAP_near_plane, L->range + EPS_S);
+    L->X.S.project.build_projection(std::min(L->cone + deg2rad(5.f), PI * 0.98f), 1.f, SMAP_near_plane, L->range + EPS_S);
     L->X.S.combine.mul(L->X.S.project, L->X.S.view);
 }

src/Layers/xrRenderPC_R4/r2_R_sun.cpp

@@ -73,12 +73,12 @@ struct BoundingBox
     void Centroid(D3DXVECTOR3* vec) const { *vec = 0.5f * (minPt + maxPt); }
     void Merge(const D3DXVECTOR3* vec)
     {
-        minPt.x = _min(minPt.x, vec->x);
-        minPt.y = _min(minPt.y, vec->y);
-        minPt.z = _min(minPt.z, vec->z);
-        maxPt.x = _max(maxPt.x, vec->x);
-        maxPt.y = _max(maxPt.y, vec->y);
-        maxPt.z = _max(maxPt.z, vec->z);
+        minPt.x = std::min(minPt.x, vec->x);
+        minPt.y = std::min(minPt.y, vec->y);
+        minPt.z = std::min(minPt.z, vec->z);
+        maxPt.x = std::max(maxPt.x, vec->x);
+        maxPt.y = std::max(maxPt.y, vec->y);
+        maxPt.z = std::max(maxPt.z, vec->z);
     }
     D3DXVECTOR3 Point(int i) const
     {
@@ -305,8 +305,8 @@ D3DXVECTOR2 BuildTSMProjectionMatrix_caster_depth_bounds(D3DXMATRIX& lightSpaceB
         {
             s_casters[c].getpoint(e, pt);
             pt = wform(minmax_xform, pt);
-            min_z = _min(min_z, pt.z);
-            max_z = _max(max_z, pt.z);
+            min_z = std::min(min_z, pt.z);
+            max_z = std::max(max_z, pt.z);
         }
     }
     return D3DXVECTOR2(min_z, max_z);