From 613b3b8627ec60266104174fca738d6cc059357a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Sat, 5 Jun 2021 19:08:38 +0200 Subject: [PATCH] DeferredShading: Update skybox --- examples/DeferredShading/main.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/examples/DeferredShading/main.cpp b/examples/DeferredShading/main.cpp index a791715f5..b14f6b103 100644 --- a/examples/DeferredShading/main.cpp +++ b/examples/DeferredShading/main.cpp @@ -158,10 +158,20 @@ int main() std::shared_ptr skyboxPipeline = device->InstantiateRenderPipeline(std::move(skyboxPipelineInfo)); - Nz::TextureParams skyboxTexParams; - skyboxTexParams.renderDevice = device; + // Skybox + std::shared_ptr skyboxTexture; + { + Nz::Image skyboxImage(Nz::ImageType::Cubemap, Nz::PixelFormat::RGBA8, 2048, 2048); + skyboxImage.LoadFaceFromFile(Nz::CubemapFace::PositiveX, resourceDir / "purple_nebula_skybox/purple_nebula_skybox_right1.png"); + skyboxImage.LoadFaceFromFile(Nz::CubemapFace::PositiveY, resourceDir / "purple_nebula_skybox/purple_nebula_skybox_top3.png"); + skyboxImage.LoadFaceFromFile(Nz::CubemapFace::PositiveZ, resourceDir / "purple_nebula_skybox/purple_nebula_skybox_front5.png"); + skyboxImage.LoadFaceFromFile(Nz::CubemapFace::NegativeX, resourceDir / "purple_nebula_skybox/purple_nebula_skybox_left2.png"); + skyboxImage.LoadFaceFromFile(Nz::CubemapFace::NegativeY, resourceDir / "purple_nebula_skybox/purple_nebula_skybox_bottom4.png"); + skyboxImage.LoadFaceFromFile(Nz::CubemapFace::NegativeZ, resourceDir / "purple_nebula_skybox/purple_nebula_skybox_back6.png"); + + skyboxTexture = Nz::Texture::CreateFromImage(skyboxImage, texParams); + } - std::shared_ptr skyboxTexture = Nz::Texture::LoadCubemapFromFile(resourceDir / "skybox-space.png", skyboxTexParams); // Cone mesh std::shared_ptr coneMesh = std::make_shared(); @@ -1120,8 +1130,6 @@ int main() } builder.CopyBuffer(lightDataAllocation, lightUbo.get()); - - lightUpdate = false; } spaceshipMat->UpdateBuffers(uploadPool, builder);