sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation on macOS

This commit is contained in:
SirLynix 2022-04-23 22:23:07 +02:00
parent e1d2063bf0
commit 0f58117b76
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Core/Stream.hpp
View File

@ -21,7 +21,7 @@ namespace Nz
class NAZARA_CORE_API Stream class NAZARA_CORE_API Stream
{ {
public: public:
Stream(const Stream&) = default; Stream(const Stream&) = delete;
Stream(Stream&&) noexcept = default; Stream(Stream&&) noexcept = default;
virtual ~Stream(); virtual ~Stream();
@ -55,7 +55,7 @@ namespace Nz
bool Write(const std::string_view& string); bool Write(const std::string_view& string);
inline std::size_t Write(const void* buffer, std::size_t size); inline std::size_t Write(const void* buffer, std::size_t size);
Stream& operator=(const Stream&) = default; Stream& operator=(const Stream&) = delete;
Stream& operator=(Stream&&) noexcept = default; Stream& operator=(Stream&&) noexcept = default;
static constexpr std::size_t DefaultBufferSize = 0xFFFF; static constexpr std::size_t DefaultBufferSize = 0xFFFF;

24
src/Nazara/Utility/Mesh.cpp
View File

@ -96,8 +96,8 @@ namespace Nz
{ {
case PrimitiveType::Box: case PrimitiveType::Box:
{ {
std::size_t indexCount; UInt64 indexCount;
std::size_t vertexCount; UInt64 vertexCount;
ComputeBoxIndexVertexCount(primitive.box.subdivision, &indexCount, &vertexCount); ComputeBoxIndexVertexCount(primitive.box.subdivision, &indexCount, &vertexCount);
bool largeIndices = (vertexCount > std::numeric_limits<UInt16>::max()); bool largeIndices = (vertexCount > std::numeric_limits<UInt16>::max());
@ -120,8 +120,8 @@ namespace Nz
case PrimitiveType::Cone: case PrimitiveType::Cone:
{ {
std::size_t indexCount; UInt64 indexCount;
std::size_t vertexCount; UInt64 vertexCount;
ComputeConeIndexVertexCount(primitive.cone.subdivision, &indexCount, &vertexCount); ComputeConeIndexVertexCount(primitive.cone.subdivision, &indexCount, &vertexCount);
bool largeIndices = (vertexCount > std::numeric_limits<UInt16>::max()); bool largeIndices = (vertexCount > std::numeric_limits<UInt16>::max());
@ -144,8 +144,8 @@ namespace Nz
case PrimitiveType::Plane: case PrimitiveType::Plane:
{ {
std::size_t indexCount; UInt64 indexCount;
std::size_t vertexCount; UInt64 vertexCount;
ComputePlaneIndexVertexCount(primitive.plane.subdivision, &indexCount, &vertexCount); ComputePlaneIndexVertexCount(primitive.plane.subdivision, &indexCount, &vertexCount);
bool largeIndices = (vertexCount > std::numeric_limits<UInt16>::max()); bool largeIndices = (vertexCount > std::numeric_limits<UInt16>::max());
@ -172,8 +172,8 @@ namespace Nz
{ {
case SphereType::Cubic: case SphereType::Cubic:
{ {
std::size_t indexCount; UInt64 indexCount;
std::size_t vertexCount; UInt64 vertexCount;
ComputeCubicSphereIndexVertexCount(primitive.sphere.cubic.subdivision, &indexCount, &vertexCount); ComputeCubicSphereIndexVertexCount(primitive.sphere.cubic.subdivision, &indexCount, &vertexCount);
bool largeIndices = (vertexCount > std::numeric_limits<UInt16>::max()); bool largeIndices = (vertexCount > std::numeric_limits<UInt16>::max());
@ -196,8 +196,8 @@ namespace Nz
case SphereType::Ico: case SphereType::Ico:
{ {
std::size_t indexCount; UInt64 indexCount;
std::size_t vertexCount; UInt64 vertexCount;
ComputeIcoSphereIndexVertexCount(primitive.sphere.ico.recursionLevel, &indexCount, &vertexCount); ComputeIcoSphereIndexVertexCount(primitive.sphere.ico.recursionLevel, &indexCount, &vertexCount);
bool largeIndices = (vertexCount > std::numeric_limits<UInt16>::max()); bool largeIndices = (vertexCount > std::numeric_limits<UInt16>::max());
@ -220,8 +220,8 @@ namespace Nz
case SphereType::UV: case SphereType::UV:
{ {
std::size_t indexCount; UInt64 indexCount;
std::size_t vertexCount; UInt64 vertexCount;
ComputeUvSphereIndexVertexCount(primitive.sphere.uv.sliceCount, primitive.sphere.uv.stackCount, &indexCount, &vertexCount); ComputeUvSphereIndexVertexCount(primitive.sphere.uv.sliceCount, primitive.sphere.uv.stackCount, &indexCount, &vertexCount);
bool largeIndices = (vertexCount > std::numeric_limits<UInt16>::max()); bool largeIndices = (vertexCount > std::numeric_limits<UInt16>::max());