Changeset 1563 for code/trunk

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

Files:

• core/CommandEvaluation.cc (modified) (1 diff)
• orxonox/GraphicsEngine.cc (modified) (3 diffs)
• orxonox/GraphicsEngine.h (modified) (2 diffs)
• orxonox/Orxonox.cc (modified) (4 diffs)
• orxonox/Orxonox.h (modified) (1 diff)
• orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• orxonox/hud/RadarObject.cc (modified) (2 diffs)
• orxonox/hud/RadarObject.h (modified) (1 diff)
• orxonox/objects/ParticleProjectile.cc (modified) (1 diff)
• orxonox/objects/ParticleSpawner.cc (modified) (2 diffs)
• orxonox/objects/ParticleSpawner.h (modified) (2 diffs)
• orxonox/objects/Projectile.cc (modified) (1 diff)
• orxonox/objects/SpaceShip.cc (modified) (2 diffs)
• orxonox/objects/SpaceShipAI.cc (modified) (3 diffs)
• orxonox/tools/ParticleInterface.cc (modified) (4 diffs)
• orxonox/tools/ParticleInterface.h (modified) (4 diffs)

code/trunk/src/core/CommandEvaluation.cc

@@ -78 +78 @@
         if (this->bEvaluatedParams_ && this->function_)
         {
-            COUT(4) << "CE_execute (evaluation): " << this->function_->getName() << " " << this->param_[0] << " " << this->param_[1] << " " << this->param_[2] << " " << this->param_[3] << " " << this->param_[4] << std::endl;
+            COUT(5) << "CE_execute (evaluation): " << this->function_->getName() << " " << this->param_[0] << " " << this->param_[1] << " " << this->param_[2] << " " << this->param_[3] << " " << this->param_[4] << std::endl;
             (*this->function_)(this->param_[0], this->param_[1], this->param_[2], this->param_[3], this->param_[4]);
             return true;

code/trunk/src/orxonox/GraphicsEngine.cc

@@ -53 +53 @@
 
 #include "console/InGameConsole.h"
+#include "tools/ParticleInterface.h"
 #include "Settings.h"
 
@@ -76 +77 @@
   {
     RegisterObject(GraphicsEngine);
+
+    this->detailLevelParticle_ = 0;
 
     this->setConfigValues();
@@ -91 +94 @@
     SetConfigValue(ogreLogLevelNormal_  , 4).description("Corresponding orxonox debug level for ogre Normal");
     SetConfigValue(ogreLogLevelCritical_, 2).description("Corresponding orxonox debug level for ogre Critical");
+
+    unsigned int old = this->detailLevelParticle_;
+    SetConfigValue(detailLevelParticle_, 2).description("O: off, 1: low, 2: normal, 3: high");
+
+    if (this->detailLevelParticle_ != old)
+      for (Iterator<ParticleInterface> it = ObjectList<ParticleInterface>::begin(); it; ++it)
+        it->detailLevelChanged(this->detailLevelParticle_);
   }
 

code/trunk/src/orxonox/GraphicsEngine.h

@@ -80 +80 @@
             void windowClosed      (Ogre::RenderWindow* rw);
 
+            inline unsigned int getDetailLevelParticle() const
+              { return this->detailLevelParticle_; }
+
             static GraphicsEngine& getSingleton();
             static GraphicsEngine* getSingletonPtr() { return &getSingleton(); }
@@ -94 +97 @@
                              bool, const std::string&);
 
