Changeset 4895 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons/weapon.cc

Timestamp:

Jul 19, 2005, 6:27:06 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: messed things up a bit, try fixing

File:

• orxonox/trunk/src/world_entities/weapons/weapon.cc (modified) (7 diffs)

orxonox/trunk/src/world_entities/weapons/weapon.cc

@@ -129 +129 @@
 
 /**
- * creates an Animation3D for a certain State.
- * @param state what state should the Animation be created for
- * @param node the node this Animation should apply to.
- * @returns The created animation.Animation(), NULL on error.
+ * creates/returns an Animation3D for a certain State.
+ * @param state what State should the Animation be created/returned for
+ * @param node the node this Animation should apply to. (NULL is fine if the animation was already created)
+ * @returns The created animation.Animation(), NULL on error (or if the animation does not yet exist).
  *
  * This function does only generate the Animation Object, and if set it will
@@ -138 +138 @@
  * What this does not do, is set keyframes, you have to operate on the returned animation.
  */
-Animation3D* Weapon::createAnimation(WeaponState state, PNode* node)
-{
-  if (state >= WS_STATE_COUNT || node == NULL)
+Animation3D* Weapon::getAnimation(WeaponState state, PNode* node)
+{
+  if (state >= WS_STATE_COUNT) // if the state is not known
     return NULL;
 
-  if (unlikely(this->animation[state] != NULL))
-  {
-    delete this->animation[state];
-    this->animation[state] = NULL;
-  }
-  return this->animation[state] = new Animation3D(node);
+  if (unlikely(this->animation[state] == NULL)) // if the animation does not exist yet create it.
+  {
+    if (likely(node != NULL))
+      return this->animation[state] = new Animation3D(node);
+    else
+    {
+      PRINTF(2)("Node not defined for the Creation of the 3D-animation of state %s\n", stateToChar(state));
+      return NULL;
+    }
+  }
+  else
+    return this->animation[state];
 }
 
@@ -156 +162 @@
 // GAME ACTION //
 /////////////////
-
 /**
  * request an action that should be executed,
@@ -241 +246 @@
 bool Weapon::activateW()
 {
-
-  if (this->currentState == WS_INACTIVE)
+//  if (this->currentState == WS_INACTIVE)
   {
         // play Sound
@@ -250 +254 @@
       this->animation[WS_ACTIVATING]->replay();
         // activate
-    PRINTF(5)("Activating the Weapon %s\n", this->getName());
+    PRINTF(4)("Activating the Weapon %s\n", this->getName());
     this->activate();
-        // setting up for next action
-    this->requestedAction = WA_NONE;
+    this->active = true;
+    // setting up for next action
     this->stateDuration = this->times[WA_ACTIVATE] + this->stateDuration;
   }
+  this->requestedAction = WA_NONE;
 }
 
@@ -275 +280 @@
         // deactivate
     this->deactivate();
+    this->active = false;
         // setting up for next action
-    this->requestedAction = WA_NONE;
     this->stateDuration = this->times[WA_DEACTIVATE] + this->stateDuration;
   }
-
+  this->requestedAction = WA_NONE;
 }
 
@@ -414 +419 @@
 // 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;
-
-}
-
-
 /**
  * checks wether all the Weapons functions are valid, and if it is possible to go to action with it.