Changeset 10485 for code/branches/presentationFS15/src

Timestamp:

May 26, 2015, 12:40:33 PM (10 years ago)

Author:

maxima

Message:

ParticleEffects branch merged to presentation. New level PresentationFS15. New SpaceShip spaceshipFS15 with both RocketFire and RocketFireOld

Location:

code/branches/presentationFS15

Files:

• . (modified) (1 prop)
• src/external/ogreceguirenderer/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/WeaponsPrereqs.h (modified) (2 diffs)
• src/modules/weapons/projectiles/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/projectiles/Rocket.cc (modified) (6 diffs)
• src/modules/weapons/projectiles/RocketOld.cc (copied) (copied from code/branches/ParticleEffectsFS15/src/modules/weapons/projectiles/RocketOld.cc)
• src/modules/weapons/projectiles/RocketOld.h (copied) (copied from code/branches/ParticleEffectsFS15/src/modules/weapons/projectiles/RocketOld.h)
• src/modules/weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/weaponmodes/RocketFireOld.cc (copied) (copied from code/branches/ParticleEffectsFS15/src/modules/weapons/weaponmodes/RocketFireOld.cc)
• src/modules/weapons/weaponmodes/RocketFireOld.h (copied) (copied from code/branches/ParticleEffectsFS15/src/modules/weapons/weaponmodes/RocketFireOld.h)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (3 diffs)

code/branches/presentationFS15/src/external/ogreceguirenderer/CMakeLists.txt

@@ -38 +38 @@
     ${OCR_FILES}
 )
+
+TARGET_LINK_LIBRARIES(ogreceguirenderer_orxonox
+    pthread
+    boost_system    
+)

code/branches/presentationFS15/src/modules/weapons/CMakeLists.txt

@@ -19 +19 @@
   SOURCE_FILES ${WEAPONS_SRC_FILES}
 )
+
+#TARGET_LINK_LIBRARIES(weapons
+#    particleuniverse_orxonox
+#)

code/branches/presentationFS15/src/modules/weapons/WeaponsPrereqs.h

@@ -82 +82 @@
     class Projectile;
     class Rocket;
+    class RocketOld;
     class SimpleRocket;
 
@@ -91 +92 @@
     class LightningGun;
     class RocketFire;
+    class RocketFireOld;
     class SimpleRocketFire;
 }

code/branches/presentationFS15/src/modules/weapons/projectiles/CMakeLists.txt

@@ -6 +6 @@
   LightningGunProjectile.cc
   Rocket.cc
+  RocketOld.cc
   SimpleRocket.cc
 )

code/branches/presentationFS15/src/modules/weapons/projectiles/Rocket.cc

@@ -48 +48 @@
 #include "worldentities/CameraPosition.h"
 #include "worldentities/pawns/Pawn.h"
+//#include "particleuniverse/include/ParticleUniverseSystemManager.h"
 
 namespace orxonox
@@ -83 +84 @@
             fire->setOrientation(this->getOrientation());
             fire->setSource("Orxonox/rocketfire");
+            
+            // Add Particle Universe Effects
+                //ParticleUniverse::ParticleSystemManager* pManager = ParticleUniverse::ParticleSystemManager::getSingletonPtr();
+                //ParticleUniverse::ParticleSystem* pSys1 = pManager->createParticleSystem("pSys1", "bubbles", this->getScene()->getSceneManager());
+                //this->attachOgreObject(pSys1);
 
             this->enableCollisionCallback();
@@ -223 +229 @@
     void Rocket::destructionEffect()
     {
-        ParticleSpawner *effect1, *effect2;
+        ParticleSpawner *effect1, *effect2, *effect3, *effect4, *effect5;
         if(this->getShooter())
         {
             effect1 = new ParticleSpawner(this->getShooter()->getContext());
             effect2 = new ParticleSpawner(this->getShooter()->getContext());
+            effect3 = new ParticleSpawner(this->getShooter()->getContext());
+            effect4 = new ParticleSpawner(this->getShooter()->getContext());
+            effect5 = new ParticleSpawner(this->getShooter()->getContext());
         }
         else
@@ -233 +242 @@
             effect1 = new ParticleSpawner(this->getContext());
             effect2 = new ParticleSpawner(this->getContext());
+            effect3 = new ParticleSpawner(this->getContext());
+            effect4 = new ParticleSpawner(this->getContext());
+            effect5 = new ParticleSpawner(this->getContext());
         }
 
