From eddac5c0b6c8916ad3baa91a7dca07af1e555b65 Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 24 Jun 2015 00:18:38 +0200 Subject: [PATCH] Graphics/SkyboxBackground: Fixes Former-commit-id: ab45a2efa957e33015e4d8dd57ebc8a5d028798c --- include/Nazara/Graphics/SkyboxBackground.hpp | 5 ++--- src/Nazara/Graphics/SkyboxBackground.cpp | 10 ++++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/include/Nazara/Graphics/SkyboxBackground.hpp b/include/Nazara/Graphics/SkyboxBackground.hpp index 7148ce4b3..08a9984ee 100644 --- a/include/Nazara/Graphics/SkyboxBackground.hpp +++ b/include/Nazara/Graphics/SkyboxBackground.hpp @@ -22,6 +22,8 @@ using NzSkyboxBackgroundRef = NzObjectRef; class NAZARA_GRAPHICS_API NzSkyboxBackground : public NzAbstractBackground { + friend class NzGraphics; + public: NzSkyboxBackground(NzTextureRef cubemapTexture = NzTextureRef()); ~NzSkyboxBackground() = default; @@ -44,9 +46,6 @@ class NAZARA_GRAPHICS_API NzSkyboxBackground : public NzAbstractBackground NzTextureRef m_texture; NzTextureSampler m_sampler; - NzIndexBufferRef m_indexBuffer; - NzShaderRef m_shader; - NzVertexBufferRef m_vertexBuffer; }; #include diff --git a/src/Nazara/Graphics/SkyboxBackground.cpp b/src/Nazara/Graphics/SkyboxBackground.cpp index c0346c679..a1b9d3607 100644 --- a/src/Nazara/Graphics/SkyboxBackground.cpp +++ b/src/Nazara/Graphics/SkyboxBackground.cpp @@ -22,10 +22,7 @@ namespace NzSkyboxBackground::NzSkyboxBackground(NzTextureRef cubemapTexture) { - m_indexBuffer = s_indexBuffer; m_sampler.SetWrapMode(nzSamplerWrap_Clamp); // Nécessaire pour ne pas voir les côtés - m_shader = s_shader; - m_vertexBuffer = s_vertexBuffer; SetTexture(std::move(cubemapTexture)); } @@ -35,14 +32,14 @@ void NzSkyboxBackground::Draw(const NzAbstractViewer* viewer) const NzMatrix4f skyboxMatrix(viewer->GetViewMatrix()); skyboxMatrix.SetTranslation(NzVector3f::Zero()); - NzRenderer::SetIndexBuffer(m_indexBuffer); + NzRenderer::SetIndexBuffer(s_indexBuffer); NzRenderer::SetMatrix(nzMatrixType_View, skyboxMatrix); NzRenderer::SetMatrix(nzMatrixType_World, NzMatrix4f::Scale(NzVector3f(viewer->GetZNear()))); NzRenderer::SetRenderStates(s_renderStates); - NzRenderer::SetShader(m_shader); + NzRenderer::SetShader(s_shader); NzRenderer::SetTexture(0, m_texture); NzRenderer::SetTextureSampler(0, m_sampler); - NzRenderer::SetVertexBuffer(m_vertexBuffer); + NzRenderer::SetVertexBuffer(s_vertexBuffer); NzRenderer::DrawIndexedPrimitives(nzPrimitiveMode_TriangleList, 0, 36); @@ -124,6 +121,7 @@ bool NzSkyboxBackground::Initialize() // Shader NzShaderRef shader = NzShader::New(); + shader->Create(); shader->AttachStageFromSource(nzShaderStage_Fragment, fragmentShaderSource); shader->AttachStageFromSource(nzShaderStage_Vertex, vertexShaderSource); shader->Link();