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

Timestamp:

Jul 19, 2005, 5:16:07 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: animations can now be stored inside of the Weapon-base-class

File:

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

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

@@ -126 +126 @@
 }
 
+
+/**
+ * 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.
+ *
+ * This function does only generate the Animation Object, and if set it will
+ * automatically be executed, when a certain State is reached.
+ * 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)
+    return NULL;
+
+  if (unlikely(this->animation[state] != NULL))
+  {
+    delete this->animation[state];
+    this->animation[state] = NULL;
+  }
+  return this->animation[state] = new Animation3D(node);
+}
+
+
 /////////////////
 //  EXECUTION  //
@@ -219 +244 @@
   {
         // play Sound
-    if (this->soundBuffers[WA_ACTIVATE] != NULL)
+    if (likely(this->soundBuffers[WA_ACTIVATE] != NULL))
       this->soundSource->play(this->soundBuffers[WA_ACTIVATE]);
+    if (likely(this->animation[WS_ACTIVATING] != NULL))
+      this->animation[WS_ACTIVATING]->replay();
         // activate
     PRINTF(5)("Activating the Weapon %s\n", this->getName());
@@ -243 +270 @@
     if (this->soundBuffers[WA_DEACTIVATE] != NULL)
       this->soundSource->play(this->soundBuffers[WA_DEACTIVATE]);
+    if (likely(this->animation[WS_DEACTIVATING] != NULL))
+      this->animation[WS_DEACTIVATING]->replay();
         // deactivate
     this->deactivate();
@@ -263 +292 @@
     if (this->soundBuffers[WA_CHARGE] != NULL)
       this->soundSource->play(this->soundBuffers[WA_CHARGE]);
+    if (likely(this->animation[WS_CHARGING] != NULL))
+      this->animation[WS_CHARGING]->replay();
+
         // charge
     this->charge();
@@ -289 +321 @@
     if (this->soundBuffers[WA_SHOOT] != NULL)
       this->soundSource->play(this->soundBuffers[WA_SHOOT]);
+    if (likely(this->animation[WS_SHOOTING] != NULL))
+      this->animation[WS_SHOOTING]->replay();
           // fire
     this->fire();
@@ -321 +355 @@
   if (this->soundBuffers[WA_RELOAD] != NULL)
     this->soundSource->play(this->soundBuffers[WA_RELOAD]);
+  if (likely(this->animation[WS_RELOADING] != NULL))
+    this->animation[WS_RELOADING]->replay();
 
   if (chargeSize > this->energy)