@@ -238 +250 @@
         effect1->setOrientation(this->getOrientation());
         effect1->setDestroyAfterLife(true);
-        effect1->setSource("Orxonox/explosion4");
+        effect1->setSource("orxonox/explosion_flash");
         effect1->setLifetime(2.0f);
 
@@ -244 +256 @@
         effect2->setOrientation(this->getOrientation());
         effect2->setDestroyAfterLife(true);
-        effect2->setSource("Orxonox/smoke4");
+        effect2->setSource("orxonox/explosion_flame");
         effect2->setLifetime(3.0f);
+
+        effect3->setPosition(this->getPosition());
+        effect3->setOrientation(this->getOrientation());
+        effect3->setDestroyAfterLife(true);
+        effect3->setSource("orxonox/explosion_shockwave");
+        effect3->setLifetime(3.0f);
+
+        effect4->setPosition(this->getPosition());
+        effect4->setOrientation(this->getOrientation());
+        effect4->setDestroyAfterLife(true);
+        effect4->setSource("orxonox/explosion_sparks");
+        effect4->setLifetime(3.0f);
+
+        effect5->setPosition(this->getPosition());
+        effect5->setOrientation(this->getOrientation());
+        effect5->setDestroyAfterLife(true);
+        effect5->setSource("orxonox/explosion_streak1");
+        effect5->setLifetime(3.0f);
     }
 

code/branches/presentationFS15/src/modules/weapons/weaponmodes/CMakeLists.txt

@@ -6 +6 @@
   LightningGun.cc
   RocketFire.cc
+  RocketFireOld.cc
   SimpleRocketFire.cc
 )

code/branches/presentationFS15/src/orxonox/worldentities/pawns/Pawn.cc

@@ -367 +367 @@
             if (GameMode::isMaster())
             {
-//                this->deathEffect();
+                this->deatheffect();
                 this->goWithStyle();
             }
@@ -387 +387 @@
     {
         // play death effect
-        {
+        /*{
             ParticleSpawner* effect = new ParticleSpawner(this->getContext());
             effect->setPosition(this->getPosition());
@@ -410 +410 @@
             effect->setSource("Orxonox/sparks");
             effect->setLifetime(4.0f);
-        }
+        }*/
+        
+        
+        {
+            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
+            effect->setPosition(this->getPosition());
+            effect->setOrientation(this->getOrientation());
+            effect->setDestroyAfterLife(true);
+            effect->setSource("orxonox/explosion_flash2");
+            effect->setLifetime(5.0f);
+        }
+        {
+            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
+            effect->setPosition(this->getPosition());
+            effect->setOrientation(this->getOrientation());
+            effect->setDestroyAfterLife(true);
+            effect->setSource("orxonox/explosion_flame2");
+            effect->setLifetime(5.0f);
+        }
+        {
+            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
+            effect->setPosition(this->getPosition());
+            effect->setOrientation(this->getOrientation());
+            effect->setDestroyAfterLife(true);
+            effect->setSource("orxonox/explosion_shockwave2");
+            effect->scale(20);
+            effect->setLifetime(5.0f);
+        }{
+            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
+            effect->setPosition(this->getPosition());
+            effect->setOrientation(this->getOrientation());
+            effect->setDestroyAfterLife(true);
+            effect->setSource("orxonox/explosion_sparks2");
+            effect->setLifetime(5.0f);
+        }
+        {
+            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
+            effect->setPosition(this->getPosition());
+            effect->setOrientation(this->getOrientation());
+            effect->setDestroyAfterLife(true);
+            effect->setSource("orxonox/explosion_streak2");
+            effect->setLifetime(5.0f);
+        }
+        {
+            ParticleSpawner* effect = new ParticleSpawner(this->getContext());
+            effect->setPosition(this->getPosition());
+            effect->setOrientation(this->getOrientation());
+            effect->setDestroyAfterLife(true);
+            effect->setSource("orxonox/explosion_afterglow");
+            effect->scale(20);
+            effect->setLifetime(5.0f);
+        }
+        
+        
         for (unsigned int i = 0; i < this->numexplosionchunks_; ++i)
         {