From b28a0a874893ec5bf40311e8b7759afa29172390 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Fri, 10 Mar 2023 13:25:37 +0100 Subject: [PATCH] OCD fix --- include/Nazara/Utility/Node.hpp | 6 +++--- .../Core/VirtualDirectoryFilesystemResolver.cpp | 4 ++-- src/Nazara/OpenGLRenderer/OpenGLTexture.cpp | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/Nazara/Utility/Node.hpp b/include/Nazara/Utility/Node.hpp index 72836d6db..5eb4b81c5 100644 --- a/include/Nazara/Utility/Node.hpp +++ b/include/Nazara/Utility/Node.hpp @@ -63,15 +63,15 @@ namespace Nz Node& Scale(float scale); Node& Scale(float scaleX, float scaleY, float scaleZ = 1.f); + void SetInheritPosition(bool inheritPosition); void SetInheritRotation(bool inheritRotation); void SetInheritScale(bool inheritScale); - void SetInheritPosition(bool inheritPosition); + void SetInitialPosition(const Vector3f& translation); + void SetInitialPosition(float translationX, float translationXY, float translationZ = 0.f); void SetInitialRotation(const Quaternionf& quat); void SetInitialScale(const Vector3f& scale); void SetInitialScale(float scale); void SetInitialScale(float scaleX, float scaleY, float scaleZ = 1.f); - void SetInitialPosition(const Vector3f& translation); - void SetInitialPosition(float translationX, float translationXY, float translationZ = 0.f); void SetParent(const Node* node = nullptr, bool keepDerived = false); void SetParent(const Node& node, bool keepDerived = false); void SetPosition(const Vector3f& translation, CoordSys coordSys = CoordSys::Local); diff --git a/src/Nazara/Core/VirtualDirectoryFilesystemResolver.cpp b/src/Nazara/Core/VirtualDirectoryFilesystemResolver.cpp index 382d73712..073f7bf60 100644 --- a/src/Nazara/Core/VirtualDirectoryFilesystemResolver.cpp +++ b/src/Nazara/Core/VirtualDirectoryFilesystemResolver.cpp @@ -17,12 +17,12 @@ namespace Nz std::filesystem::file_status status = physicalEntry.status(); VirtualDirectory::Entry entry; - if (std::filesystem::is_regular_file(status)) + if (physicalEntry.is_regular_file()) { if (!callback(filename, VirtualDirectory::FileEntry{ std::make_shared(physicalEntry.path(), m_fileOpenMode) })) return; } - else if (std::filesystem::is_directory(status)) + else if (physicalEntry.is_directory()) { VirtualDirectoryPtr virtualDir = std::make_shared(std::make_shared(physicalEntry.path()), parent); if (!callback(filename, VirtualDirectory::DirectoryEntry{ { std::move(virtualDir) } })) diff --git a/src/Nazara/OpenGLRenderer/OpenGLTexture.cpp b/src/Nazara/OpenGLRenderer/OpenGLTexture.cpp index 9db0190bf..737c9207c 100644 --- a/src/Nazara/OpenGLRenderer/OpenGLTexture.cpp +++ b/src/Nazara/OpenGLRenderer/OpenGLTexture.cpp @@ -26,28 +26,28 @@ namespace Nz switch (textureInfo.type) { case ImageType::E2D: - m_texture.TexStorage2D(GL::TextureTarget::Target2D, textureInfo.levelCount, format->internalFormat, textureInfo.width, textureInfo.height); + m_texture.TexStorage2D(GL::TextureTarget::Target2D, m_textureInfo.levelCount, format->internalFormat, textureInfo.width, textureInfo.height); break; case ImageType::E2D_Array: - m_texture.TexStorage3D(GL::TextureTarget::Target2D_Array, textureInfo.levelCount, format->internalFormat, textureInfo.width, textureInfo.height, textureInfo.layerCount); + m_texture.TexStorage3D(GL::TextureTarget::Target2D_Array, m_textureInfo.levelCount, format->internalFormat, textureInfo.width, textureInfo.height, textureInfo.layerCount); break; case ImageType::E3D: - m_texture.TexStorage3D(GL::TextureTarget::Target3D, textureInfo.levelCount, format->internalFormat, textureInfo.width, textureInfo.height, textureInfo.depth); + m_texture.TexStorage3D(GL::TextureTarget::Target3D, m_textureInfo.levelCount, format->internalFormat, textureInfo.width, textureInfo.height, textureInfo.depth); break; case ImageType::Cubemap: - m_texture.TexStorage2D(GL::TextureTarget::Cubemap, textureInfo.levelCount, format->internalFormat, textureInfo.width, textureInfo.height); + m_texture.TexStorage2D(GL::TextureTarget::Cubemap, m_textureInfo.levelCount, format->internalFormat, textureInfo.width, textureInfo.height); break; // OpenGL ES doesn't support 1D textures, use 2D textures with a height of 1 instead case ImageType::E1D: - m_texture.TexStorage2D(GL::TextureTarget::Target2D, textureInfo.levelCount, format->internalFormat, textureInfo.width, 1); + m_texture.TexStorage2D(GL::TextureTarget::Target2D, m_textureInfo.levelCount, format->internalFormat, textureInfo.width, 1); break; case ImageType::E1D_Array: - m_texture.TexStorage2D(GL::TextureTarget::Target2D, textureInfo.levelCount, format->internalFormat, textureInfo.width, textureInfo.layerCount); + m_texture.TexStorage2D(GL::TextureTarget::Target2D, m_textureInfo.levelCount, format->internalFormat, textureInfo.width, textureInfo.layerCount); break; }