From fd1ccd21ff587c96cbd5e1cc83a09cb66e871e5a Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 2 Nov 2015 23:49:22 +0100
Subject: [PATCH] Disable freezeOnCull for weather particles

---
 apps/openmw/mwrender/animation.cpp | 21 +-------------------
 apps/openmw/mwrender/sky.cpp       |  4 ++++
 components/sceneutil/visitor.cpp   | 32 ++++++++++++++++++++++++++++++
 components/sceneutil/visitor.hpp   | 26 ++++++++++++++----------
 4 files changed, 52 insertions(+), 31 deletions(-)
 create mode 100644 components/sceneutil/visitor.cpp

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index b2fa873102..06065c566d 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1111,25 +1111,6 @@ namespace MWRender
         attachTo->addChild(lightSource);
     }
 
-    class DisableFreezeOnCullVisitor : public osg::NodeVisitor
-    {
-    public:
-        DisableFreezeOnCullVisitor()
-            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-        {
-        }
-
-        virtual void apply(osg::Geode &geode)
-        {
-            for (unsigned int i=0; i<geode.getNumDrawables(); ++i)
-            {
-                osg::Drawable* drw = geode.getDrawable(i);
-                if (osgParticle::ParticleSystem* partsys = dynamic_cast<osgParticle::ParticleSystem*>(drw))
-                    partsys->setFreezeOnCull(false);
-            }
-        }
-    };
-
     void Animation::addEffect (const std::string& model, int effectId, bool loop, const std::string& bonename, std::string texture)
     {
         if (!mObjectRoot.get())
@@ -1163,7 +1144,7 @@ namespace MWRender
         node->accept(findMaxLengthVisitor);
 
         // FreezeOnCull doesn't work so well with effect particles, that tend to have moving emitters
-        DisableFreezeOnCullVisitor disableFreezeOnCullVisitor;
+        SceneUtil::DisableFreezeOnCullVisitor disableFreezeOnCullVisitor;
         node->accept(disableFreezeOnCullVisitor);
 
         params.mMaxControllerLength = findMaxLengthVisitor.getMaxLength();
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index a4f3573227..0f00b5a4c8 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -35,6 +35,7 @@
 #include <components/sceneutil/util.hpp>
 #include <components/sceneutil/statesetupdater.hpp>
 #include <components/sceneutil/controller.hpp>
+#include <components/sceneutil/visitor.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -1468,6 +1469,9 @@ void SkyManager::setWeather(const WeatherResult& weather)
             AlphaFader::SetupVisitor alphaFaderSetupVisitor;
             mParticleEffect->accept(alphaFaderSetupVisitor);
             mParticleFaders = alphaFaderSetupVisitor.getAlphaFaders();
+
+            SceneUtil::DisableFreezeOnCullVisitor disableFreezeOnCullVisitor;
+            mParticleEffect->accept(disableFreezeOnCullVisitor);
         }
     }
 
diff --git a/components/sceneutil/visitor.cpp b/components/sceneutil/visitor.cpp
new file mode 100644
index 0000000000..3738be08d1
--- /dev/null
+++ b/components/sceneutil/visitor.cpp
@@ -0,0 +1,32 @@
+#include "visitor.hpp"
+
+#include <osg/Geode>
+
+#include <osgParticle/ParticleSystem>
+
+#include <components/misc/stringops.hpp>
+
+namespace SceneUtil
+{
+
+    void FindByNameVisitor::apply(osg::Group &group)
+    {
+        if (Misc::StringUtils::ciEqual(group.getName(), mNameToFind))
+        {
+            mFoundNode = &group;
+            return;
+        }
+        traverse(group);
+    }
+
+    void DisableFreezeOnCullVisitor::apply(osg::Geode &geode)
+    {
+        for (unsigned int i=0; i<geode.getNumDrawables(); ++i)
+        {
+            osg::Drawable* drw = geode.getDrawable(i);
+            if (osgParticle::ParticleSystem* partsys = dynamic_cast<osgParticle::ParticleSystem*>(drw))
+                partsys->setFreezeOnCull(false);
+        }
+    }
+
+}
diff --git a/components/sceneutil/visitor.hpp b/components/sceneutil/visitor.hpp
index b9342b884e..6560849407 100644
--- a/components/sceneutil/visitor.hpp
+++ b/components/sceneutil/visitor.hpp
@@ -3,12 +3,12 @@
 
 #include <osg/NodeVisitor>
 
-#include <components/misc/stringops.hpp>
-
 // Commonly used scene graph visitors
 namespace SceneUtil
 {
 
+    // Find a Group by name, case-insensitive
+    // If not found, mFoundNode will be NULL
     class FindByNameVisitor : public osg::NodeVisitor
     {
     public:
@@ -19,20 +19,24 @@ namespace SceneUtil
         {
         }
 
-        virtual void apply(osg::Group& group)
-        {
-            if (Misc::StringUtils::ciEqual(group.getName(), mNameToFind))
-            {
-                mFoundNode = &group;
-                return;
-            }
-            traverse(group);
-        }
+        virtual void apply(osg::Group& group);
 
         std::string mNameToFind;
         osg::Group* mFoundNode;
     };
 
+    // Disable freezeOnCull for all visited particlesystems
+    class DisableFreezeOnCullVisitor : public osg::NodeVisitor
+    {
+    public:
+        DisableFreezeOnCullVisitor()
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+        {
+        }
+
+        virtual void apply(osg::Geode &geode);
+    };
+
 }
 
 #endif