mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 04:45:34 +00:00
Code Issues Releases Wiki Activity

Switch to better-performing data types for debug hud geometry

Browse source
This commit is contained in:
AnyOldName3 2018-11-21 22:38:50 +00:00
parent 632b0d8979
commit 061fa57335
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
components/sceneutil/mwshadowtechnique.cpp
View file

@ -942,7 +942,12 @@ void MWShadowTechnique::cull(osgUtil::CullVisitor& cv)
Frustum frustum(&cv, minZNear, maxZFar); Frustum frustum(&cv, minZNear, maxZFar);
if (_debugHud) if (_debugHud)
_debugHud->setFrustumVertices(new osg::Vec3dArray(8, &frustum.corners[0])); {
osg::ref_ptr<osg::Vec3Array> vertexArray = new osg::Vec3Array(8);
for (osg::Vec3d &vertex : frustum.corners)
vertexArray->push_back((osg::Vec3)vertex);
_debugHud->setFrustumVertices(vertexArray);
}
double reducedNear, reducedFar; double reducedNear, reducedFar;
if (cv.getComputeNearFarMode() != osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR) if (cv.getComputeNearFarMode() != osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR)
@ -2984,7 +2989,7 @@ SceneUtil::MWShadowTechnique::DebugHUD::DebugHUD(int numberOfShadowMapsPerLight)
mFrustumGeometry->getOrCreateStateSet()->setAttributeAndModes(frustumProgram, osg::StateAttribute::ON); mFrustumGeometry->getOrCreateStateSet()->setAttributeAndModes(frustumProgram, osg::StateAttribute::ON);
//mFrustumGeometry->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF); //mFrustumGeometry->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
osg::ref_ptr<osg::DrawElementsUByte> frustumDrawElements = new osg::DrawElementsUByte(osg::PrimitiveSet::LINE_STRIP); osg::ref_ptr<osg::DrawElementsUShort> frustumDrawElements = new osg::DrawElementsUShort(osg::PrimitiveSet::LINE_STRIP);
mFrustumGeometry->addPrimitiveSet(frustumDrawElements); mFrustumGeometry->addPrimitiveSet(frustumDrawElements);
frustumDrawElements->push_back(0); frustumDrawElements->push_back(0);
frustumDrawElements->push_back(1); frustumDrawElements->push_back(1);
@ -2997,7 +3002,7 @@ SceneUtil::MWShadowTechnique::DebugHUD::DebugHUD(int numberOfShadowMapsPerLight)
frustumDrawElements->push_back(7); frustumDrawElements->push_back(7);
frustumDrawElements->push_back(4); frustumDrawElements->push_back(4);
frustumDrawElements = new osg::DrawElementsUByte(osg::PrimitiveSet::LINES); frustumDrawElements = new osg::DrawElementsUShort(osg::PrimitiveSet::LINES);
mFrustumGeometry->addPrimitiveSet(frustumDrawElements); mFrustumGeometry->addPrimitiveSet(frustumDrawElements);
frustumDrawElements->push_back(1); frustumDrawElements->push_back(1);
frustumDrawElements->push_back(5); frustumDrawElements->push_back(5);
@ -3044,7 +3049,7 @@ void SceneUtil::MWShadowTechnique::DebugHUD::releaseGLObjects(osg::State* state)
mFrustumGeometry->releaseGLObjects(state); mFrustumGeometry->releaseGLObjects(state);
} }
void SceneUtil::MWShadowTechnique::DebugHUD::setFrustumVertices(osg::ref_ptr<osg::Vec3dArray> vertices) void SceneUtil::MWShadowTechnique::DebugHUD::setFrustumVertices(osg::ref_ptr<osg::Vec3Array> vertices)
{ {
mFrustumGeometry->setVertexArray(vertices); mFrustumGeometry->setVertexArray(vertices);
} }

2
components/sceneutil/mwshadowtechnique.hpp
View file

@ -253,7 +253,7 @@ namespace SceneUtil {
virtual void releaseGLObjects(osg::State* state = 0) const; virtual void releaseGLObjects(osg::State* state = 0) const;
virtual void setFrustumVertices(osg::ref_ptr<osg::Vec3dArray> vertices); virtual void setFrustumVertices(osg::ref_ptr<osg::Vec3Array> vertices);
protected: protected:
virtual void addAnotherShadowMap(); virtual void addAnotherShadowMap();