AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-11 13:25:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fully implement NiStencilProperty (Feature #1057)

Browse Source
This commit is contained in:
scrawl 2015-03-24 22:52:20 +01:00
parent baa152328a
commit 9141a8d801
3 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/nifosgtest/test.cpp
View File

@ -102,6 +102,9 @@ int main(int argc, char** argv)
Nif::NIFFilePtr nif(new Nif::NIFFile(resourceMgr.get(argv[1]), std::string(argv[1]))); Nif::NIFFilePtr nif(new Nif::NIFFile(resourceMgr.get(argv[1]), std::string(argv[1])));
// For NiStencilProperty
osg::DisplaySettings::instance()->setMinimumNumStencilBits(8);
osgViewer::Viewer viewer; osgViewer::Viewer viewer;
osg::ref_ptr<osg::Group> root(new osg::Group()); osg::ref_ptr<osg::Group> root(new osg::Group());

2
components/nif/property.hpp
View File

@ -221,7 +221,7 @@ struct S_StencilProperty
4 TEST_GREATER 4 TEST_GREATER
5 TEST_NOT_EQUAL 5 TEST_NOT_EQUAL
6 TEST_GREATER_EQUAL 6 TEST_GREATER_EQUAL
7 TEST_ALWAYS 7 TEST_NEVER (though nifskope comment says TEST_ALWAYS, but ingame it is TEST_NEVER)
*/ */
int compareFunc; int compareFunc;
unsigned stencilRef; unsigned stencilRef;

53
components/nifosg/nifloader.cpp
View File

@ -116,6 +116,40 @@ namespace
} }
} }
osg::Stencil::Function getStencilFunction(int func)
{
switch (func)
{
case 0: return osg::Stencil::NEVER;
case 1: return osg::Stencil::LESS;
case 2: return osg::Stencil::EQUAL;
case 3: return osg::Stencil::LEQUAL;
case 4: return osg::Stencil::GREATER;
case 5: return osg::Stencil::NOTEQUAL;
case 6: return osg::Stencil::GEQUAL;
case 7: return osg::Stencil::NEVER; // NifSkope says this is GL_ALWAYS, but in MW it's GL_NEVER
default:
std::cerr << "Unexpected stencil function: " << func << std::endl;
return osg::Stencil::NEVER;
}
}
osg::Stencil::Operation getStencilOperation(int op)
{
switch (op)
{
case 0: return osg::Stencil::KEEP;
case 1: return osg::Stencil::ZERO;
case 2: return osg::Stencil::REPLACE;
case 3: return osg::Stencil::INCR;
case 4: return osg::Stencil::DECR;
case 5: return osg::Stencil::INVERT;
default:
std::cerr << "Unexpected stencil operation: " << op << std::endl;
return osg::Stencil::KEEP;
}
}
// Collect all properties affecting the given node that should be applied to an osg::Material. // Collect all properties affecting the given node that should be applied to an osg::Material.
void collectMaterialProperties(const Nif::Node* nifNode, std::vector<const Nif::Property*>& out) void collectMaterialProperties(const Nif::Node* nifNode, std::vector<const Nif::Property*>& out)
{ {
@ -1095,16 +1129,17 @@ namespace NifOsg
stateset->setMode(GL_CULL_FACE, stencilprop->data.drawMode == 3 ? osg::StateAttribute::OFF stateset->setMode(GL_CULL_FACE, stencilprop->data.drawMode == 3 ? osg::StateAttribute::OFF
: osg::StateAttribute::ON); : osg::StateAttribute::ON);
// TODO: if (stencilprop->data.enabled != 0)
// Stencil settings not enabled yet, not sure if the original engine is actually using them, {
// since they might conflict with Morrowind's stencil shadows. osg::Stencil* stencil = new osg::Stencil;
/* stencil->setFunction(getStencilFunction(stencilprop->data.compareFunc), stencilprop->data.stencilRef, stencilprop->data.stencilMask);
osg::Stencil* stencil = new osg::Stencil; stencil->setStencilFailOperation(getStencilOperation(stencilprop->data.failAction));
stencil->setFunction(func, stencilprop->data.stencilRef, stencilprop->data.stencilMask); stencil->setStencilPassAndDepthFailOperation(getStencilOperation(stencilprop->data.zFailAction));
stencil->setStencilPassAndDepthPassOperation(getStencilOperation(stencilprop->data.zPassAction));
stateset->setMode(GL_STENCIL_TEST, stencilprop->data.enabled != 0 ? osg::StateAttribute::ON stateset->setAttributeAndModes(stencil, osg::StateAttribute::ON);
: osg::StateAttribute::OFF); }
*/ break;
} }
case Nif::RC_NiWireframeProperty: case Nif::RC_NiWireframeProperty:
{ {