Changeset 4881 in orxonox.OLD

Timestamp:

Jul 17, 2005, 4:46:19 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: shooting works, with interval-handling
now after 2 hours of war of the worlds, 5 hours coding…. for some 3-4 hours sleep, until i can't stop thinking about a better way to implement the rest of the WeaponSystem

Location:

orxonox/branches/weaponSystem/src

Files:

• defs/debug.h (modified) (1 diff)
• world_entities/weapons/test_gun.cc (modified) (2 diffs)
• world_entities/weapons/weapon.cc (modified) (6 diffs)
• world_entities/weapons/weapon.h (modified) (1 diff)

orxonox/branches/weaponSystem/src/defs/debug.h

@@ -69 +69 @@
 #define DEBUG_MODULE_LIGHT              0
 #define DEBUG_MODULE_PLAYER             1
-#define DEBUG_MODULE_WEAPON             0
+#define DEBUG_MODULE_WEAPON             4
 #define DEBUG_MODULE_MATH               0
 #define DEBUG_MODULE_FONT               1

orxonox/branches/weaponSystem/src/world_entities/weapons/test_gun.cc

@@ -98 +98 @@
 //  ObjectManager::getInstance()->cache(CL_TEST_BULLET, 100, p);
   //ObjectManager::getInstance()->debug();
+
+  this->setStateDuration(WS_SHOOTING, 2);
 }
 
@@ -144 +146 @@
 void TestGun::fire()
 {
-  if( !this->stateTimeElapsed())
-    {
-      this->weaponIdle();
-      return;
-    }
-
-    Projectile* pj =  new TestBullet(this);//dynamic_cast<Projectile*>(ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET & CL_MASK_LOWLEVEL_CLASS));
-  weaponSource->play();
+  Projectile* pj =  new TestBullet(this);//dynamic_cast<Projectile*>(ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET & CL_MASK_LOWLEVEL_CLASS));
+//  weaponSource->play();
 
   pj->setAbsCoor(this->getAbsCoor() + this->projectileOffset);

orxonox/branches/weaponSystem/src/world_entities/weapons/weapon.cc

@@ -16 +16 @@
    2005-07-15: Benjamin Grauer: restructurating the entire Class
 */
+
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
 #include "weapon.h"
@@ -74 +76 @@
   this->maxCharge = 0.0;
 
-  this->active = false;
+  this->active = true;
   this->projectile = NULL;
 }
@@ -104 +106 @@
 void Weapon::requestAction(WeaponAction action)
 {
+  printf("next action will be %d\n", action);
   this->requestedAction = action;
 }
 
-bool Weapon::execute(WeaponAction action)
-{
-  this->stateDuration = this->times[action] + this->stateDuration;
-
-  switch (action)
+bool Weapon::execute()
+{
+  this->stateDuration = this->times[this->requestedAction] + this->stateDuration;
+
+  PRINT(3)("executing action %d\n", this->requestedAction);
+
+  switch (this->requestedAction)
   {
     case WA_SHOOT:
@@ -129 +134 @@
       break;
   }
+  this->requestedAction = WA_NONE;
 }
 
@@ -146 +152 @@
 void Weapon::fire()
 {
-
 }
 
@@ -174 +179 @@
 void Weapon::tick(float dt)
 {
+  // setting up the timing properties
+  this->stateDuration -= dt;
+
   if (this->isActive())
   {
-    this->stateDuration -= dt;
-
-    if (this->stateDuration < 0.0)
-      this->execute(this->requestedAction);
+    if (this->stateDuration <= 0.0 && this->requestedAction != WA_NONE)
+      this->execute();
   }
   else

orxonox/branches/weaponSystem/src/world_entities/weapons/weapon.h

@@ -113 +113 @@
 
 
-    bool execute(WeaponAction action);
+    bool execute();
     virtual void activate();
     virtual void deactivate();