Disable min/max macros from windows.h

CMakeLists.txt

@@ -114,7 +114,7 @@ set(Qt5_x64_DIR
 )
 
 if(MSVC)
-  add_compile_options(/we4311)
+  add_compile_options(/we4311 /DNOMINMAX)
   add_link_options("/NODEFAULTLIB:\"LIBCMTD\"")
 endif()
 

OVP/D3D7Client/CSphereMgr.cpp

@@ -18,7 +18,8 @@
 #include "Camera.h"
 #include "Texture.h"
 #include "D3D7Config.h"
-
+#include <algorithm>
+using std::min;
 using namespace oapi;
 
 // =======================================================================
@@ -81,7 +82,7 @@ CSphereManager::CSphereManager (const D3D7Client *gclient, const Scene *scene)
 	intensity = (float)tmp;
 
 	maxlvl = 8; // g_pOrbiter->Cfg()->CSphereMaxLevel;
-	maxbaselvl = min (8, maxlvl);
+	maxbaselvl = min ((DWORD)8, maxlvl);
 	int maxidx = patchidx[maxbaselvl];
 	bPreloadTile = (cfg->PlanetPreloadMode != 0);
 	nhitex = nhispec = 0;

OVP/D3D7Client/CelSphere.cpp

@@ -19,6 +19,8 @@
 #include "Scene.h"
 #include "Camera.h"
 #include "Texture.h"
+#include <algorithm>
+using std::min;
 
 #define NSEG 64 // number of segments in celestial grid lines
 
@@ -507,7 +509,7 @@ void D3D7CelestialSphere::RenderStars (LPDIRECT3DDEVICE7 dev)
 	int ns = m_starCutoffIdx[bgidx];
 
 	for (i = j = 0; i < ns; i += D3DMAXNUMVERTICES, j++)
-		dev->DrawPrimitiveVB (D3DPT_POINTLIST, m_sVtx[j], 0, min (ns-i, D3DMAXNUMVERTICES), 0);
+		dev->DrawPrimitiveVB (D3DPT_POINTLIST, m_sVtx[j], 0, min (ns-i, (DWORD)D3DMAXNUMVERTICES), 0);
 }
 
 // ==============================================================

OVP/D3D7Client/CloudMgr.cpp

@@ -17,6 +17,8 @@
 #include "CloudMgr.h"
 #include "VPlanet.h"
 #include "Texture.h"
+#include <algorithm>
+using std::min;
 
 using namespace oapi;
 

OVP/D3D7Client/D3D7Config.cpp

@@ -13,6 +13,9 @@
 
 #include "D3D7Config.h"
 #include "orbitersdk.h"
+#include <algorithm>
+using std::min;
+using std::max;
 
 static const char *cfgfile = "D3D7Client.cfg";
 

OVP/D3D7Client/D3D7Extra.cpp

@@ -17,6 +17,9 @@
 #include "D3D7Extra.h"
 #include "D3D7Config.h"
 #include "resource.h"
+#include <algorithm>
+
+using std::min;
 
 char *D3D7ClientCfg::Name ()
 {

OVP/D3D7Client/HazeMgr.cpp

@@ -17,6 +17,9 @@
 #include "HazeMgr.h"
 #include "VPlanet.h"
 #include "Texture.h"
+#include <algorithm>
+using std::min;
+using std::max;
 
 using namespace oapi;
 

OVP/D3D7Client/Particle.cpp

@@ -17,6 +17,10 @@
 #include "Camera.h"
 #include "Texture.h"
 #include <stdio.h>
+#include <algorithm>
+
+using std::min;
+using std::max;
 
 static bool needsetup = true;
 static VERTEX_XYZ_TEX evtx[MAXPARTICLE*4]; // vertex list for emissive trail (no normals)
@@ -165,7 +169,7 @@ double D3D7ParticleStream::Level2Alpha (double level) const
 	case PARTICLESTREAMSPEC::LVL_SQRT:
 		return sqrt (level);
 	case PARTICLESTREAMSPEC::LVL_PLIN:
-		return max (0, min (1, (level-lmin)/(lmax-lmin)));
+		return max (0.0, min (1.0, (level-lmin)/(lmax-lmin)));
 	case PARTICLESTREAMSPEC::LVL_PSQRT:
 		return (level <= lmin ? 0 : level >= lmax ? 1 : sqrt ((level-lmin)/(lmax-lmin)));
 	}
