nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor fix for hairparticlesystem

Browse Source
This commit is contained in:
turanszkij
2017-06-05 14:36:42 +02:00
parent 78ce6c8239
commit 0ed52383e3
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WickedEngine/DeferredRenderableComponent.cpp
+1 -1
View File
@@ -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);
}
WickedEngine/ForwardRenderableComponent.cpp
+1 -1
View File
@@ -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);
WickedEngine/TiledForwardRenderableComponent.cpp
+2 -2
View File
@@ -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
}
WickedEngine/wiVersion.cpp
+1 -1
View File
@@ -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()