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

Timestamp:

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

Author:

landauf

Message:

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

Location:

code/trunk/src/orxonox/objects

Files:

• ParticleProjectile.cc (modified) (1 diff)
• ParticleSpawner.cc (modified) (2 diffs)
• ParticleSpawner.h (modified) (2 diffs)
• Projectile.cc (modified) (1 diff)
• SpaceShip.cc (modified) (2 diffs)
• SpaceShipAI.cc (modified) (3 diffs)

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