Changeset 1629 for code/branches/input/src/asylum/orxonox

Timestamp:

Jun 27, 2008, 8:07:29 AM (16 years ago)

Author:

rgrieder

Message:

updated input branch

Location:

code/branches/input/src/asylum/orxonox/objects

Files:

• Fighter.cc (modified) (3 diffs)
• weapon (copied) (copied from code/trunk/src/asylum/orxonox/objects/weapon)
• weapon/AmmunitionDump.cc (copied) (copied from code/trunk/src/asylum/orxonox/objects/weapon/AmmunitionDump.cc)
• weapon/AmmunitionDump.h (copied) (copied from code/trunk/src/asylum/orxonox/objects/weapon/AmmunitionDump.h)
• weapon/BarrelGun.cc (copied) (copied from code/trunk/src/asylum/orxonox/objects/weapon/BarrelGun.cc)
• weapon/BarrelGun.h (copied) (copied from code/trunk/src/asylum/orxonox/objects/weapon/BarrelGun.h)
• weapon/BaseWeapon.cc (copied) (copied from code/trunk/src/asylum/orxonox/objects/weapon/BaseWeapon.cc)
• weapon/BaseWeapon.h (copied) (copied from code/trunk/src/asylum/orxonox/objects/weapon/BaseWeapon.h)
• weapon/Bullet.cc (copied) (copied from code/trunk/src/asylum/orxonox/objects/weapon/Bullet.cc)
• weapon/Bullet.h (copied) (copied from code/trunk/src/asylum/orxonox/objects/weapon/Bullet.h)
• weapon/BulletManager.cc (copied) (copied from code/trunk/src/asylum/orxonox/objects/weapon/BulletManager.cc)
• weapon/BulletManager.h (copied) (copied from code/trunk/src/asylum/orxonox/objects/weapon/BulletManager.h)
• weapon/WeaponStation.cc (copied) (copied from code/trunk/src/asylum/orxonox/objects/weapon/WeaponStation.cc)
• weapon/WeaponStation.h (copied) (copied from code/trunk/src/asylum/orxonox/objects/weapon/WeaponStation.h)

code/branches/input/src/asylum/orxonox/objects/Fighter.cc

@@ -42 +42 @@
 #include "GraphicsEngine.h"
 #include "core/InputManager.h"
-#include "particle/ParticleInterface.h"
+#include "tools/ParticleInterface.h"
 #include "weapon/AmmunitionDump.h"
 #include "weapon/BarrelGun.h"
@@ -132 +132 @@
 #if 0
         w = new particle::ParticleInterface(GraphicsEngine::getSingleton().getSceneManager(),"schuss" + this->getName(),"Orxonox/schuss");
-        w->getParticleSystem()->setParameter("local_space","true");
         w->newEmitter();
 /*
@@ -151 +150 @@
 
         tt = new ParticleInterface(GraphicsEngine::getSingleton().getSceneManager(),"twinthruster" + this->getName(),"Orxonox/engineglow");
-        tt->getParticleSystem()->setParameter("local_space","true");
         tt->newEmitter();
 /*