mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-08 09:37:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'character_preview_alpha_fix' into 'master'

Browse Source 
Fix transparent objects being invisible in character doll

See merge request OpenMW/openmw!1140
This commit is contained in:
AnyOldName3 2021-08-15 00:01:23 +00:00
commit 7400050b38
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apps/openmw/mwrender/characterpreview.cpp
View File

@ -131,6 +131,29 @@ namespace MWRender
newStateSet->setTextureMode(7, GL_TEXTURE_2D, osg::StateAttribute::OFF);
newStateSet->addUniform(mNoAlphaUniform);
}
if (SceneUtil::getReverseZ() && stateset->getAttribute(osg::StateAttribute::DEPTH))
{
if (!newStateSet)
{
newStateSet = new osg::StateSet(*stateset, osg::CopyOp::SHALLOW_COPY);
node.setStateSet(newStateSet);
}
// Setup standard depth ranges
osg::Depth* depth = static_cast<osg::Depth*>(stateset->getAttribute(osg::StateAttribute::DEPTH));
osg::ref_ptr<osg::Depth> newDepth = new osg::Depth(*depth);
switch (newDepth->getFunction())
{
case osg::Depth::LESS:
newDepth->setFunction(osg::Depth::GREATER);
case osg::Depth::LEQUAL:
newDepth->setFunction(osg::Depth::GEQUAL);
case osg::Depth::GREATER:
newDepth->setFunction(osg::Depth::LESS);
case osg::Depth::GEQUAL:
newDepth->setFunction(osg::Depth::LEQUAL);
}
newStateSet->setAttribute(newDepth, osg::StateAttribute::ON);
}
}
traverse(node);
}
@ -189,8 +212,7 @@ namespace MWRender
stateset->setAttribute(defaultMat);
stateset->addUniform(new osg::Uniform("projectionMatrix", static_cast<osg::Matrixf>(mCamera->getProjectionMatrix())));
osg::ref_ptr<osg::Depth> depth = new osg::Depth;
stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
stateset->setAttributeAndModes(new osg::Depth, osg::StateAttribute::ON);
SceneUtil::ShadowManager::disableShadowsForStateSet(stateset);