From 0ed52383e3bf40ebbf97053a830edbfdb8bcde22 Mon Sep 17 00:00:00 2001 From: turanszkij Date: Mon, 5 Jun 2017 14:36:42 +0200 Subject: [PATCH] minor fix for hairparticlesystem --- WickedEngine/DeferredRenderableComponent.cpp | 2 +- WickedEngine/ForwardRenderableComponent.cpp | 2 +- WickedEngine/TiledForwardRenderableComponent.cpp | 4 ++-- WickedEngine/wiVersion.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/WickedEngine/DeferredRenderableComponent.cpp b/WickedEngine/DeferredRenderableComponent.cpp index 83dea6b3b..4432db44c 100644 --- a/WickedEngine/DeferredRenderableComponent.cpp +++ b/WickedEngine/DeferredRenderableComponent.cpp @@ -131,7 +131,7 @@ void DeferredRenderableComponent::RenderScene(GRAPHICSTHREAD threadID) rtGBuffer.Activate(threadID, 0, 0, 0, 0); { - wiRenderer::DrawWorld(wiRenderer::getCamera(), getTessellationEnabled(), threadID, SHADERTYPE_DEFERRED, rtReflection.GetTexture(), true, true); + wiRenderer::DrawWorld(wiRenderer::getCamera(), getTessellationEnabled(), threadID, SHADERTYPE_DEFERRED, rtReflection.GetTexture(), getHairParticlesEnabled(), true); } diff --git a/WickedEngine/ForwardRenderableComponent.cpp b/WickedEngine/ForwardRenderableComponent.cpp index 83561eb0b..14f4da1a9 100644 --- a/WickedEngine/ForwardRenderableComponent.cpp +++ b/WickedEngine/ForwardRenderableComponent.cpp @@ -104,7 +104,7 @@ void ForwardRenderableComponent::RenderScene(GRAPHICSTHREAD threadID) rtMain.Activate(threadID, 0, 0, 0, 0); { - wiRenderer::DrawWorld(wiRenderer::getCamera(), getTessellationEnabled(), threadID, SHADERTYPE_FORWARD, rtReflection.GetTexture(), true, true); + wiRenderer::DrawWorld(wiRenderer::getCamera(), getTessellationEnabled(), threadID, SHADERTYPE_FORWARD, rtReflection.GetTexture(), getHairParticlesEnabled(), true); wiRenderer::DrawSky(threadID); } rtMain.Deactivate(threadID); diff --git a/WickedEngine/TiledForwardRenderableComponent.cpp b/WickedEngine/TiledForwardRenderableComponent.cpp index dd626bf9e..f946f2cd8 100644 --- a/WickedEngine/TiledForwardRenderableComponent.cpp +++ b/WickedEngine/TiledForwardRenderableComponent.cpp @@ -30,7 +30,7 @@ void TiledForwardRenderableComponent::RenderScene(GRAPHICSTHREAD threadID) { wiRenderer::SetAlphaRef(0.25f, threadID); } - wiRenderer::DrawWorld(wiRenderer::getCamera(), getTessellationEnabled(), threadID, SHADERTYPE_DEPTHONLY, nullptr, true, true); + wiRenderer::DrawWorld(wiRenderer::getCamera(), getTessellationEnabled(), threadID, SHADERTYPE_DEPTHONLY, nullptr, getHairParticlesEnabled(), true); } wiProfiler::GetInstance().EndRange(threadID); @@ -68,7 +68,7 @@ void TiledForwardRenderableComponent::RenderTransparentScene(wiRenderTarget& ref wiProfiler::GetInstance().BeginRange("Transparent Scene", wiProfiler::DOMAIN_GPU, threadID); wiRenderer::DrawWorldTransparent(wiRenderer::getCamera(), SHADERTYPE_TILEDFORWARD, refractionRT.GetTexture(), rtReflection.GetTexture() - , rtWaterRipple.GetTexture(), threadID, getHairParticleAlphaCompositionEnabled(), true); + , rtWaterRipple.GetTexture(), threadID, getHairParticlesEnabled() && getHairParticleAlphaCompositionEnabled(), true); wiProfiler::GetInstance().EndRange(); // Transparent Scene } diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index a82680766..d2326f706 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -9,7 +9,7 @@ namespace wiVersion // minor features, major updates const int minor = 11; // minor bug fixes, alterations, refactors, updates - const int revision = 70; + const int revision = 71; long GetVersion()