@@ -178,9 +182,9 @@ double D3D7ParticleStream::Atm2Alpha (double prm) const
 	case PARTICLESTREAMSPEC::ATM_FLAT:
 		return amin;
 	case PARTICLESTREAMSPEC::ATM_PLIN:
-		return max (0, min (1, (prm-amin)*afac));
+		return max (0.0, min (1.0, (prm-amin)*afac));
 	case PARTICLESTREAMSPEC::ATM_PLOG:
-		return max (0, min (1, log(prm/amin)*afac));
+		return max (0.0, min (1.0, log(prm/amin)*afac));
 	}
 	return 0; // should not happen
 }

OVP/D3D7Client/RingMgr.cpp

@@ -14,6 +14,8 @@
 #define D3D_OVERLOADS
 #include "RingMgr.h"
 #include "Texture.h"
+#include <algorithm>
+using std::min;
 
 using namespace oapi;
 

OVP/D3D7Client/Scene.cpp

@@ -24,6 +24,8 @@
 #include "VVessel.h"
 #include "VBase.h"
 #include "Particle.h"
+#include <algorithm>
+using std::min;
 
 using namespace oapi;
 

OVP/D3D7Client/SurfMgr.cpp

@@ -17,7 +17,9 @@
 #include "SurfMgr.h"
 #include "VPlanet.h"
 #include "Texture.h"
+#include <algorithm>
 
+using std::min;
 using namespace oapi;
 
 int nrender[15]; // temporary

OVP/D3D7Client/TileMgr.cpp

@@ -18,7 +18,10 @@
 #include "VPlanet.h"
 #include "Texture.h"
 #include "D3D7Config.h"
+#include <algorithm>
 
+using std::min;
+using std::max;
 using namespace oapi;
 
 // Max supported patch resolution level

OVP/D3D7Client/VBase.cpp

@@ -19,6 +19,10 @@
 #include "VBase.h"
 #include "TileMgr.h"
 #include "D3D7Client.h"
+#include <algorithm>
+
+using std::min;
+using std::max;
 
 vBase::vBase (OBJHANDLE _hObj, const Scene *scene): vObject (_hObj, scene)
 {
@@ -342,7 +346,7 @@ void vBase::RenderGroundShadow (LPDIRECT3DDEVICE7 dev)
 	DWORD tfactor;
 	bool resetalpha = false;
 	if (gc->UseStencilBuffer()) {
-		double scale = min (1, (csun-0.07)/0.015);
+		double scale = min (1.0, (csun-0.07)/0.015);
 		if (scale < 1) {
 			dev->GetRenderState (D3DRENDERSTATE_TEXTUREFACTOR, &tfactor);
 			float modalpha = (float)(scale*RGBA_GETALPHA(tfactor)/256.0);
@@ -429,7 +433,7 @@ bool vBase::ModLighting (LPD3DLIGHT7 light, double &nextcheck)
 			double amb0 = min (0.7, log (atm->rho0+1.0)*0.4);
 			amb = amb0 * min (1.0, (sunelev+14.0*RAD)/(20.0*RAD));
 			if (!lightmod) lightmod = (amb > 0.05);
-			amb = max (0, amb-0.05);
+			amb = max (0.0, amb-0.05);
 			// reduce direct light component to avoid overexposure
 			lcol *= 1.0-amb*0.5;
 		}

OVP/D3D7Client/VObject.cpp

@@ -32,6 +32,8 @@
 #include "D3D7Util.h"
 #include <algorithm>
 
+using std::min;
+using std::max;
 using namespace oapi;
 
 // Initialisation of static members
@@ -296,7 +298,7 @@ bool vObject::DrawVector(LPDIRECT3DDEVICE7 dev, const VECTOR3& end, const VECTOR
 	float w = (float)rad;
 	float h = (float)length(end);
 	if (h < EPS) return false;
-	float hb = max(h - 4.0f * w, 0);
+	float hb = max(h - 4.0f * w, 0.0f);
 
 	memcpy(Vtx, Vtx0, nVtx * sizeof(D3DVERTEX));
 

OVP/D3D7Client/VPlanet.cpp

@@ -29,7 +29,10 @@
 #include "CloudMgr.h"
 #include "HazeMgr.h"
 #include "RingMgr.h"
+#include <algorithm>
 
+using std::min;
+using std::max;
 using namespace oapi;
 
 // ==============================================================
@@ -49,7 +52,7 @@ vPlanet::vPlanet (OBJHANDLE _hObj, const Scene *scene): vObject (_hObj, scene)
 	max_centre_dist = 0.9*scene->GetCamera()->GetFarlimit();
 	maxdist = max (max_centre_dist, max_surf_dist + rad);
 	max_patchres = *(DWORD*)oapiGetObjectParam (_hObj, OBJPRM_PLANET_SURFACEMAXLEVEL);
-	max_patchres = min (max_patchres, *(DWORD*)gc->GetConfigParam (CFGPRM_SURFACEMAXLEVEL));
+	max_patchres = min (max_patchres, (int)*(DWORD*)gc->GetConfigParam (CFGPRM_SURFACEMAXLEVEL));
 	int tilever = *(int*)oapiGetObjectParam (_hObj, OBJPRM_PLANET_TILEENGINE);
 	if (tilever < 2) {
 		surfmgr = new SurfaceManager (gc, this);
@@ -109,7 +112,7 @@ vPlanet::vPlanet (OBJHANDLE _hObj, const Scene *scene): vObject (_hObj, scene)
 			}
 		} else { // v2 cloud engine
 			int maxlvl = *(int*)oapiGetObjectParam (_hObj, OBJPRM_PLANET_CLOUDMAXLEVEL);
-			maxlvl = min (maxlvl, *(DWORD*)gc->GetConfigParam (CFGPRM_SURFACEMAXLEVEL));
+			maxlvl = min (maxlvl, (int)*(DWORD*)gc->GetConfigParam (CFGPRM_SURFACEMAXLEVEL));
 			cloudmgr2 = new TileManager2<CloudTile> (this, maxlvl, 32);
 		}
 	} else {
@@ -244,7 +247,7 @@ bool vPlanet::Update ()
 			// set microtexture intensity
 			double alt = cdist-rad;
 			double lvl = (clouddata->microalt1-alt)/(clouddata->microalt1-clouddata->microalt0);
-			clouddata->cloudmgr->SetMicrolevel (max (0, min (1, lvl)));
+			clouddata->cloudmgr->SetMicrolevel (max (0.0, min (1.0, lvl)));
 		}
 	}
 
