Changeset 1563 for code/trunk/src/orxonox/tools

Timestamp:

Jun 7, 2008, 11:40:50 PM (16 years ago)

Author:

landauf

Message:

• added configurable detaillevel for particle effects to [GraphicsEngine]
• thrusters work properly with changing gamespeed

Location:

code/trunk/src/orxonox/tools

Files:

• ParticleInterface.cc (modified) (4 diffs)
• ParticleInterface.h (modified) (4 diffs)

code/trunk/src/orxonox/tools/ParticleInterface.cc

@@ -40 +40 @@
 #include "GraphicsEngine.h"
 #include "Orxonox.h"
+#include "core/CoreIncludes.h"
 #include "util/Convert.h"
 
@@ -47 +48 @@
   ParticleInterface* ParticleInterface::currentParticleInterface_s = 0;
 
-  ParticleInterface::ParticleInterface(const std::string& templateName)
+  ParticleInterface::ParticleInterface(const std::string& templateName, LODParticle::LOD detaillevel)
   {
+    RegisterRootObject(ParticleInterface);
+
     this->sceneNode_ = 0;
+    this->bEnabled_ = true;
+    this->detaillevel_ = (unsigned int)detaillevel;
     this->particleSystem_ = GraphicsEngine::getSingleton().getSceneManager()->createParticleSystem("particles" + getConvertedValue<unsigned int, std::string>(ParticleInterface::counter_s++), templateName);
     this->particleSystem_->setSpeedFactor(Orxonox::getSingleton()->getTimeFactor());
+
+    if (GraphicsEngine::getSingleton().getDetailLevelParticle() < (unsigned int)this->detaillevel_)
+    {
+      this->bVisible_ = false;
+      this->updateVisibility();
+    }
+    else
+    {
+      this->bVisible_ = true;
+    }
   }
 
@@ -134 +149 @@
   void ParticleInterface::setEnabled(bool enable)
   {
+    this->bEnabled_ = enable;
+    this->updateVisibility();
+  }
+
+  void ParticleInterface::detailLevelChanged(unsigned int newlevel)
+  {
+    if (newlevel >= (unsigned int)this->detaillevel_)
+      this->bVisible_ = true;
+    else
+      this->bVisible_ = false;
+
+    this->updateVisibility();
+  }
+
+  void ParticleInterface::updateVisibility()
+  {
     for (unsigned int i = 0; i < this->particleSystem_->getNumEmitters(); i++)
-      this->particleSystem_->getEmitter(i)->setEnabled(enable);
+      this->particleSystem_->getEmitter(i)->setEnabled(this->bEnabled_ && this->bVisible_);
   }
 
@@ -144 +175 @@
   float ParticleInterface::getSpeedFactor() const
   {
-    return this->particleSystem_->getSpeedFactor();
+    return (this->particleSystem_->getSpeedFactor() / Orxonox::getSingleton()->getTimeFactor());
   }
 

code/trunk/src/orxonox/tools/ParticleInterface.h

@@ -35 +35 @@
 #include <OgreParticleEmitter.h>
 
+#include "core/OrxonoxClass.h"
 #include "util/Math.h"
 
@@ -44 +45 @@
 namespace orxonox
 {
-  class _OrxonoxExport ParticleInterface
+  class _OrxonoxExport ParticleInterface : public OrxonoxClass
   {
     public:
-      ParticleInterface(const std::string& templateName);
+      ParticleInterface(const std::string& templateName, LODParticle::LOD detaillevel);
       ~ParticleInterface();
 
@@ -74 +75 @@
 
       void setEnabled(bool enable);
+      void detailLevelChanged(unsigned int newlevel);
 
       inline void storeThisAsCurrentParticleInterface()
@@ -81 +83 @@
 
     private:
+      void updateVisibility();
+
       static ParticleInterface* currentParticleInterface_s;
       static unsigned int counter_s;
       Ogre::SceneNode* sceneNode_;
       Ogre::ParticleSystem* particleSystem_;
+      bool bVisible_;
+      bool bEnabled_;
+      unsigned int detaillevel_;                            //!< Detail level of this particle effect (0: off, 1: low, 2: normal, 3: high)
   };
 }