mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-25 14:41:34 +00:00
Code Issues Releases Wiki Activity

Clean up the debug hud now it's working.

Browse source
This commit is contained in:
AnyOldName3 2017-11-03 14:33:06 +00:00
parent 2bfd45fb40
commit d0587a3ad5
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/openmw/mwrender/shadow.cpp
View file

@ -51,7 +51,7 @@ namespace MWRender
"} \n"; "} \n";
MWShadow::MWShadow() : debugCamera(new osg::Camera), debugProgram(new osg::Program), testTex(new osg::Texture2D) MWShadow::MWShadow() : debugCamera(new osg::Camera), debugProgram(new osg::Program), debugTextureUnit(0)
{ {
debugCamera->setViewport(0, 0, 200, 200); debugCamera->setViewport(0, 0, 200, 200);
debugCamera->setRenderOrder(osg::Camera::POST_RENDER); debugCamera->setRenderOrder(osg::Camera::POST_RENDER);
@ -67,13 +67,9 @@ namespace MWRender
debugCamera->addChild(debugGeometry); debugCamera->addChild(debugGeometry);
osg::ref_ptr<osg::StateSet> stateSet = debugGeometry->getOrCreateStateSet(); osg::ref_ptr<osg::StateSet> stateSet = debugGeometry->getOrCreateStateSet();
stateSet->setAttributeAndModes(debugProgram, osg::StateAttribute::ON); stateSet->setAttributeAndModes(debugProgram, osg::StateAttribute::ON);
osg::ref_ptr<osg::Uniform> textureUniform = new osg::Uniform("texture", 0); osg::ref_ptr<osg::Uniform> textureUniform = new osg::Uniform("texture", debugTextureUnit);
//textureUniform->setType(osg::Uniform::SAMPLER_2D); //textureUniform->setType(osg::Uniform::SAMPLER_2D);
stateSet->addUniform(textureUniform.get()); stateSet->addUniform(textureUniform.get());
testTex->setDataVariance(osg::Object::DYNAMIC);
osg::ref_ptr<osg::Image> testImage = osgDB::readRefImageFile("resources/mygui/openmw.png");
testTex->setImage(testImage);
} }
class VDSMCameraCullCallback : public osg::NodeCallback class VDSMCameraCullCallback : public osg::NodeCallback
@ -560,10 +556,7 @@ namespace MWRender
{ {
osg::ref_ptr<osg::Texture2D> texture = sd->_texture; osg::ref_ptr<osg::Texture2D> texture = sd->_texture;
osg::ref_ptr<osg::StateSet> stateSet = debugGeometry->getOrCreateStateSet(); osg::ref_ptr<osg::StateSet> stateSet = debugGeometry->getOrCreateStateSet();
if (true) stateSet->setTextureAttributeAndModes(debugTextureUnit, texture, osg::StateAttribute::ON);
stateSet->setTextureAttributeAndModes(0, texture, osg::StateAttribute::ON);
else
stateSet->setTextureAttributeAndModes(0, testTex, osg::StateAttribute::ON);
unsigned int traversalMask = cv.getTraversalMask(); unsigned int traversalMask = cv.getTraversalMask();
cv.setTraversalMask(debugGeometry->getNodeMask()); cv.setTraversalMask(debugGeometry->getNodeMask());

4
apps/openmw/mwrender/shadow.hpp
View file

@ -12,13 +12,13 @@ namespace MWRender
virtual void cull(osgUtil::CullVisitor& cv); virtual void cull(osgUtil::CullVisitor& cv);
protected: protected:
const int debugTextureUnit;
osg::ref_ptr<osg::Camera> debugCamera; osg::ref_ptr<osg::Camera> debugCamera;
osg::ref_ptr<osg::Program> debugProgram; osg::ref_ptr<osg::Program> debugProgram;
osg::ref_ptr<osg::Node> debugGeometry; osg::ref_ptr<osg::Node> debugGeometry;
osg::ref_ptr<osg::Texture2D> testTex;
}; };
} }