Changeset 4880 in orxonox.OLD for orxonox/branches/weaponSystem/src/world_entities/weapons/weapon.cc

Timestamp:

Jul 17, 2005, 2:17:09 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/weaponSystem: more functionality, but firing does not work anymore… this will soon be fixed

File:

• orxonox/branches/weaponSystem/src/world_entities/weapons/weapon.cc (modified) (10 diffs)

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

@@ -13 +13 @@
    main-programmer: Patrick Boenzli
    co-programmer: Benjamin Grauer
+
+   2005-07-15: Benjamin Grauer: restructurating the entire Class
 */
 
@@ -23 +25 @@
 #include "list.h"
 #include "state.h"
+#include "animation3d.h"
+#include "sound_engine.h"
 
 /**
@@ -42 +46 @@
 Weapon::~Weapon ()
 {
-  // model will be deleted from WorldEntity-destructor
-  //this->worldEntities = NULL;
-
-  /* dont delete objectComponentsX here, they will be killed when the pnodes are cleaned out */
-
-  /* all animations are deleted via the animation player*/
-}
-
+  for (int i = 0; i < WS_STATE_COUNT; i++)
+    if (this->animation[i])
+      delete this->animation[i];
+  for (int i = 0; i < WA_ACTION_COUNT; i++)
+    if (this->soundBuffers[i])
+      delete this->soundBuffers[i];
+}
+
+/**
+ * initializes the Weapon with ALL default values
+ */
 void Weapon::init()
 {
   this->currentState     = WS_INACTIVE;
-  this->stateTime        = 0.0;
+  this->stateDuration    = 0.0;
   for (int i = 0; i < WS_STATE_COUNT; i++)
-  {
-    this->times[i] = 0.0;
-    this->animation[i] = NULL;
-  }
+    {
+      this->times[i] = 0.0;
+      this->animation[i] = NULL;
+    }
   for (int i = 0; i < WA_ACTION_COUNT; i++)
     this->soundBuffers[i] = NULL;
 
+  this->requestedAction = WA_NONE;
   this->weaponSource = NULL;
-  this->minCharge;
-  this->maxCharge;
+  this->minCharge = 0.0;
+  this->maxCharge = 0.0;
 
   this->active = false;
@@ -94 +102 @@
 
 
+void Weapon::requestAction(WeaponAction action)
+{
+  this->requestedAction = action;
+}
+
+bool Weapon::execute(WeaponAction action)
+{
+  this->stateDuration = this->times[action] + this->stateDuration;
+
+  switch (action)
+  {
+    case WA_SHOOT:
+      this->fire();
+      break;
+    case WA_CHARGE:
+      this->charge();
+      break;
+    case WA_RELOAD:
+      this->reload();
+      break;
+    case WA_DEACTIVATE:
+      this->deactivate();
+      break;
+    case WA_ACTIVATE:
+      this->activate();
+      break;
+  }
+}
+
 /**
  * this activates the weapon
- *
- * This is needed, since there can be more than one weapon on a ship. the
- * activation can be connected with an animation. for example the weapon is
- * been armed out.
 */
 void Weapon::activate()
@@ -107 +140 @@
 /**
  * this deactivates the weapon
- *
- * This is needed, since there can be more than one weapon on a ship. the
- * activation can be connected with an animation. for example the weapon is
- * been armed out.
 */
 void Weapon::deactivate()
 {}
 
-/**
- * is called, when the weapon gets hit (=collide with something)
- * @param from which entity it is been hit
- * @param where it is been hit
- *
- * this may not be used, since it would make the game relay complicated when one
- * can destroy the weapons of enemies or vice versa.
-*/
-void Weapon::hit (WorldEntity* entity, const Vector& position)
-{}
+void Weapon::fire()
+{
+
+}
+
+void Weapon::reload()
+{
+
+}
+
+void Weapon::charge()
+{
+}
 
 
@@ -138 +170 @@
 
 /**
- *  tick signal for time dependent/driven stuff
-*/
-void Weapon::tick (float time)
-{}
+ * tick signal for time dependent/driven stuff
+*/
+void Weapon::tick(float dt)
+{
+  if (this->isActive())
+  {
+    this->stateDuration -= dt;
+
+    if (this->stateDuration < 0.0)
+      this->execute(this->requestedAction);
+  }
+  else
+    if (this->requestedAction == WA_ACTIVATE)
+      this->activate();
+
+}
 
 /**
@@ -153 +197 @@
 
 
+//////////////////////
+// HELPER FUNCTIONS //
+//////////////////////
+// inclass
+/**
+ * checks if the next Action given is valid
+ * @returns if the Action that comes next is valid
+ * @todo more checks
+ */
+bool Weapon::nextActionValid() const
+{
+  if (this->currentState == WS_INACTIVE)
+  {
+    return (this->requestedAction == WA_ACTIVATE || this->requestedAction == WA_NONE);
+  }
+  else
+    return true;
+
+}
+
+
+
+// static
 /**
  * Converts a String into an Action.
@@ -175 +242 @@
     return WA_SPECIAL1;
   else
-  {
-    PRINTF(2)("action %s could not be identified.\n", action);
-    return WA_NONE;
-  }
+    {
+      PRINTF(2)("action %s could not be identified.\n", action);
+      return WA_NONE;
+    }
 }
 
@@ -192 +259 @@
   else if (!strcmp(state, "shooting"))
     return WS_SHOOTING;
+  else if (!strcmp(state, "charging"))
+    return WS_CHARGING;
   else if (!strcmp(state, "reloading"))
     return WS_RELOADING;
@@ -203 +272 @@
     return WS_IDLE;
   else
-  {
-    PRINTF(2)("state %s could not be identified.\n", state);
-    return WS_NONE;
-  }
-}
-
+    {
+      PRINTF(2)("state %s could not be identified.\n", state);
+      return WS_NONE;
+    }
+}