Changeset 10428 for code

Timestamp:

May 7, 2015, 2:29:09 PM (10 years ago)

Author:

gpregger

Message:

waste of time + New Explosion in 'rocket.cc' + old Rocket in 'rocketOld.cc' with 'RocketFireOld.cc'

Location:

code/branches/ParticleEffectsFS15

Files:

• data/DefaultResources.oxr (modified) (1 diff)
• data/levels/emptyLevel.oxw (modified) (2 diffs)
• data/levels/includes/weaponSettingsAssff.oxi (modified) (1 diff)
• data/particle/orxonox_explosionFlame.particle (added)
• data/particle/orxonox_explosionFlash.particle (added)
• data/particle/orxonox_explosionShockwave.particle (added)
• data/particle/orxonox_explosionSparks.particle (added)
• data/particle/orxonox_explosionStreak1.particle (added)
• src/external/CMakeLists.txt (modified) (1 diff)
• 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 (added)
• src/modules/weapons/projectiles/RocketOld.h (added)
• src/modules/weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/weaponmodes/RocketFireOld.cc (added)
• src/modules/weapons/weaponmodes/RocketFireOld.h (added)
• src/orxonox/worldentities/CMakeLists.txt (modified) (1 diff)

code/branches/ParticleEffectsFS15/data/DefaultResources.oxr

@@ -10 +10 @@
     <ResourceLocation path = "gui/schemes" />
     <ResourceLocation path = "gui/scripts" />
+    
 </ResourceCollection>

code/branches/ParticleEffectsFS15/data/levels/emptyLevel.oxw

@@ -13 +13 @@
 
 <?lua
-  include("templates/spaceshipAssff2.oxt")
+  include("templates/spaceshipAssff.oxt")
   include("templates/spaceshipPirate.oxt")
   include("templates/spaceshipEscort.oxt")
@@ -30 +30 @@
 
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
-    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
+    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
     
   </Scene>

code/branches/ParticleEffectsFS15/data/levels/includes/weaponSettingsAssff.oxi

@@ -39 +39 @@
         </Weapon>
         <Weapon>
-          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
+          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
           <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
         </Weapon>

code/branches/ParticleEffectsFS15/src/external/CMakeLists.txt

@@ -27 +27 @@
 ADD_SUBDIRECTORY(gtest)
 ADD_SUBDIRECTORY(loki)
+
 IF(CEGUI_OGRE_RENDERER_BUILD_REQUIRED)
   ADD_SUBDIRECTORY(ogreceguirenderer)

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

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

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

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

code/branches/ParticleEffectsFS15/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/ParticleEffectsFS15/src/modules/weapons/projectiles/CMakeLists.txt

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

code/branches/ParticleEffectsFS15/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/ParticleEffectsFS15/src/modules/weapons/weaponmodes/CMakeLists.txt

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

code/branches/ParticleEffectsFS15/src/orxonox/worldentities/CMakeLists.txt

@@ -12 +12 @@
   SpawnPoint.cc
   TeamSpawnPoint.cc
+  
 )