Changeset 1555 for code/trunk/src/orxonox

Timestamp:

Jun 6, 2008, 9:05:27 PM (16 years ago)

Author:

landauf

Message:

• ParticleInterface uses Orxonox::getTimeFactor to make particle effects independend of gamespeed (but there's still a drawback with thrusters)
• reduced OIS includes in input-related classes, changed OIS search and include to avoid conflicts with other versions of OIS (for example in Ogre). not yet tested on tardis.

Location:

code/trunk/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• tools/ParticleInterface.cc (modified) (3 diffs)

code/trunk/src/orxonox/CMakeLists.txt

@@ -78 +78 @@
   tinyxml
   tolualib
-  ois
+  ois_orxonox
   util
   core

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

@@ -39 +39 @@
 
 #include "GraphicsEngine.h"
+#include "Orxonox.h"
 #include "util/Convert.h"
 
@@ -50 +51 @@
     this->sceneNode_ = 0;
     this->particleSystem_ = GraphicsEngine::getSingleton().getSceneManager()->createParticleSystem("particles" + getConvertedValue<unsigned int, std::string>(ParticleInterface::counter_s++), templateName);
+    this->particleSystem_->setSpeedFactor(Orxonox::getSingleton()->getTimeFactor());
   }
 
@@ -138 +140 @@
   void ParticleInterface::setSpeedFactor(float factor)
   {
-    this->particleSystem_->setSpeedFactor(factor);
+    this->particleSystem_->setSpeedFactor(Orxonox::getSingleton()->getTimeFactor() * factor);
   }
   float ParticleInterface::getSpeedFactor() const