-            Ogre::Root*         root_;              //!< Ogre's root
-            Ogre::SceneManager* scene_;             //!< scene manager of the game
-            Ogre::RenderWindow* renderWindow_;      //!< the current render window
-            std::string         resourceFile_;      //!< resources file name
-            std::string         ogreConfigFile_;    //!< ogre config file name
-            std::string         ogrePluginsFile_;   //!< ogre plugins file name
-            std::string         ogreLogFile_;       //!< log file name for Ogre log messages
-            int ogreLogLevelTrivial_;               //!< Corresponding Orxonx debug level for LL_TRIVIAL
-            int ogreLogLevelNormal_;                //!< Corresponding Orxonx debug level for LL_NORMAL
-            int ogreLogLevelCritical_;              //!< Corresponding Orxonx debug level for LL_CRITICAL
+            Ogre::Root*         root_;                  //!< Ogre's root
+            Ogre::SceneManager* scene_;                 //!< scene manager of the game
+            Ogre::RenderWindow* renderWindow_;          //!< the current render window
+            std::string         resourceFile_;          //!< resources file name
+            std::string         ogreConfigFile_;        //!< ogre config file name
+            std::string         ogrePluginsFile_;       //!< ogre plugins file name
+            std::string         ogreLogFile_;           //!< log file name for Ogre log messages
+            int                 ogreLogLevelTrivial_;   //!< Corresponding Orxonx debug level for LL_TRIVIAL
+            int                 ogreLogLevelNormal_;    //!< Corresponding Orxonx debug level for LL_NORMAL
+            int                 ogreLogLevelCritical_;  //!< Corresponding Orxonx debug level for LL_CRITICAL
+            unsigned int        detailLevelParticle_;   //!< Detail level of particle effects (0: off, 1: low, 2: normal, 3: high)
     };
 }

code/trunk/src/orxonox/Orxonox.cc

@@ -71 +71 @@
 #include "hud/HUD.h"
 #include "objects/Tickable.h"
+#include "tools/ParticleInterface.h"
 
 #include "GraphicsEngine.h"