@@ -744,12 +747,12 @@ bool vPlanet::ModLighting (DWORD &ambient)
 	double rscale = (size-cdist)/prm.atm_href + 1.0;    // effect altitude scale (1 on ground, 0 at reference alt)
 	double amb = prm.atm_amb0 * min (1.0, (sunelev+14.0*RAD)/(20.0*RAD)); // effect magnitude (dependent on sun elevation)
 	if (amb < 0.05) return false;
-	amb = max (0, amb-0.05);
+	amb = max (0.0, amb-0.05);
 
 	DWORD addamb = (DWORD)(amb*rscale*256.0);
 	DWORD newamb = *(DWORD*)gc->GetConfigParam (CFGPRM_AMBIENTLEVEL) + addamb;
 	ambient = 0;
 	for (int i = 0; i < 4; i++)
-		ambient |= min (255, newamb) << (i<<3);
+		ambient |= min ((DWORD)255, newamb) << (i<<3);
 	return true;
 }

OVP/D3D7Client/VVessel.cpp

@@ -14,7 +14,10 @@
 #include "VVessel.h"
 #include "MeshMgr.h"
 #include "Texture.h"
+#include <algorithm>
 
+using std::min;
+using std::max;
 using namespace oapi;
 
 // ==============================================================
@@ -585,7 +588,7 @@ void vVessel::RenderGroundShadow (LPDIRECT3DDEVICE7 dev, OBJHANDLE hPlanet)
 	DWORD tfactor;
 	bool resetalpha = false;
 	if (gc->UseStencilBuffer()) {
-		double scale = min (1, (csun-0.07)/0.015);
+		double scale = min (1.0, (csun-0.07)/0.015);
 		if (scale < 1) {
 			dev->GetRenderState (D3DRENDERSTATE_TEXTUREFACTOR, &tfactor);
 			float modalpha = (float)(scale*RGBA_GETALPHA(tfactor)/256.0);
@@ -744,7 +747,7 @@ bool vVessel::ModLighting (LPD3DLIGHT7 light)
 						amb = amb0 / (alt*0.5e-4 + 1.0);
 						amb *= min (1.0, (sunelev+14.0*RAD)/(20.0*RAD));
 						if (!lightmod) lightmod = (amb > 0.05);
-						amb = max (0, amb-0.05);
+						amb = max (0.0, amb-0.05);
 						// reduce direct light component to avoid overexposure
 						lcol *= 1.0-amb*0.5;
 					}

OVP/D3D7Client/cloudmgr2.cpp

@@ -15,6 +15,10 @@
 #include "cloudmgr2.h"
 #include "Texture.h"
 #include "Camera.h"
+#include <algorithm>
+
+using std::min;
+using std::max;
 
 // =======================================================================
 // =======================================================================

OVP/D3D7Client/surfmgr2.cpp

@@ -18,6 +18,10 @@
 #include "tilelabel.h"
 #include "Texture.h"
 #include "Camera.h"
+#include <algorithm>
+
+using std::min;
+using std::max;
 
 // =======================================================================
 

OVP/D3D7Client/tilelabel.cpp

@@ -5,7 +5,10 @@
 #include "camera.h"
 #include <limits>
 #include <sstream>
+#include <algorithm>
 
+using std::min;
+using std::max;
 extern Orbiter *g_pOrbiter;
 extern Camera *g_camera;
 

OVP/D3D7Client/tilemgr2.cpp

@@ -16,6 +16,9 @@
 #include "Texture.h"
 #include "Camera.h"
 #include "D3D7Config.h"
+#include <algorithm>
+
+using std::max;
 
 // =======================================================================
 // Externals

OVP/D3D7Client/tilemgr2_imp.hpp

@@ -17,6 +17,7 @@
 
 #include "Camera.h"
 #include "tilemgr2.h"
+#include <algorithm>
 
 // -----------------------------------------------------------------------
 
@@ -129,7 +130,7 @@ void TileManager2Base::ProcessNode (QuadTreeNode<TileType> *node)
 			tdist = sqrt(a*a + h*h);
 		}
 		double apr = tdist * camera->GetTanAp() * resolutionScale;
