diff options
| author | Shauren <shauren.trinity@gmail.com> | 2023-01-01 00:26:53 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2023-08-12 14:24:24 +0200 |
| commit | b7287e85e4bc8acb2b95271ece9dd8a5b93873cd (patch) | |
| tree | 6088602ac914ef69573ce551d7fc4f0613beb5ce /dep/g3dlite/include/G3D/AABox.h | |
| parent | f9033a5dbd559fde3030a21d83d664983d95f39f (diff) | |
Core/Misc: Fixed deprecation warnings for c++20
(cherry picked from commit ba9bbbc9d0c3b80d8954ad6390d23ae3d0f804b2)
Diffstat (limited to 'dep/g3dlite/include/G3D/AABox.h')
| -rw-r--r-- | dep/g3dlite/include/G3D/AABox.h | 10 |
1 files changed, 5 insertions, 5 deletions
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; |