diff --git a/include/Nazara/Core/Stream.hpp b/include/Nazara/Core/Stream.hpp index e17e6b2b6..cbb3f1b95 100644 --- a/include/Nazara/Core/Stream.hpp +++ b/include/Nazara/Core/Stream.hpp @@ -21,7 +21,7 @@ namespace Nz class NAZARA_CORE_API Stream { public: - Stream(const Stream&) = default; + Stream(const Stream&) = delete; Stream(Stream&&) noexcept = default; virtual ~Stream(); @@ -55,7 +55,7 @@ namespace Nz bool Write(const std::string_view& string); 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; static constexpr std::size_t DefaultBufferSize = 0xFFFF; diff --git a/src/Nazara/Utility/Mesh.cpp b/src/Nazara/Utility/Mesh.cpp index cec59e535..ced9ab264 100644 --- a/src/Nazara/Utility/Mesh.cpp +++ b/src/Nazara/Utility/Mesh.cpp @@ -96,8 +96,8 @@ namespace Nz { case PrimitiveType::Box: { - std::size_t indexCount; - std::size_t vertexCount; + UInt64 indexCount; + UInt64 vertexCount; ComputeBoxIndexVertexCount(primitive.box.subdivision, &indexCount, &vertexCount); bool largeIndices = (vertexCount > std::numeric_limits::max()); @@ -120,8 +120,8 @@ namespace Nz case PrimitiveType::Cone: { - std::size_t indexCount; - std::size_t vertexCount; + UInt64 indexCount; + UInt64 vertexCount; ComputeConeIndexVertexCount(primitive.cone.subdivision, &indexCount, &vertexCount); bool largeIndices = (vertexCount > std::numeric_limits::max()); @@ -144,8 +144,8 @@ namespace Nz case PrimitiveType::Plane: { - std::size_t indexCount; - std::size_t vertexCount; + UInt64 indexCount; + UInt64 vertexCount; ComputePlaneIndexVertexCount(primitive.plane.subdivision, &indexCount, &vertexCount); bool largeIndices = (vertexCount > std::numeric_limits::max()); @@ -172,8 +172,8 @@ namespace Nz { case SphereType::Cubic: { - std::size_t indexCount; - std::size_t vertexCount; + UInt64 indexCount; + UInt64 vertexCount; ComputeCubicSphereIndexVertexCount(primitive.sphere.cubic.subdivision, &indexCount, &vertexCount); bool largeIndices = (vertexCount > std::numeric_limits::max()); @@ -196,8 +196,8 @@ namespace Nz case SphereType::Ico: { - std::size_t indexCount; - std::size_t vertexCount; + UInt64 indexCount; + UInt64 vertexCount; ComputeIcoSphereIndexVertexCount(primitive.sphere.ico.recursionLevel, &indexCount, &vertexCount); bool largeIndices = (vertexCount > std::numeric_limits::max()); @@ -220,8 +220,8 @@ namespace Nz case SphereType::UV: { - std::size_t indexCount; - std::size_t vertexCount; + UInt64 indexCount; + UInt64 vertexCount; ComputeUvSphereIndexVertexCount(primitive.sphere.uv.sliceCount, primitive.sphere.uv.stackCount, &indexCount, &vertexCount); bool largeIndices = (vertexCount > std::numeric_limits::max());