From 34e8271d24ecf20527281ec66b317098d9239916 Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 30 Jun 2015 20:44:37 +0200 Subject: [PATCH] Fix warnings Former-commit-id: 42f2d38f7bf5143d91da6a0fa7dc7d3b88ce56ea --- include/Nazara/Math/Matrix4.inl | 2 +- src/Nazara/Graphics/DepthRenderQueue.cpp | 2 ++ src/Nazara/Graphics/DepthRenderTechnique.cpp | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/Nazara/Math/Matrix4.inl b/include/Nazara/Math/Matrix4.inl index 6816bbd72..ac140fe9a 100644 --- a/include/Nazara/Math/Matrix4.inl +++ b/include/Nazara/Math/Matrix4.inl @@ -623,7 +623,7 @@ NzMatrix4& NzMatrix4::MakePerspective(T angle, T ratio, T zNear, T zFar) angle = NzDegreeToRadian(angle/F(2.0)); #endif - T yScale = std::tan(M_PI_2 - angle); + T yScale = std::tan(T(M_PI_2) - angle); Set(yScale / ratio, F(0.0), F(0.0), F(0.0), F(0.0), yScale, F(0.0), F(0.0), diff --git a/src/Nazara/Graphics/DepthRenderQueue.cpp b/src/Nazara/Graphics/DepthRenderQueue.cpp index 613033015..e038c3bbd 100644 --- a/src/Nazara/Graphics/DepthRenderQueue.cpp +++ b/src/Nazara/Graphics/DepthRenderQueue.cpp @@ -297,6 +297,7 @@ void NzDepthRenderQueue::AddDrawable(const NzDrawable* drawable) void NzDepthRenderQueue::AddMesh(const NzMaterial* material, const NzMeshData& meshData, const NzBoxf& meshAABB, const NzMatrix4f& transformMatrix) { NazaraAssert(material, "Invalid material"); + NazaraUnused(meshAABB); if (!IsMaterialSuitable(material)) return; @@ -325,6 +326,7 @@ void NzDepthRenderQueue::AddMesh(const NzMaterial* material, const NzMeshData& m void NzDepthRenderQueue::AddSprites(const NzMaterial* material, const NzVertexStruct_XYZ_Color_UV* vertices, unsigned int spriteCount, const NzTexture* overlay) { NazaraAssert(material, "Invalid material"); + NazaraUnused(overlay); if (!IsMaterialSuitable(material)) return; diff --git a/src/Nazara/Graphics/DepthRenderTechnique.cpp b/src/Nazara/Graphics/DepthRenderTechnique.cpp index e76b0c981..6ec9dfaf3 100644 --- a/src/Nazara/Graphics/DepthRenderTechnique.cpp +++ b/src/Nazara/Graphics/DepthRenderTechnique.cpp @@ -153,6 +153,8 @@ void NzDepthRenderTechnique::Uninitialize() void NzDepthRenderTechnique::DrawBasicSprites(const NzSceneData& sceneData) const { + NazaraUnused(sceneData); + NzRenderer::SetIndexBuffer(&s_quadIndexBuffer); NzRenderer::SetMatrix(nzMatrixType_World, NzMatrix4f::Identity()); NzRenderer::SetVertexBuffer(&m_spriteBuffer); @@ -207,6 +209,8 @@ void NzDepthRenderTechnique::DrawBasicSprites(const NzSceneData& sceneData) cons void NzDepthRenderTechnique::DrawBillboards(const NzSceneData& sceneData) const { + NazaraUnused(sceneData); + if (NzRenderer::HasCapability(nzRendererCap_Instancing)) { NzVertexBuffer* instanceBuffer = NzRenderer::GetInstanceBuffer(); @@ -306,6 +310,8 @@ void NzDepthRenderTechnique::DrawBillboards(const NzSceneData& sceneData) const void NzDepthRenderTechnique::DrawOpaqueModels(const NzSceneData& sceneData) const { + NazaraUnused(sceneData); + s_material->Apply(); for (auto& meshIt : m_renderQueue.meshes)