From 9b8e45fc01405e15e1d7d61764f0af762f87aff7 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 28 Oct 2015 23:34:37 +0100
Subject: [PATCH] Fix ripple particles z-fighting with the water surface

---
 apps/openmw/mwrender/ripplesimulation.cpp | 6 ++++++
 apps/openmw/mwrender/water.cpp            | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/ripplesimulation.cpp b/apps/openmw/mwrender/ripplesimulation.cpp
index a7637f2e1..5caee8046 100644
--- a/apps/openmw/mwrender/ripplesimulation.cpp
+++ b/apps/openmw/mwrender/ripplesimulation.cpp
@@ -2,6 +2,7 @@
 
 #include <iomanip>
 
+#include <osg/PolygonOffset>
 #include <osg/Geode>
 #include <osg/Texture2D>
 #include <osg/Material>
@@ -55,6 +56,11 @@ namespace
         depth->setWriteMask(false);
         stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
 
+        osg::ref_ptr<osg::PolygonOffset> polygonOffset (new osg::PolygonOffset);
+        polygonOffset->setUnits(-1);
+        polygonOffset->setFactor(-1);
+        stateset->setAttributeAndModes(polygonOffset, osg::StateAttribute::ON);
+
         stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
 
         osg::ref_ptr<osg::Material> mat (new osg::Material);
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index f1ec66f4b..81f7c4e11 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -526,7 +526,6 @@ void Water::createShaderWaterStateSet(osg::Node* node, Reflection* reflection, R
         shaderStateset->setTextureAttributeAndModes(3, refraction->getRefractionDepthTexture(), osg::StateAttribute::ON);
         shaderStateset->addUniform(new osg::Uniform("refractionMap", 2));
         shaderStateset->addUniform(new osg::Uniform("refractionDepthMap", 3));
-        // FIXME: zfighting with ripples
         shaderStateset->setRenderBinDetails(MWRender::RenderBin_Default, "RenderBin");
     }
     else