@@ -162 +163 @@
 
   /**
+    @brief Changes the speed of Orxonox
+  */
+  void Orxonox::setTimeFactor(float factor)
+  {
+    float change = factor / Orxonox::getSingleton()->getTimeFactor();
+    Orxonox::getSingleton()->timefactor_ = factor;
+
+    for (Iterator<ParticleInterface> it = ObjectList<ParticleInterface>::begin(); it; ++it)
+        it->setSpeedFactor(it->getSpeedFactor() * change);
+  }
+
+  /**
    * initialization of Orxonox object
    * @param argc argument counter
@@ -379 +392 @@
     Level* startlevel = new Level("levels/sample.oxw");
     Loader::open(startlevel);
-    
+
     return true;
   }
@@ -421 +434 @@
     //Ogre::SceneManager* mSceneMgr = GraphicsEngine::getSingleton().getSceneManager();
     //Ogre::Viewport* mViewport = mSceneMgr->getCurrentViewport();
-    
+
     //Ogre::CompositorManager::getSingleton().addCompositor(mViewport, "Bloom");
     //Ogre::CompositorManager::getSingleton().addCompositor(mViewport, "MotionBlur");

code/trunk/src/orxonox/Orxonox.h

@@ -67 +67 @@
       static void destroySingleton();
 
-      static inline void slomo(float factor) { Orxonox::getSingleton()->timefactor_ = factor; }
-      static inline void setTimeFactor(float factor = 1.0) { Orxonox::getSingleton()->timefactor_ = factor; }
+      static inline void slomo(float factor) { Orxonox::setTimeFactor(factor); }
+      static void setTimeFactor(float factor = 1.0);
       static inline float getTimeFactor() { return Orxonox::getSingleton()->timefactor_; }
       static inline void exit() { Orxonox::getSingleton()->abortRequest(); }

code/trunk/src/orxonox/OrxonoxPrereqs.h

@@ -60 +60 @@
 //-----------------------------------------------------------------------
 
-namespace orxonox {
+namespace orxonox
+{
+  namespace LODParticle
+  {
+    enum LOD
+    {
+      off = 0,
+      low = 1,
+      normal = 2,
+      high = 3
+    };
+  }
+
   class GraphicsEngine;
   class Orxonox;

code/trunk/src/orxonox/hud/RadarObject.cc

@@ -65 +65 @@
 {
     unsigned int RadarObject::count_s = 0;
+    unsigned int RadarObject::materialcount_s = 0;
     std::map<std::string, std::map<ColourValue, std::string> > RadarObject::materials_s;
 
@@ -99 +100 @@
         if (it == colourmap.end())
         {
-            materialname = "radarmaterial" + getConvertedValue<unsigned int, std::string>(RadarObject::count_s);
+            materialname = "radarmaterial" + getConvertedValue<unsigned int, std::string>(RadarObject::materialcount_s++);
             Ogre::MaterialPtr material = (Ogre::MaterialPtr)Ogre::MaterialManager::getSingleton().create(materialname, "General");
+            material->getTechnique(0)->getPass(0)->setSceneBlending(Ogre::SBT_TRANSPARENT_ALPHA);
             Ogre::TextureUnitState* textureunitstate = material->getTechnique(0)->getPass(0)->createTextureUnitState();
             textureunitstate->setTextureName(texturename);

code/trunk/src/orxonox/hud/RadarObject.h

@@ -64 +64 @@
       private:
         static std::map<std::string, std::map<ColourValue, std::string> > materials_s;
-        unsigned static int count_s;
+        static unsigned int count_s;
+        static unsigned int materialcount_s;
         Ogre::SceneNode* node_;                                 // node of object
         ColourValue colour_;

code/trunk/src/orxonox/objects/ParticleProjectile.cc

@@ -43 +43 @@
         if (this->owner_)
         {
-            this->particles_ = new ParticleInterface("Orxonox/shot2");
+            this->particles_ = new ParticleInterface("Orxonox/shot2", LODParticle::normal);
             this->particles_->addToSceneNode(this->getNode());
             this->particles_->getAllEmitters()->setDirection(-this->owner_->getInitialDir());

code/trunk/src/orxonox/objects/ParticleSpawner.cc

@@ -43 +43 @@
     }
 
-    ParticleSpawner::ParticleSpawner(const std::string& templateName, float lifetime, float delay, const Vector3& direction)
+    ParticleSpawner::ParticleSpawner(const std::string& templateName, LODParticle::LOD detaillevel, float lifetime, float delay, const Vector3& direction)
     {
         RegisterObject(ParticleSpawner);
@@ -50 +50 @@
         executor->setDefaultValues(lifetime);
         this->timer_.setTimer(delay, false, this, executor);
-        this->particle_ = new ParticleInterface(templateName);
+        this->particle_ = new ParticleInterface(templateName, detaillevel);
         this->particle_->addToSceneNode(this->getNode());
         this->particle_->setEnabled(false);

code/trunk/src/orxonox/objects/ParticleSpawner.h

@@ -33 +33 @@
 
 #include "WorldEntity.h"
-#include "../tools/Timer.h"
+#include "tools/Timer.h"
 
 namespace orxonox
@@ -41 +41 @@
         public:
             ParticleSpawner();
-            ParticleSpawner(const std::string& templateName, float lifetime, float delay = 0, const Vector3& direction = Vector3::ZERO);
+            ParticleSpawner(const std::string& templateName, LODParticle::LOD detaillevel, float lifetime, float delay = 0, const Vector3& direction = Vector3::ZERO);
             virtual ~ParticleSpawner();
             inline ParticleInterface* getParticleInterface() const

code/trunk/src/orxonox/objects/Projectile.cc

@@ -97 +97 @@
                     if (it->isA(Class(SpaceShipAI)))
                         ((SpaceShipAI*)(*it))->damage(this->damage_);
-                    ParticleSpawner* explosion = new ParticleSpawner(this->explosionTemplateName_, 2.0);
+                    ParticleSpawner* explosion = new ParticleSpawner(this->explosionTemplateName_, LODParticle::low, 2.0);
                     explosion->setPosition(this->getPosition());
                     explosion->create();
-                    ParticleSpawner* smoke = new ParticleSpawner(this->smokeTemplateName_, 6.0, 0.0);
+                    ParticleSpawner* smoke = new ParticleSpawner(this->smokeTemplateName_, LODParticle::normal, 6.0, 0.0);
                     smoke->setPosition(this->getPosition());
                     smoke->getParticleInterface()->setSpeedFactor(3.0);

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -187 +187 @@
     {
         // START CREATING THRUSTER
-        this->tt1_ = new ParticleInterface("Orxonox/thruster1");
+        this->tt1_ = new ParticleInterface("Orxonox/thruster1", LODParticle::low);
         this->tt1_->createNewEmitter();
         this->tt1_->getAllEmitters()->setDirection(-this->getInitialDir());
@@ -199 +199 @@
         tt1_->addToSceneNode(node2a);
 
-        this->tt2_ = new ParticleInterface("Orxonox/thruster2");
+        this->tt2_ = new ParticleInterface("Orxonox/thruster2", LODParticle::normal);
         this->tt2_->createNewEmitter();
         this->tt2_->getAllEmitters()->setDirection(Vector3(-1, 0, 0));

code/trunk/src/orxonox/objects/SpaceShipAI.cc

@@ -102 +102 @@
             newenemy->XMLPort(xmlelement, XMLPort::LoadObject);
 
-            ParticleSpawner* spawneffect = new ParticleSpawner("Orxonox/fairytwirl", 2.0, 0.0, newenemy->getOrth());
+            ParticleSpawner* spawneffect = new ParticleSpawner("Orxonox/fairytwirl", LODParticle::normal, 2.0, 0.0, newenemy->getOrth());
             spawneffect->setPosition(newenemy->getPosition() - newenemy->getOrth() * 50);
             spawneffect->create();
@@ -182 +182 @@
     void SpaceShipAI::kill()
     {
-        ParticleSpawner* explosion = new ParticleSpawner("Orxonox/BigExplosion1part1", 3.0);
-        explosion->setPosition(this->getPosition());
-        explosion->getParticleInterface()->setKeepParticlesInLocalSpace(true);
-        explosion->setScale(4);
-        explosion->create();
-
-        explosion = new ParticleSpawner("Orxonox/BigExplosion1part2", 3.0);
+        ParticleSpawner* explosion = new ParticleSpawner("Orxonox/BigExplosion1part1", LODParticle::low, 3.0);
+        explosion->setPosition(this->getPosition());
+        explosion->getParticleInterface()->setKeepParticlesInLocalSpace(true);
+        explosion->setScale(4);
+        explosion->create();
+
+        explosion = new ParticleSpawner("Orxonox/BigExplosion1part2", LODParticle::normal, 3.0);
+        explosion->setPosition(this->getPosition());
+        explosion->getParticleInterface()->setKeepParticlesInLocalSpace(true);
+        explosion->setScale(4);
+        explosion->create();
+        explosion = new ParticleSpawner("Orxonox/BigExplosion1part2", LODParticle::high, 3.0);
         explosion->setPosition(this->getPosition());
         explosion->getParticleInterface()->setKeepParticlesInLocalSpace(true);
@@ -196 +201 @@
         Vector3 ringdirection = Vector3(rnd(), rnd(), rnd());
         ringdirection.normalise();
-        explosion = new ParticleSpawner("Orxonox/BigExplosion1part3", 3.0, 0.5, ringdirection);
+        explosion = new ParticleSpawner("Orxonox/BigExplosion1part3", LODParticle::normal, 3.0, 0.5, ringdirection);
+        explosion->setPosition(this->getPosition());
+        explosion->getParticleInterface()->setKeepParticlesInLocalSpace(true);
+        explosion->setScale(4);
+        explosion->create();
+        explosion = new ParticleSpawner("Orxonox/BigExplosion1part3", LODParticle::high, 3.0, 0.5, ringdirection);
         explosion->setPosition(this->getPosition());
         explosion->getParticleInterface()->setKeepParticlesInLocalSpace(true);

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)
   };
 }