-		int tgtres = (apr < 1e-6 ? prm.maxlvl : max (0, min (prm.maxlvl, (int)(bias - log(apr)*res_scale))));
+		int tgtres = (apr < 1e-6 ? prm.maxlvl : std::max (0, std::min (prm.maxlvl, (int)(bias - log(apr)*res_scale))));
 		bstepdown = (lvl < tgtres);
 	}
 

OVP/D3D9Client/AABBUtil.cpp

@@ -26,6 +26,8 @@
 #include <xnamath.h>
 #pragma warning(pop)
 
+using std::min;
+
 // =================================================================================================================================
 //
 bool SolveLUSystem(int n, double *A, double *b, double *x, double *det)

OVP/D3D9Client/CSphereMgr.cpp

@@ -94,7 +94,7 @@ CSphereManager::CSphereManager(D3D9Client *gc, const Scene *scene) : gc(gc), tex
 	intensity = (float)tmp;
 
 	maxlvl = 8; // g_pOrbiter->Cfg()->CSphereMaxLevel;
-	maxbaselvl = min (8, maxlvl);
+	maxbaselvl = min ((DWORD)8, maxlvl);
 	int maxidx = patchidx[maxbaselvl];
 	bPreloadTile = (Config->PlanetPreloadMode != 0);
 	nhitex = nhispec = 0;

OVP/D3D9Client/CelSphere.cpp

@@ -22,6 +22,7 @@
 #include "D3D9Pad.h"
 #include "AABBUtil.h"
 
+using std::min;
 
 #define NSEG 64 // number of segments in celestial grid lines
 
@@ -130,7 +131,7 @@ void D3D9CelestialSphere::InitStars ()
 		DWORD nbuf = (m_nsVtx + maxNumVertices - 1) / maxNumVertices; // number of buffers required
 		m_sVtx.resize(nbuf);
 		for (auto it = m_sVtx.begin(); it != m_sVtx.end(); it++) {
-			nv = min(maxNumVertices, m_nsVtx - idx);
+			nv = min((DWORD)maxNumVertices, m_nsVtx - idx);
 			m_pDevice->CreateVertexBuffer(UINT(nv * sizeof(VERTEX_XYZC)), D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, &*it, NULL);
 			VERTEX_XYZC* vbuf;
 			(*it)->Lock(0, 0, (LPVOID*)&vbuf, 0);

OVP/D3D9Client/D3D9Client.h

@@ -36,7 +36,7 @@
 #define PP_DEFAULT			0x1
 #define PP_LENSFLARE		0x2
 
-#define MAX_SCENE_LIGHTS	24
+#define MAX_SCENE_LIGHTS	(DWORD)24
 #define MAX_MESH_LIGHTS		8	// Must match the setting in D3D9Client.fx
 
 #ifdef _NVAPI_H