Merge branch 'first_person_mesh_distortion' into 'master'

Fix distortion breaking in first person meshes See merge request OpenMW/openmw!4231
OpenMW · Jul 6, 2024 · e8c4226 · e8c4226
2 parents 6bb10ed + 4d7e9ba
commit e8c4226
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/apps/openmw/mwrender/distortion.cpp b/apps/openmw/mwrender/distortion.cpp
@@ -2,6 +2,8 @@
 
 #include <osg/FrameBufferObject>
 
+#include "postprocessor.hpp"
+
 namespace MWRender
 {
     void DistortionCallback::drawImplementation(
@@ -10,6 +12,11 @@ namespace MWRender
         osg::State* state = renderInfo.getState();
         size_t frameId = state->getFrameStamp()->getFrameNumber() % 2;
 
+        PostProcessor* postProcessor = dynamic_cast<PostProcessor*>(renderInfo.getCurrentCamera()->getUserData());
+
+        if (!postProcessor || bin->getStage()->getFrameBufferObject() != postProcessor->getPrimaryFbo(frameId))
+            return;
+
         mFBO[frameId]->apply(*state);
 
         const osg::Texture* tex

diff --git a/components/sceneutil/extradata.cpp b/components/sceneutil/extradata.cpp
@@ -37,7 +37,8 @@ namespace SceneUtil
 
         osg::StateSet* stateset = node.getOrCreateStateSet();
 
-        stateset->setRenderBinDetails(14, "Distortion", osg::StateSet::OVERRIDE_RENDERBIN_DETAILS);
+        stateset->setNestRenderBins(false);
+        stateset->setRenderBinDetails(14, "Distortion", osg::StateSet::OVERRIDE_PROTECTED_RENDERBIN_DETAILS);
         stateset->addUniform(new osg::Uniform("distortionStrength", distortionStrength));
 
         stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);