mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-31 11:36:40 +00:00
Code Issues Releases Wiki Activity

Merge branch 'store_multiview' into 'master'

Browse source 
Avoid calling getMultiview from ~StereoFrustumManager

See merge request OpenMW/openmw!2091
This commit is contained in:
AnyOldName3 2022-07-04 22:38:09 +00:00
commit c81e94ebee
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
components/stereo/frustum.cpp
View file

@ -96,8 +96,9 @@ namespace Stereo
: mCamera(camera) : mCamera(camera)
, mShadowTechnique(nullptr) , mShadowTechnique(nullptr)
, mShadowFrustumCallback(nullptr) , mShadowFrustumCallback(nullptr)
, mMultiview(Stereo::getMultiview())
{ {
if (Stereo::getMultiview()) if (mMultiview)
{ {
#ifdef OSG_HAS_MULTIVIEW #ifdef OSG_HAS_MULTIVIEW
mMultiviewFrustumCallback = new MultiviewFrustumCallback(this); mMultiviewFrustumCallback = new MultiviewFrustumCallback(this);
@ -118,7 +119,7 @@ namespace Stereo
StereoFrustumManager::~StereoFrustumManager() StereoFrustumManager::~StereoFrustumManager()
{ {
if (Stereo::getMultiview()) if (mMultiview)
{ {
#ifdef OSG_HAS_MULTIVIEW #ifdef OSG_HAS_MULTIVIEW
mCamera->setInitialFrustumCallback(nullptr); mCamera->setInitialFrustumCallback(nullptr);

1
components/stereo/frustum.hpp
View file

@ -64,6 +64,7 @@ namespace Stereo
osg::ref_ptr<osg::Camera> mCamera; osg::ref_ptr<osg::Camera> mCamera;
osg::ref_ptr<SceneUtil::MWShadowTechnique> mShadowTechnique; osg::ref_ptr<SceneUtil::MWShadowTechnique> mShadowTechnique;
osg::ref_ptr<ShadowFrustumCallback> mShadowFrustumCallback; osg::ref_ptr<ShadowFrustumCallback> mShadowFrustumCallback;
bool mMultiview;
std::map< osgUtil::CullVisitor*, osgUtil::CullVisitor*> mSharedFrustums; std::map< osgUtil::CullVisitor*, osgUtil::CullVisitor*> mSharedFrustums;
osg::BoundingBoxd mBoundingBox; osg::BoundingBoxd mBoundingBox;