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

Fix warnings 

Former-commit-id: 42f2d38f7bf5143d91da6a0fa7dc7d3b88ce56ea
This commit is contained in:
Lynix 2015-06-30 20:44:37 +02:00
parent d93229a9ac
commit 34e8271d24
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Math/Matrix4.inl
View File

@ -623,7 +623,7 @@ NzMatrix4<T>& NzMatrix4<T>::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),

2
src/Nazara/Graphics/DepthRenderQueue.cpp
View File

@ -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;

6
src/Nazara/Graphics/DepthRenderTechnique.cpp
View File

@ -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)