From 77ba0fbe730ff6d9e7a20126df177054d183eed2 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Thu, 4 Apr 2013 01:31:05 -0700
Subject: [PATCH] Prepare for creating particles

This adds a vector of ParticleSystems to the EntityList, and modifies
corresponding code to handle it. It also loads the ParticleFX plugin so
particles can be created (although they aren't yet).
---
 apps/openmw/mwrender/animation.cpp    |  3 +++
 apps/openmw/mwrender/npcanimation.cpp |  6 +++---
 apps/openmw/mwrender/objects.cpp      | 13 ++++++++++++-
 components/nifogre/ogrenifloader.hpp  |  4 +++-
 libs/openengine/ogre/renderer.cpp     |  1 +
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index cc926e685..fd575f918 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -40,9 +40,12 @@ Animation::~Animation()
     if(mInsert)
     {
         Ogre::SceneManager *sceneMgr = mInsert->getCreator();
+        for(size_t i = 0;i < mEntityList.mParticles.size();i++)
+            sceneMgr->destroyParticleSystem(mEntityList.mParticles[i]);
         for(size_t i = 0;i < mEntityList.mEntities.size();i++)
             sceneMgr->destroyEntity(mEntityList.mEntities[i]);
     }
+    mEntityList.mParticles.clear();
     mEntityList.mEntities.clear();
     mEntityList.mSkelBase = NULL;
 }
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index b76a38c46..f1af6a7d3 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -363,11 +363,11 @@ void NpcAnimation::removeEntities(NifOgre::EntityList &entities)
     assert(&entities != &mEntityList);
 
     Ogre::SceneManager *sceneMgr = mInsert->getCreator();
+    for(size_t i = 0;i < entities.mParticles.size();i++)
+        sceneMgr->destroyParticleSystem(entities.mParticles[i]);
     for(size_t i = 0;i < entities.mEntities.size();i++)
-    {
-        entities.mEntities[i]->detachFromParent();
         sceneMgr->destroyEntity(entities.mEntities[i]);
-    }
+    entities.mParticles.clear();
     entities.mEntities.clear();
     entities.mSkelBase = NULL;
 }
diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index 50c021064..8c5d4cad3 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -7,6 +7,8 @@
 #include <OgreEntity.h>
 #include <OgreLight.h>
 #include <OgreSubEntity.h>
+#include <OgreParticleSystem.h>
+#include <OgreParticleEmitter.h>
 #include <OgreStaticGeometry.h>
 
 #include <components/nifogre/ogrenifloader.hpp>
@@ -156,7 +158,8 @@ void Objects::insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh, bool
         }
     }
 
-    if(!mIsStatic || !Settings::Manager::getBool("use static geometry", "Objects") || anyTransparency)
+    if(!mIsStatic || !Settings::Manager::getBool("use static geometry", "Objects") ||
+       anyTransparency || entities.mParticles.size() > 0)
     {
         for(size_t i = 0;i < entities.mEntities.size();i++)
         {
@@ -169,6 +172,14 @@ void Objects::insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh, bool
             ent->setRenderingDistance(small ? Settings::Manager::getInt("small object distance", "Viewing distance") : 0);
             ent->setVisibilityFlags(mIsStatic ? (small ? RV_StaticsSmall : RV_Statics) : RV_Misc);
         }
+        for(size_t i = 0;i < entities.mParticles.size();i++)
+        {
+            Ogre::ParticleSystem *part = entities.mParticles[i];
+            // TODO: Check the particle system's material for actual transparency
+            part->setRenderQueueGroup(RQG_Alpha);
+            part->setRenderingDistance(small ? Settings::Manager::getInt("small object distance", "Viewing distance") : 0);
+            part->setVisibilityFlags(mIsStatic ? (small ? RV_StaticsSmall : RV_Statics) : RV_Misc);
+        }
     }
     else
     {
diff --git a/components/nifogre/ogrenifloader.hpp b/components/nifogre/ogrenifloader.hpp
index 92b153468..e6672541b 100644
--- a/components/nifogre/ogrenifloader.hpp
+++ b/components/nifogre/ogrenifloader.hpp
@@ -40,8 +40,10 @@ namespace NifOgre
 typedef std::multimap<float,std::string> TextKeyMap;
 static const char sTextKeyExtraDataID[] = "TextKeyExtraData";
 struct EntityList {
-    std::vector<Ogre::Entity*> mEntities;
     Ogre::Entity *mSkelBase;
+    std::vector<Ogre::Entity*> mEntities;
+
+    std::vector<Ogre::ParticleSystem*> mParticles;
 
     EntityList() : mSkelBase(0)
     { }
diff --git a/libs/openengine/ogre/renderer.cpp b/libs/openengine/ogre/renderer.cpp
index 309ba8a06..05760ffa9 100644
--- a/libs/openengine/ogre/renderer.cpp
+++ b/libs/openengine/ogre/renderer.cpp
@@ -195,6 +195,7 @@ void OgreRenderer::configure(const std::string &logPath,
     Files::loadOgrePlugin(pluginDir, "RenderSystem_GL3Plus", *mRoot);
     Files::loadOgrePlugin(pluginDir, "RenderSystem_Direct3D9", *mRoot);
     Files::loadOgrePlugin(pluginDir, "Plugin_CgProgramManager", *mRoot);
+    Files::loadOgrePlugin(pluginDir, "Plugin_ParticleFX", *mRoot);
 
     RenderSystem* rs = mRoot->getRenderSystemByName(renderSystem);
     if (rs == 0)