Context Navigation

← Previous Change
Next Change →

weapons

Timestamp:

Oct 4, 2015, 3:45:56 PM (9 years ago)

Author:

landauf

Message:

merged branch presentationFS15merge back to trunk

Location:

code/trunk

Files:

: 10 edited
: 12 copied

. (modified) (1 prop)
src/modules/weapons/WeaponsPrereqs.h (modified) (3 diffs)
src/modules/weapons/munitions/CMakeLists.txt (modified) (1 diff)
src/modules/weapons/munitions/GravityBombMunition.cc (copied) (copied from code/branches/presentationFS15merge/src/modules/weapons/munitions/GravityBombMunition.cc)
src/modules/weapons/munitions/GravityBombMunition.h (copied) (copied from code/branches/presentationFS15merge/src/modules/weapons/munitions/GravityBombMunition.h)
src/modules/weapons/projectiles/CMakeLists.txt (modified) (1 diff)
src/modules/weapons/projectiles/GravityBomb.cc (copied) (copied from code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBomb.cc)
src/modules/weapons/projectiles/GravityBomb.h (copied) (copied from code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBomb.h)
src/modules/weapons/projectiles/GravityBombField.cc (copied) (copied from code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBombField.cc)
src/modules/weapons/projectiles/GravityBombField.h (copied) (copied from code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBombField.h)
src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) (1 diff)
src/modules/weapons/projectiles/Rocket.cc (modified) (6 diffs)
src/modules/weapons/projectiles/RocketOld.cc (copied) (copied from code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.cc)
src/modules/weapons/projectiles/RocketOld.h (copied) (copied from code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.h)
src/modules/weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) (1 diff)
src/modules/weapons/weaponmodes/FusionFire.cc (modified) (1 diff)
src/modules/weapons/weaponmodes/GravityBombFire.cc (copied) (copied from code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/GravityBombFire.cc)
src/modules/weapons/weaponmodes/GravityBombFire.h (copied) (copied from code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/GravityBombFire.h)
src/modules/weapons/weaponmodes/LaserFire.cc (modified) (1 diff)
src/modules/weapons/weaponmodes/RocketFireOld.cc (copied) (copied from code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.cc)
src/modules/weapons/weaponmodes/RocketFireOld.h (copied) (copied from code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.h)

Legend:

: Unmodified
: Added
: Removed

code/trunk

Property svn:mergeinfo changed

/code/branches/ParticleEffectsFS15 (added)	merged: 10309,10428,10433,10603
/code/branches/SciptableControllerFS15 (added)	merged: 10308,10315,10448,10600,10605,10609
/code/branches/clangenb (added)	merged: 10385,10494-10495,10596-10597
/code/branches/core7 (added)	merged: 10350
/code/branches/formationFS15 (added)	merged: 10320-10321,10390,10500,10598
/code/branches/multiplayerFS15 (added)	merged: 10324,10334,10427,10434,10446-10447,10456-10457
/code/branches/presentationFS15 (added)	merged: 10499
/code/branches/presentationFS15merge (added)	merged: 10595,10610-10621
/code/branches/towerdefenseFS15 (added)	merged: 10283,10319,10325,10335,10340,10351,10368,10378,10388,10394,10397,10406,10408,10430,10451
/code/branches/weaponFS15 (added)	merged: 10302,10326,10336,10341,10369,10391,10409,10435-10436,10438,10455,10502-10503,10601-10602,10604

code/trunk/src/modules/weapons/WeaponsPrereqs.h

-                      r8855
+                      r10622
     class ReplenishingMunition;
     class RocketMunition;
+    class GravityBombMuntion;
     // projectiles
 …
     class Projectile;
     class Rocket;
+    class RocketOld;
     class SimpleRocket;
+    class GravityBomb;
     // weaponmodes
 …
     class LightningGun;
     class RocketFire;
+    class RocketFireOld;
     class SimpleRocketFire;
+    class GravityBombFire;
+}

code/trunk/src/modules/weapons/munitions/CMakeLists.txt

r7846	r10622
4	4	FusionMunition.cc
5	5	RocketMunition.cc
	6	GravityBombMunition.cc
6	7	)

code/trunk/src/modules/weapons/projectiles/CMakeLists.txt

-                      r8855
+                      r10622
   LightningGunProjectile.cc
   Rocket.cc
+  RocketOld.cc
   SimpleRocket.cc
+  GravityBomb.cc
+  GravityBombField.cc
+)

code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc

r9667	r10622
47	47
48	48	this->textureIndex_ = 1;
	49	this->setMass(2);
	50	this->setCollisionType(Dynamic);
49	51	this->maxTextureIndex_ = 8;
50	52	this->textureTimer_.setTimer(0.01f, true, createExecutor(createFunctor(&LightningGunProjectile::changeTexture, this)));

code/trunk/src/modules/weapons/projectiles/Rocket.cc

-                      r10216
+                      r10622
 #include "worldentities/CameraPosition.h"
 #include "worldentities/pawns/Pawn.h"
+//#include "particleuniverse/include/ParticleUniverseSystemManager.h"
 namespace orxonox
 …
             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();
 …
     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
 …
             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());
+        }
 …
         effect1->setOrientation(this->getOrientation());
         effect1->setDestroyAfterLife(true);
         effect1->setSource("Orxonox/explosion4");
+        effect1->setSource("orxonox/explosion_flash");
         effect1->setLifetime(2.0f);
 …
         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/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt

r7163	r10622
6	6	LightningGun.cc
7	7	RocketFire.cc
	8	RocketFireOld.cc
8	9	SimpleRocketFire.cc
	10	GravityBombFire.cc
9	11	)

code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc

r10296	r10622
108	108	model->setScale(5);
109	109
	110	this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
110	111	projectile->setOrientation(this->getMuzzleOrientation());
111	112	projectile->setPosition(this->getMuzzlePosition());

code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc

r10296	r10622
68	68	BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
69	69
	70	this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
70	71	projectile->setOrientation(this->getMuzzleOrientation());
71	72	projectile->setPosition(this->getMuzzlePosition());

code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc

r10296	r10622
66	66	ParticleProjectile* projectile = new ParticleProjectile(this->getContext());
67	67
	68	this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
68	69	projectile->setOrientation(this->getMuzzleOrientation());
69	70	projectile->setPosition(this->getMuzzlePosition());

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 10622 for code/trunk/src/modules/weapons

Legend:

Download in other formats: