Changeset 5064 in orxonox.OLD for orxonox/trunk/src/world_entities/player.cc

Timestamp:

Aug 17, 2005, 1:32:23 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: shooting-star

File:

• orxonox/trunk/src/world_entities/player.cc (modified) (2 diffs)

orxonox/trunk/src/world_entities/player.cc

@@ -91 +91 @@
   wpLeft->setName("testGun Left");
 
-  Weapon* turret = new Turret(this->weaponMan);
-  turret->setName("main-Turret");
+  Weapon* turret1 = new Turret(this->weaponMan);
+  turret1->setName("Turret1");
+  turret1->setStateDuration(WS_SHOOTING, .2);
   Weapon* turret2 = new Turret(this->weaponMan);
+  turret2->setName("Turret2");
+  turret2->setStateDuration(WS_SHOOTING, .3);
+  Weapon* turret3 = new Turret(this->weaponMan);
+  turret3->setName("Turret3");
+  turret3->setStateDuration(WS_SHOOTING, .17);
+
+  Weapon* turret4 = new Turret(this->weaponMan);
+  turret4->setName("Turret4");
+  turret4->setStateDuration(WS_SHOOTING, .3);
+
+
   this->weaponMan->addWeapon(wpLeft, 1, 0);
   this->weaponMan->addWeapon(wpRight,1 ,1);
-  this->weaponMan->addWeapon(turret, 2, 2);
+  this->weaponMan->addWeapon(turret1, 2, 2);
   this->weaponMan->addWeapon(turret2, 2, 3);
+  this->weaponMan->addWeapon(turret3, 2, 4);
+  this->weaponMan->addWeapon(turret4, 2, 5);
+
+
   //this->weaponMan->addWeapon(turret, 3, 0);
 
@@ -130 +146 @@
 
   this->weaponMan = new WeaponManager(this);
-  this->weaponMan->setSlotCount(4);
+  this->weaponMan->setSlotCount(6);
+
   this->weaponMan->setSlotPosition(0, Vector(-2.6, .1, -3.0));
+
   this->weaponMan->setSlotPosition(1, Vector(-2.6, .1, 3.0));
+
   this->weaponMan->setSlotPosition(2, Vector(-1.5, .5, -.5));
   this->weaponMan->setSlotDirection(2, Quaternion(-M_PI_4*.5, Vector(1,0,0)));
+
   this->weaponMan->setSlotPosition(3, Vector(-1.5, .5, .5));
   this->weaponMan->setSlotDirection(3, Quaternion(M_PI_4*.5, Vector(1,0,0)));
+
+  this->weaponMan->setSlotPosition(4, Vector(-1.5, -.5, .5));
+  this->weaponMan->setSlotDirection(4, Quaternion(-M_PI_4*.5+M_PI, Vector(1,0,0)));
+
+  this->weaponMan->setSlotPosition(5, Vector(-1.5, -.5, -.5));
+  this->weaponMan->setSlotDirection(5, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0)));
+
 }