Merge branch 'near-far-wherever-you-are' into 'master'

psi29a · psi29a · commit 7281f3e3f6a8 · 2025-12-18T10:43:53.000Z
Ensure near plane doesn't go past far plane when there are no shadow receivers

See merge request OpenMW/openmw!5047
diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
@@ -645,6 +645,7 @@ MWShadowTechnique::Frustum::Frustum(osgUtil::CullVisitor* cv, double minZNear, d
     {
         osg::Matrix::value_type zNear = osg::maximum<osg::Matrix::value_type>(cv->getCalculatedNearPlane(),minZNear);
         osg::Matrix::value_type zFar = osg::minimum<osg::Matrix::value_type>(cv->getCalculatedFarPlane(),maxZFar);
+        zNear = std::min(zNear, zFar);
 
         cv->clampProjectionMatrix(projectionMatrix, zNear, zFar);
 

Original file line number	Diff line number	Diff line change
`@@ -645,6 +645,7 @@ MWShadowTechnique::Frustum::Frustum(osgUtil::CullVisitor* cv, double minZNear, d`
`645`	`645`	`{`
`646`	`646`	`osg::Matrix::value_type zNear = osg::maximum<osg::Matrix::value_type>(cv->getCalculatedNearPlane(),minZNear);`
`647`	`647`	`osg::Matrix::value_type zFar = osg::minimum<osg::Matrix::value_type>(cv->getCalculatedFarPlane(),maxZFar);`
	`648`	`+ zNear = std::min(zNear, zFar);`
`648`	`649`
`649`	`650`	`cv->clampProjectionMatrix(projectionMatrix, zNear, zFar);`
`650`	`651`