Dep/g3d: Purge Windows.h includes from headers we include

16 files changed, 314 insertions, 18 deletions

diff --git a/dep/g3dlite/G3D-v9.0 hotfix15.diff b/dep/g3dlite/G3D-v9.0 hotfix15.diff
new file mode 100644
index 00000000000..1ea8a3e5970
--- /dev/null
+++ b/dep/g3dlite/G3D-v9.0 hotfix15.diff
@@ -0,0 +1,279 @@
+diff --git a/dep/g3dlite/include/G3D/AABox.h b/dep/g3dlite/include/G3D/AABox.h
+index 7a47ea63aa..97a47cf986 100644
+--- a/dep/g3dlite/include/G3D/AABox.h
++++ b/dep/g3dlite/include/G3D/AABox.h
+@@ -17,14 +17,14 @@
+ 
+ #include "G3D/platform.h"
+ #include "G3D/debug.h"
+-#include "G3D/Array.h"
+-#include "G3D/Plane.h"
+-#include "G3D/Sphere.h"
+ #include "G3D/Vector3.h"
+ 
+ namespace G3D {
+ 
+ class Any;
++template <class T, size_t MIN_ELEMENTS> class Array;
++class Plane;
++class Sphere;
+ 
+ /**
+  An axis-aligned box.
+@@ -221,7 +221,7 @@ public:
+        
+      */
+     bool culledBy
+-    (const Array<Plane>&    plane,
++    (const Array<Plane, 10>&    plane,
+      int32&            cullingPlaneIndex,
+      const uint32          testMask,
+      uint32&                    childMask) const;
+@@ -230,7 +230,7 @@ public:
+      Conservative culling test that does not produce a mask for children.
+      */
+     bool culledBy
+-    (const Array<Plane>&        plane,
++    (const Array<Plane, 10>&        plane,
+      int32&                        cullingPlaneIndex = dummy,
+      const uint32               testMask  = 0xFFFFFFFF) const;
+ 
+diff --git a/dep/g3dlite/include/G3D/AtomicInt32.h b/dep/g3dlite/include/G3D/AtomicInt32.h
+index 9824d426d7..51561e3dcc 100644
+--- a/dep/g3dlite/include/G3D/AtomicInt32.h
++++ b/dep/g3dlite/include/G3D/AtomicInt32.h
+@@ -12,7 +12,9 @@
+ #include "G3D/platform.h"
+ #include "G3D/g3dmath.h"
+ 
+-#if defined(G3D_OSX)
++#if defined(G3D_WINDOWS)
++#   include <Windows.h>
++#elif defined(G3D_OSX)
+ #   include <libkern/OSAtomic.h>
+ #endif
+ 
+diff --git a/dep/g3dlite/include/G3D/HashTrait.h b/dep/g3dlite/include/G3D/HashTrait.h
+index 1de3777bae..6199f4504e 100644
+--- a/dep/g3dlite/include/G3D/HashTrait.h
++++ b/dep/g3dlite/include/G3D/HashTrait.h
+@@ -13,7 +13,6 @@
+ #define G3D_HashTrait_h
+ 
+ #include "G3D/platform.h"
+-#include "G3D/Crypto.h"
+ #include "G3D/g3dmath.h"
+ #include "G3D/uint128.h"
+ #include <typeinfo>
+diff --git a/dep/g3dlite/include/G3D/Random.h b/dep/g3dlite/include/G3D/Random.h
+index 9d911806a9..359755044a 100644
+--- a/dep/g3dlite/include/G3D/Random.h
++++ b/dep/g3dlite/include/G3D/Random.h
+@@ -159,6 +159,7 @@ public:
+     static Random& common();
+ };
+ 
++Random& commonRandom();
+ }
+ 
+ #endif
+diff --git a/dep/g3dlite/include/G3D/System.h b/dep/g3dlite/include/G3D/System.h
+index 9ed88957d7..81c83527c9 100644
+--- a/dep/g3dlite/include/G3D/System.h
++++ b/dep/g3dlite/include/G3D/System.h
+@@ -21,6 +21,10 @@
+ #include "G3D/FileNotFound.h"
+ #include <string>
+ 
++#ifdef G3D_WINDOWS
++#include <Windows.h>
++#endif
++
+ #if defined(__aarch64__)
+ #include <sys/time.h>
+ #endif
+diff --git a/dep/g3dlite/include/G3D/Vector2.h b/dep/g3dlite/include/G3D/Vector2.h
+index 65cf7fa8f2..696889d630 100644
+--- a/dep/g3dlite/include/G3D/Vector2.h
++++ b/dep/g3dlite/include/G3D/Vector2.h
+@@ -19,20 +19,21 @@
+ 
+ #include "G3D/platform.h"
+ #include "G3D/g3dmath.h"
+-#include "G3D/Table.h"
+ #include "G3D/HashTrait.h"
+ #include "G3D/Vector2int16.h"
+ #include "G3D/Vector2unorm16.h"
+-#include "G3D/Random.h"
+ 
+ namespace G3D {
+ 
++class Random;
+ class Vector2;    
+ class Vector3;
+ class Vector4;
+ class Vector2int32;
+ class Any;
+ 
++Random& commonRandom();
++
+ /**
+  Do not subclass-- this implementation makes assumptions about the
+  memory layout.
+@@ -210,7 +211,7 @@ public:
+     }
+ 
+     /** Uniformly distributed random vector on the unit sphere */
+-    static Vector2 random(Random& r = Random::common());
++    static Vector2 random(Random& r = commonRandom());
+ 
+     // Special values.
+     // Intentionally not inlined: see Matrix3::identity() for details.
+diff --git a/dep/g3dlite/include/G3D/Vector3.h b/dep/g3dlite/include/G3D/Vector3.h
+index 05d9b11ed5..c79f70b916 100644
+--- a/dep/g3dlite/include/G3D/Vector3.h
++++ b/dep/g3dlite/include/G3D/Vector3.h
+@@ -17,9 +17,7 @@
+ 
+ #include "G3D/platform.h"
+ #include "G3D/g3dmath.h"
+-#include "G3D/Random.h"
+ #include "G3D/Vector2.h"
+-#include "G3D/Table.h"
+ #include "G3D/HashTrait.h"
+ #include "G3D/PositionTrait.h"
+ #include "G3D/Vector2.h"
+@@ -365,7 +363,7 @@ public:
+        Distribution rendered by G3D::DirectionHistogram:
+        \image html vector3-random.png
+       */
+-    static Vector3 random(Random& r = Random::common());
++    static Vector3 random(Random& r = commonRandom());
+ 
+     /** \brief Random unit vector, distributed according to \f$\max(\cos \theta,0)\f$.
+ 
+@@ -380,9 +378,9 @@ public:
+ 
+         @cite Henrik Wann Jensen, Realistic Image Synthesis using Photon Mapping eqn 2.24
+     */
+-    static Vector3 cosHemiRandom(const Vector3& n, Random& r = Random::common());
++    static Vector3 cosHemiRandom(const Vector3& n, Random& r = commonRandom());
+ 
+-    static Vector3 cosSphereRandom(const Vector3& n, Random& r = Random::common());
++    static Vector3 cosSphereRandom(const Vector3& n, Random& r = commonRandom());
+ 
+     /** \brief Random unit vector, distributed according to \f$\max(\cos^k \theta,0)\f$.
+ 
+@@ -397,7 +395,7 @@ public:
+ 
+         @cite Ashikhmin and Shirley, An anisotropic Phong BRDF model, Journal of Graphics Tools, 2002
+     */
+-    static Vector3 cosPowHemiRandom(const Vector3& n, const float k, Random& r = Random::common());
++    static Vector3 cosPowHemiRandom(const Vector3& n, const float k, Random& r = commonRandom());
+ 
+     /**
+      \brief Random vector distributed over the hemisphere about normal.
+@@ -405,7 +403,7 @@ public:
+      Distribution rendered by G3D::DirectionHistogram:
+       \image html vector3-hemirandom.png
+      */
+-    static Vector3 hemiRandom(const Vector3& normal, Random& r = Random::common());
++    static Vector3 hemiRandom(const Vector3& normal, Random& r = commonRandom());
+ 
+     inline float sum() const {
+         return x + y + z;
+diff --git a/dep/g3dlite/include/G3D/Vector4.h b/dep/g3dlite/include/G3D/Vector4.h
+index 24521efc93..0f0ea459df 100644
+--- a/dep/g3dlite/include/G3D/Vector4.h
++++ b/dep/g3dlite/include/G3D/Vector4.h
+@@ -19,7 +19,6 @@
+ #include "G3D/g3dmath.h"
+ #include "G3D/Vector3.h"
+ #include "G3D/Vector2.h"
+-#include "G3D/Table.h"
+ #include "G3D/HashTrait.h"
+ #include "G3D/PositionTrait.h"
+ #include <string>
+diff --git a/dep/g3dlite/include/G3D/platform.h b/dep/g3dlite/include/G3D/platform.h
+index d043f21491..9202fe41d0 100644
+--- a/dep/g3dlite/include/G3D/platform.h
++++ b/dep/g3dlite/include/G3D/platform.h
+@@ -190,6 +190,7 @@ These control the version of Winsock used by G3D.
+     //  http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore98/HTML/_core_Compiler_Reference.asp
+     //
+ 
++#if 0
+     // DLL runtime
+     #ifndef _DLL
+         #define _DLL
+@@ -227,6 +228,8 @@ These control the version of Winsock used by G3D.
+ #   undef WIN32_LEAN_AND_MEAN
+ #   undef NOMINMAX
+ 
++#endif // 0
++
+ #   ifdef _G3D_INTERNAL_HIDE_WINSOCK_
+ #      undef _G3D_INTERNAL_HIDE_WINSOCK_
+ #      undef _WINSOCKAPI_
+diff --git a/dep/g3dlite/source/Random.cpp b/dep/g3dlite/source/Random.cpp
+index cbfa07dec0..a31d52a557 100644
+--- a/dep/g3dlite/source/Random.cpp
++++ b/dep/g3dlite/source/Random.cpp
+@@ -227,4 +227,9 @@ void Random::sphere(float& x, float& y, float& z) {
+     z *= s;
+ }
+ 
++Random& commonRandom()
++{
++    return Random::common();
++}
++
+ } // G3D
+diff --git a/dep/g3dlite/source/Vector2.cpp b/dep/g3dlite/source/Vector2.cpp
+index a6edea9a83..194cd3090d 100644
+--- a/dep/g3dlite/source/Vector2.cpp
++++ b/dep/g3dlite/source/Vector2.cpp
+@@ -23,6 +23,7 @@
+ #include "G3D/TextInput.h"
+ #include "G3D/TextOutput.h"
+ #include "G3D/Any.h"
++#include "G3D/Random.h"
+ 
+ namespace G3D {
+ 
+diff --git a/dep/g3dlite/source/Vector3.cpp b/dep/g3dlite/source/Vector3.cpp
+index e2d9643e5c..ccbf7d6a0b 100644
+--- a/dep/g3dlite/source/Vector3.cpp
++++ b/dep/g3dlite/source/Vector3.cpp
+@@ -28,6 +28,7 @@
+ #include "G3D/Vector4.h"
+ #include "G3D/Vector3int32.h"
+ #include "G3D/Any.h"
++#include "G3D/Random.h"
+  
+ namespace G3D {
+ 
+diff --git a/dep/g3dlite/source/debugAssert.cpp b/dep/g3dlite/source/debugAssert.cpp
+index 3c3e43a0af..ff843fb7ee 100644
+--- a/dep/g3dlite/source/debugAssert.cpp
++++ b/dep/g3dlite/source/debugAssert.cpp
+@@ -23,6 +23,7 @@
+ #include <cstdlib>
+ 
+ #ifdef _MSC_VER
++#include <Windows.h>
+     // disable: "C++ exception handler used"
+ #   pragma warning (push)
+ #   pragma warning (disable : 4530)
+diff --git a/src/server/game/DataStores/M2Stores.cpp b/src/server/game/DataStores/M2Stores.cpp
+index c5eb43fdf2..b55b5a9699 100644
+--- a/src/server/game/DataStores/M2Stores.cpp
++++ b/src/server/game/DataStores/M2Stores.cpp
+@@ -23,6 +23,7 @@
+ #include "M2Structure.h"
+ #include "World.h"
+ #include <boost/filesystem/path.hpp>
++#include <G3D/Vector4.h>
+ #include <fstream>
+ #include <iostream>
+ #include <iomanip>
diff --git a/dep/g3dlite/Readme.txt b/dep/g3dlite/Readme.txt
index 95cf9c186c6..e86e0d489a7 100644
--- a/dep/g3dlite/Readme.txt
+++ b/dep/g3dlite/Readme.txt
@@ -24,3 +24,4 @@ G3D-v9.0 hotfix11.diff - 2017-11-11 - static analysis issue fix
 G3D-v9.0 hotfix12.diff - 2020-02-23 - ARM64 build fix
 G3D-v9.0 hotfix13.diff - 2020-08-04 - MSVC build fix with /permissive-
 G3D-v9.0 hotfix14.diff - 2022-01-16 - warning fixes
+G3D-v9.0 hotfix15.diff - 2022-02-11 - purge Windows.h includes from public headers
diff --git a/dep/g3dlite/include/G3D/AABox.h b/dep/g3dlite/include/G3D/AABox.h
index 7a47ea63aa2..97a47cf9865 100644
--- a/dep/g3dlite/include/G3D/AABox.h
+++ b/dep/g3dlite/include/G3D/AABox.h
@@ -17,14 +17,14 @@
 
 #include "G3D/platform.h"
 #include "G3D/debug.h"
-#include "G3D/Array.h"
-#include "G3D/Plane.h"
-#include "G3D/Sphere.h"
 #include "G3D/Vector3.h"
 
 namespace G3D {
 
 class Any;
+template <class T, size_t MIN_ELEMENTS> class Array;
+class Plane;
+class Sphere;
 
 /**
  An axis-aligned box.
@@ -221,7 +221,7 @@ public:
        
      */
     bool culledBy
-    (const Array<Plane>&    plane,
+    (const Array<Plane, 10>&    plane,
      int32&            cullingPlaneIndex,
      const uint32          testMask,
      uint32&                    childMask) const;
@@ -230,7 +230,7 @@ public:
      Conservative culling test that does not produce a mask for children.
      */
     bool culledBy
-    (const Array<Plane>&        plane,
+    (const Array<Plane, 10>&        plane,
      int32&                        cullingPlaneIndex = dummy,
      const uint32               testMask  = 0xFFFFFFFF) const;
 
diff --git a/dep/g3dlite/include/G3D/AtomicInt32.h b/dep/g3dlite/include/G3D/AtomicInt32.h
index 9824d426d74..51561e3dcc4 100644
--- a/dep/g3dlite/include/G3D/AtomicInt32.h
+++ b/dep/g3dlite/include/G3D/AtomicInt32.h
@@ -12,7 +12,9 @@
 #include "G3D/platform.h"
 #include "G3D/g3dmath.h"
 
-#if defined(G3D_OSX)
+#if defined(G3D_WINDOWS)
+#   include <Windows.h>
+#elif defined(G3D_OSX)
 #   include <libkern/OSAtomic.h>
 #endif
 
diff --git a/dep/g3dlite/include/G3D/HashTrait.h b/dep/g3dlite/include/G3D/HashTrait.h
index 1de3777baec..6199f4504ed 100644
--- a/dep/g3dlite/include/G3D/HashTrait.h
+++ b/dep/g3dlite/include/G3D/HashTrait.h
@@ -13,7 +13,6 @@
 #define G3D_HashTrait_h
 
 #include "G3D/platform.h"
-#include "G3D/Crypto.h"
 #include "G3D/g3dmath.h"
 #include "G3D/uint128.h"
 #include <typeinfo>
diff --git a/dep/g3dlite/include/G3D/Random.h b/dep/g3dlite/include/G3D/Random.h
index 9d911806a97..359755044a8 100644
--- a/dep/g3dlite/include/G3D/Random.h
+++ b/dep/g3dlite/include/G3D/Random.h
@@ -159,6 +159,7 @@ public:
     static Random& common();
 };
 
+Random& commonRandom();
 }
 
 #endif
diff --git a/dep/g3dlite/include/G3D/System.h b/dep/g3dlite/include/G3D/System.h
index 9ed88957d75..81c83527c9c 100644
--- a/dep/g3dlite/include/G3D/System.h
+++ b/dep/g3dlite/include/G3D/System.h
@@ -21,6 +21,10 @@
 #include "G3D/FileNotFound.h"
 #include <string>
 
+#ifdef G3D_WINDOWS
+#include <Windows.h>
+#endif
+
 #if defined(__aarch64__)
 #include <sys/time.h>
 #endif
diff --git a/dep/g3dlite/include/G3D/Vector2.h b/dep/g3dlite/include/G3D/Vector2.h
index 65cf7fa8f2f..696889d6302 100644
--- a/dep/g3dlite/include/G3D/Vector2.h
+++ b/dep/g3dlite/include/G3D/Vector2.h
@@ -19,20 +19,21 @@
 
 #include "G3D/platform.h"
 #include "G3D/g3dmath.h"
-#include "G3D/Table.h"
 #include "G3D/HashTrait.h"
 #include "G3D/Vector2int16.h"
 #include "G3D/Vector2unorm16.h"
-#include "G3D/Random.h"
 
 namespace G3D {
 
+class Random;
 class Vector2;    
 class Vector3;
 class Vector4;
 class Vector2int32;
 class Any;
 
+Random& commonRandom();
+
 /**
  Do not subclass-- this implementation makes assumptions about the
  memory layout.
@@ -210,7 +211,7 @@ public:
     }
 
     /** Uniformly distributed random vector on the unit sphere */
-    static Vector2 random(Random& r = Random::common());
+    static Vector2 random(Random& r = commonRandom());
 
     // Special values.
     // Intentionally not inlined: see Matrix3::identity() for details.
diff --git a/dep/g3dlite/include/G3D/Vector3.h b/dep/g3dlite/include/G3D/Vector3.h
index 05d9b11ed57..c79f70b916b 100644
--- a/dep/g3dlite/include/G3D/Vector3.h
+++ b/dep/g3dlite/include/G3D/Vector3.h
@@ -17,9 +17,7 @@
 
 #include "G3D/platform.h"
 #include "G3D/g3dmath.h"
-#include "G3D/Random.h"
 #include "G3D/Vector2.h"
-#include "G3D/Table.h"
 #include "G3D/HashTrait.h"
 #include "G3D/PositionTrait.h"
 #include "G3D/Vector2.h"
@@ -365,7 +363,7 @@ public:
        Distribution rendered by G3D::DirectionHistogram:
        \image html vector3-random.png
       */
-    static Vector3 random(Random& r = Random::common());
+    static Vector3 random(Random& r = commonRandom());
 
     /** \brief Random unit vector, distributed according to \f$\max(\cos \theta,0)\f$.
 
@@ -380,9 +378,9 @@ public:
 
         @cite Henrik Wann Jensen, Realistic Image Synthesis using Photon Mapping eqn 2.24
     */
-    static Vector3 cosHemiRandom(const Vector3& n, Random& r = Random::common());
+    static Vector3 cosHemiRandom(const Vector3& n, Random& r = commonRandom());
 
-    static Vector3 cosSphereRandom(const Vector3& n, Random& r = Random::common());
+    static Vector3 cosSphereRandom(const Vector3& n, Random& r = commonRandom());
 
     /** \brief Random unit vector, distributed according to \f$\max(\cos^k \theta,0)\f$.
 
@@ -397,7 +395,7 @@ public:
 
         @cite Ashikhmin and Shirley, An anisotropic Phong BRDF model, Journal of Graphics Tools, 2002
     */
-    static Vector3 cosPowHemiRandom(const Vector3& n, const float k, Random& r = Random::common());
+    static Vector3 cosPowHemiRandom(const Vector3& n, const float k, Random& r = commonRandom());
 
     /**
      \brief Random vector distributed over the hemisphere about normal.
@@ -405,7 +403,7 @@ public:
      Distribution rendered by G3D::DirectionHistogram:
       \image html vector3-hemirandom.png
      */
-    static Vector3 hemiRandom(const Vector3& normal, Random& r = Random::common());
+    static Vector3 hemiRandom(const Vector3& normal, Random& r = commonRandom());
 
     inline float sum() const {
         return x + y + z;
diff --git a/dep/g3dlite/include/G3D/Vector4.h b/dep/g3dlite/include/G3D/Vector4.h
index 24521efc93c..0f0ea459dfa 100644
--- a/dep/g3dlite/include/G3D/Vector4.h
+++ b/dep/g3dlite/include/G3D/Vector4.h
@@ -19,7 +19,6 @@
 #include "G3D/g3dmath.h"
 #include "G3D/Vector3.h"
 #include "G3D/Vector2.h"
-#include "G3D/Table.h"
 #include "G3D/HashTrait.h"
 #include "G3D/PositionTrait.h"
 #include <string>
diff --git a/dep/g3dlite/include/G3D/platform.h b/dep/g3dlite/include/G3D/platform.h
index d043f21491a..9202fe41d0b 100644
--- a/dep/g3dlite/include/G3D/platform.h
+++ b/dep/g3dlite/include/G3D/platform.h
@@ -190,6 +190,7 @@ These control the version of Winsock used by G3D.
     //  http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore98/HTML/_core_Compiler_Reference.asp
     //
 
+#if 0
     // DLL runtime
     #ifndef _DLL
         #define _DLL
@@ -227,6 +228,8 @@ These control the version of Winsock used by G3D.
 #   undef WIN32_LEAN_AND_MEAN
 #   undef NOMINMAX
 
+#endif // 0
+
 #   ifdef _G3D_INTERNAL_HIDE_WINSOCK_
 #      undef _G3D_INTERNAL_HIDE_WINSOCK_
 #      undef _WINSOCKAPI_
diff --git a/dep/g3dlite/source/Random.cpp b/dep/g3dlite/source/Random.cpp
index cbfa07dec0b..a31d52a557c 100644
--- a/dep/g3dlite/source/Random.cpp
+++ b/dep/g3dlite/source/Random.cpp
@@ -227,4 +227,9 @@ void Random::sphere(float& x, float& y, float& z) {
     z *= s;
 }
 
+Random& commonRandom()
+{
+    return Random::common();
+}
+
 } // G3D
diff --git a/dep/g3dlite/source/Vector2.cpp b/dep/g3dlite/source/Vector2.cpp
index a6edea9a83f..194cd3090de 100644
--- a/dep/g3dlite/source/Vector2.cpp
+++ b/dep/g3dlite/source/Vector2.cpp
@@ -23,6 +23,7 @@
 #include "G3D/TextInput.h"
 #include "G3D/TextOutput.h"
 #include "G3D/Any.h"
+#include "G3D/Random.h"
 
 namespace G3D {
 
diff --git a/dep/g3dlite/source/Vector3.cpp b/dep/g3dlite/source/Vector3.cpp
index e2d9643e5cc..ccbf7d6a0bd 100644
--- a/dep/g3dlite/source/Vector3.cpp
+++ b/dep/g3dlite/source/Vector3.cpp
@@ -28,6 +28,7 @@
 #include "G3D/Vector4.h"
 #include "G3D/Vector3int32.h"
 #include "G3D/Any.h"
+#include "G3D/Random.h"
  
 namespace G3D {
 
diff --git a/dep/g3dlite/source/debugAssert.cpp b/dep/g3dlite/source/debugAssert.cpp
index 3c3e43a0af9..ff843fb7ee0 100644
--- a/dep/g3dlite/source/debugAssert.cpp
+++ b/dep/g3dlite/source/debugAssert.cpp
@@ -23,6 +23,7 @@
 #include <cstdlib>
 
 #ifdef _MSC_VER
+#include <Windows.h>
     // disable: "C++ exception handler used"
 #   pragma warning (push)
 #   pragma warning (disable : 4530)
diff --git a/src/server/game/DataStores/M2Stores.cpp b/src/server/game/DataStores/M2Stores.cpp
index c5eb43fdf24..b55b5a9699a 100644
--- a/src/server/game/DataStores/M2Stores.cpp
+++ b/src/server/game/DataStores/M2Stores.cpp
@@ -23,6 +23,7 @@
 #include "M2Structure.h"
 #include "World.h"
 #include <boost/filesystem/path.hpp>
+#include <G3D/Vector4.h>
 #include <fstream>
 #include <iostream>
 #include <iomanip>