diff --git a/include/Nazara/Physics2D/Constraint2D.hpp b/include/Nazara/Physics2D/Constraint2D.hpp index 337ef63e3..155bc2a94 100644 --- a/include/Nazara/Physics2D/Constraint2D.hpp +++ b/include/Nazara/Physics2D/Constraint2D.hpp @@ -104,8 +104,7 @@ namespace Nz class GearConstraint2D; using GearConstraint2DHandle = ObjectHandle; - using GearConstraint2DRef = ObjectRef; - + class NAZARA_PHYSICS2D_API GearConstraint2D : public Constraint2D { public: @@ -117,8 +116,6 @@ namespace Nz void SetPhase(float phase); void SetRatio(float ratio); - - template static GearConstraint2DRef New(Args&&... args); }; class MotorConstraint2D; diff --git a/include/Nazara/Renderer/RenderPipeline.hpp b/include/Nazara/Renderer/RenderPipeline.hpp index fa73b60e4..a6485cd85 100644 --- a/include/Nazara/Renderer/RenderPipeline.hpp +++ b/include/Nazara/Renderer/RenderPipeline.hpp @@ -18,7 +18,7 @@ namespace Nz struct VertexBufferData { std::size_t binding; - VertexDeclarationConstRef declaration; + std::shared_ptr declaration; }; std::shared_ptr pipelineLayout; diff --git a/include/Nazara/Renderer/RenderStates.hpp b/include/Nazara/Renderer/RenderStates.hpp index dfa9a8b5c..978ab9777 100644 --- a/include/Nazara/Renderer/RenderStates.hpp +++ b/include/Nazara/Renderer/RenderStates.hpp @@ -19,10 +19,10 @@ namespace Nz struct RenderStates { - FaceFilling faceFilling = FaceFilling_Fill; - FaceSide cullingSide = FaceSide_Back; - RendererComparison depthCompare = RendererComparison_Less; - PrimitiveMode primitiveMode = PrimitiveMode_TriangleList; + FaceFilling faceFilling = FaceFilling::Fill; + FaceSide cullingSide = FaceSide::Back; + RendererComparison depthCompare = RendererComparison::Less; + PrimitiveMode primitiveMode = PrimitiveMode::TriangleList; struct { @@ -36,10 +36,10 @@ namespace Nz struct { - RendererComparison compare = RendererComparison_Always; - StencilOperation depthFail = StencilOperation_Keep; - StencilOperation fail = StencilOperation_Keep; - StencilOperation pass = StencilOperation_Keep; + RendererComparison compare = RendererComparison::Always; + StencilOperation depthFail = StencilOperation::Keep; + StencilOperation fail = StencilOperation::Keep; + StencilOperation pass = StencilOperation::Keep; UInt32 compareMask = 0xFFFFFFFF; UInt32 reference = 0; UInt32 writeMask = 0xFFFFFFFF; diff --git a/include/Nazara/Renderer/RenderWindowParameters.hpp b/include/Nazara/Renderer/RenderWindowParameters.hpp index 9c7fcb576..952333f8f 100644 --- a/include/Nazara/Renderer/RenderWindowParameters.hpp +++ b/include/Nazara/Renderer/RenderWindowParameters.hpp @@ -15,7 +15,7 @@ namespace Nz { struct RenderWindowParameters { - std::vector depthFormats = {Nz::PixelFormat_Depth32, Nz::PixelFormat_Depth24}; //< By order of preference + std::vector depthFormats = {Nz::PixelFormat::Depth32, Nz::PixelFormat::Depth24}; //< By order of preference bool verticalSync = false; }; } diff --git a/include/Nazara/Renderer/TextureSampler.hpp b/include/Nazara/Renderer/TextureSampler.hpp index 19215dc0b..62195d6c3 100644 --- a/include/Nazara/Renderer/TextureSampler.hpp +++ b/include/Nazara/Renderer/TextureSampler.hpp @@ -17,12 +17,12 @@ namespace Nz struct TextureSamplerInfo { float anisotropyLevel = 0.f; - SamplerFilter magFilter = SamplerFilter_Linear; - SamplerFilter minFilter = SamplerFilter_Linear; - SamplerMipmapMode mipmapMode = SamplerMipmapMode_Linear; - SamplerWrap wrapModeU = SamplerWrap_Clamp; - SamplerWrap wrapModeV = SamplerWrap_Clamp; - SamplerWrap wrapModeW = SamplerWrap_Clamp; + SamplerFilter magFilter = SamplerFilter::Linear; + SamplerFilter minFilter = SamplerFilter::Linear; + SamplerMipmapMode mipmapMode = SamplerMipmapMode::Linear; + SamplerWrap wrapModeU = SamplerWrap::Clamp; + SamplerWrap wrapModeV = SamplerWrap::Clamp; + SamplerWrap wrapModeW = SamplerWrap::Clamp; inline bool operator==(const TextureSamplerInfo& samplerInfo) const; inline bool operator!=(const TextureSamplerInfo& samplerInfo) const; diff --git a/include/Nazara/Utility/Image.hpp b/include/Nazara/Utility/Image.hpp index 20b949f58..cfde858ae 100644 --- a/include/Nazara/Utility/Image.hpp +++ b/include/Nazara/Utility/Image.hpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -49,8 +50,9 @@ namespace Nz Image(); Image(ImageType type, PixelFormat format, unsigned int width, unsigned int height, unsigned int depth = 1, UInt8 levelCount = 1); - Image(const Image& image); Image(SharedImage* sharedImage); + Image(const Image& image); + inline Image(Image&& image) noexcept; ~Image(); bool Convert(PixelFormat format); @@ -104,6 +106,7 @@ namespace Nz bool Update(const UInt8* pixels, const Rectui& rect, unsigned int z = 0, unsigned int srcWidth = 0, unsigned int srcHeight = 0, UInt8 level = 0) override; Image& operator=(const Image& image); + inline Image& operator=(Image&& image) noexcept; static void Copy(UInt8* destination, const UInt8* source, PixelFormat format, unsigned int width, unsigned int height, unsigned int depth = 1, unsigned int dstWidth = 0, unsigned int dstHeight = 0, unsigned int srcWidth = 0, unsigned int srcHeight = 0); static UInt8 GetMaxLevel(unsigned int width, unsigned int height, unsigned int depth = 1); diff --git a/include/Nazara/Utility/Image.inl b/include/Nazara/Utility/Image.inl index e94a81f3d..058e2180f 100644 --- a/include/Nazara/Utility/Image.inl +++ b/include/Nazara/Utility/Image.inl @@ -8,6 +8,17 @@ namespace Nz { + inline Image::Image(Image&& image) noexcept : + m_sharedImage(std::exchange(image.m_sharedImage, &emptyImage)) + { + } + + inline Image& Image::operator=(Image&& image) noexcept + { + std::swap(m_sharedImage, image.m_sharedImage); + + return *this; + } } #include diff --git a/src/Nazara/Renderer/RenderBuffer.cpp b/src/Nazara/Renderer/RenderBuffer.cpp index 96f4bf05d..89f80fd0b 100644 --- a/src/Nazara/Renderer/RenderBuffer.cpp +++ b/src/Nazara/Renderer/RenderBuffer.cpp @@ -44,14 +44,14 @@ namespace Nz DataStorage RenderBuffer::GetStorage() const { - return DataStorage::DataStorage_Hardware; + return DataStorage::Hardware; } void* RenderBuffer::Map(BufferAccess access, UInt64 offset, UInt64 size) { if (void* ptr = m_softwareBuffer.Map(access, offset, size)) { - if (access != BufferAccess_ReadOnly) + if (access != BufferAccess::ReadOnly) { for (auto& bufferPair : m_hardwareBuffers) bufferPair.second.synchronized = false; diff --git a/src/Nazara/Renderer/Renderer.cpp b/src/Nazara/Renderer/Renderer.cpp index b1d11de7c..8fc49bad8 100644 --- a/src/Nazara/Renderer/Renderer.cpp +++ b/src/Nazara/Renderer/Renderer.cpp @@ -123,13 +123,13 @@ namespace Nz NazaraDebug("Using " + m_rendererImpl->QueryAPIString() + " as renderer"); - Buffer::SetBufferFactory(DataStorage_Hardware, [](Buffer* parent, BufferType type) -> AbstractBuffer* { return new RenderBuffer(parent, type); }); + Buffer::SetBufferFactory(DataStorage::Hardware, [](Buffer* parent, BufferType type) -> std::unique_ptr { return std::make_unique(parent, type); }); } Renderer::~Renderer() { // Uninitialize module here - Buffer::SetBufferFactory(DataStorage_Hardware, nullptr); + Buffer::SetBufferFactory(DataStorage::Hardware, nullptr); m_rendererImpl.reset(); } diff --git a/tests/Engine/Audio/SoundBuffer.cpp b/tests/Engine/Audio/SoundBuffer.cpp index a77b603d1..7fd75bc51 100644 --- a/tests/Engine/Audio/SoundBuffer.cpp +++ b/tests/Engine/Audio/SoundBuffer.cpp @@ -9,8 +9,8 @@ SCENARIO("SoundBuffer", "[AUDIO][SOUNDBUFFER]") { WHEN("We load our sound") { - Nz::std::shared_ptr soundBuffer = Nz::SoundBuffer::LoadFromFile(GetResourceDir() / "Engine/Audio/Cat.flac"); - REQUIRE(soundBuffer.IsValid()); + std::shared_ptr soundBuffer = Nz::SoundBuffer::LoadFromFile(GetResourceDir() / "Engine/Audio/Cat.flac"); + REQUIRE(soundBuffer); THEN("We can ask the informations of the file") { diff --git a/tests/SDK/NDK/Systems/PhysicsSystem2D.cpp b/tests/SDK/NDK/Systems/PhysicsSystem2D.cpp index 58a218caf..faf946801 100644 --- a/tests/SDK/NDK/Systems/PhysicsSystem2D.cpp +++ b/tests/SDK/NDK/Systems/PhysicsSystem2D.cpp @@ -158,7 +158,7 @@ Ndk::EntityHandle CreateBaseEntity(Ndk::World& world, const Nz::Vector2f& positi Ndk::EntityHandle entity = world.CreateEntity(); Ndk::NodeComponent& nodeComponent = entity->AddComponent(); nodeComponent.SetPosition(position); - Nz::BoxCollider2DRef collisionBox = Nz::BoxCollider2D::New(AABB); + std::shared_ptr collisionBox = std::make_shared(AABB); entity->AddComponent(collisionBox); return entity; }