Changeset 6655 in orxonox.OLD for trunk

Timestamp:

Jan 23, 2006, 2:02:22 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ammoContainer added

Location:

trunk/src

Files:

• defs/class_id.h (modified) (1 diff)
• util/loading/resource_manager.cc (modified) (1 diff)
• world_entities/Makefile.am (modified) (2 diffs)
• world_entities/items (added)
• world_entities/items/item_container.cc (copied) (copied from trunk/src/proto/proto_class.cc) (4 diffs)
• world_entities/items/item_container.h (copied) (copied from trunk/src/proto/proto_class.h) (3 diffs)
• world_entities/projectiles/laser.cc (modified) (2 diffs)
• world_entities/weapons/ammo_container.cc (copied) (copied from trunk/src/proto/proto_class.cc) (4 diffs)
• world_entities/weapons/ammo_container.h (copied) (copied from trunk/src/proto/proto_class.h) (1 diff)

trunk/src/defs/class_id.h

@@ -209 +209 @@
 
   CL_WEAPON_MANAGER             =    0x00000503,
+  CL_AMMO_CONTAINER             =    0x00000504,
   CL_HUD                        =    0x00000520,
 

trunk/src/util/loading/resource_manager.cc

@@ -22 +22 @@
 
 #include <algorithm>
+#include <assert.h>
 
 // different resource Types

trunk/src/world_entities/Makefile.am

@@ -27 +27 @@
                   \
                   world_entities/weapons/weapon_manager.cc \
+                  world_entities/weapons/ammo_container.cc \
                   world_entities/weapons/weapon.cc \
                   world_entities/weapons/test_gun.cc \
@@ -79 +80 @@
                  \
                  world_entities/weapons/weapon_manager.h \
+                 world_entities/weapons/ammo_container.h \
                  world_entities/weapons/weapon.h \
                  world_entities/weapons/test_gun.h \

trunk/src/world_entities/items/item_container.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */
@@ -16 +16 @@
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
 
-#include "proto_class.h"
+#include "item_container.h"
 
 using namespace std;
@@ -25 +25 @@
  * @todo this constructor is not jet implemented - do it
 */
-ProtoClass::ProtoClass ()
+ItemContainer::ItemContainer ()
 {
-   this->setClassID(CL_PROTO_ID, "ProtoClass");
+   this->setClassID(CL_ITEM_CONTAINER, "ItemContainer");
 
    /* If you make a new class, what is most probably the case when you write this file
@@ -45 +45 @@
  * standard deconstructor
 */
-ProtoClass::~ProtoClass ()
+ItemContainer::~ItemContainer ()
 {
   // delete what has to be deleted here

trunk/src/world_entities/items/item_container.h

@@ -1 +1 @@
 /*!
- * @file proto_class.h
- * @brief Definition of ...
-*/
+ * @file item_container.h
+ * @brief Definition of a Container for Items one can pick up
+ */
 
-#ifndef _PROTO_CLASS_H
-#define _PROTO_CLASS_H
+#ifndef _ITEM_CONTAINER_H
+#define _ITEM_CONTAINER_H
 
 #include "base_object.h"
@@ -13 +13 @@
 
 
-//! A class for ...
-class ProtoClass : public BaseObject {
+//! A class for storing collected Items.
+class ItemContainer : public BaseObject {
 
  public:
-  ProtoClass();
-  virtual ~ProtoClass();
+  ItemContainer();
+  virtual ~ItemContainer();
 
 
@@ -25 +25 @@
 };
 
-#endif /* _PROTO_CLASS_H */
+#endif /* _ITEM_CONTAINER_H */

trunk/src/world_entities/projectiles/laser.cc

@@ -17 +17 @@
 
 #include "laser.h"
+#include <assert.h>
+
 
 #include "fast_factory.h"
@@ -26 +28 @@
 #include "particle_emitter.h"
 #include "sprite_particles.h"
+
 
 

trunk/src/world_entities/weapons/ammo_container.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */
@@ -16 +16 @@
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
 
-#include "proto_class.h"
+#include "ammo_container.h"
+
+#include "weapon.h"
+
+#include <assert.h>
 
 using namespace std;
-
 
 /**
@@ -25 +28 @@
  * @todo this constructor is not jet implemented - do it
 */
-ProtoClass::ProtoClass ()
+AmmoContainer::AmmoContainer (ClassID projectileType, float maxEnergy)
 {
-   this->setClassID(CL_PROTO_ID, "ProtoClass");
+   this->setClassID(CL_AMMO_CONTAINER, "AmmoContainer");
 
-   /* If you make a new class, what is most probably the case when you write this file
-      don't forget to:
-       1. Add the new file new_class.cc to the ./src/Makefile.am
-       2. Add the class identifier to ./src/class_id.h eg. CL_NEW_CLASS
 
-      Advanced Topics:
-      - if you want to let your object be managed via the ObjectManager make sure to read
-        the object_manager.h header comments. You will use this most certanly only if you
-        make many objects of your class, like a weapon bullet.
-   */
 }
 
@@ -45 +39 @@
  * standard deconstructor
 */
-ProtoClass::~ProtoClass ()
+AmmoContainer::~AmmoContainer ()
 {
   // delete what has to be deleted here
 }
+
+
+
+float AmmoContainer::increaseEnergy(float energy)
+{
+  this->energy += energy;
+
+  if (unlikely(this->energy > this->maxEnergy))
+  {
+    float retEnergy = this->energy - this->maxEnergy;
+    this->energy = this->maxEnergy;
+    return retEnergy;
+  }
+  else
+    return 0.0f;
+}
+
+
+float AmmoContainer::decreaseEnergy(float energy)
+{
+  this->energy -= energy;
+
+  if (unlikely(this->energy < 0))
+  {
+    float retEnergy = 0 - this->energy;
+    this->energy = 0;
+    return retEnergy;
+  }
+  else
+    return 0.0f;
+}
+
+bool AmmoContainer::weaponValid(const Weapon* weapon)
+{
+  return (weapon->isA(this->projectileType));
+}
+
+
+void AmmoContainer::fillWeapon(Weapon* weapon)
+{
+  assert (weapon != NULL);
+
+  float fillEnergy = weapon->getEnergyMax();
+
+  float restEnergy = weapon->increaseEnergy(fillEnergy);
+  this->decreaseEnergy(fillEnergy - restEnergy);
+}

trunk/src/world_entities/weapons/ammo_container.h

@@ -4 +4 @@
 */
 
-#ifndef _PROTO_CLASS_H
-#define _PROTO_CLASS_H
+#ifndef _AMMO_CONTAINER_H
+#define _AMMO_CONTAINER_H
 
 #include "base_object.h"
 
+
 // FORWARD DECLARATION
+class Weapon;
+
+#define DEFAULT_MAX_ENERGY 100
+
+//! A class for Storing energy of Projectiles.
+class AmmoContainer : public BaseObject {
+
+ public:
+  AmmoContainer(ClassID projectileType, float maxEnergy = DEFAULT_MAX_ENERGY);
+  virtual ~AmmoContainer();
+
+  ClassID getProjectileType() const { return this->projectileType; };
 
 
+  float increaseEnergy(float energy);
+  float decreaseEnergy(float energy);
 
-//! A class for ...
-class ProtoClass : public BaseObject {
+  float getMaxEnergy() const { return this->maxEnergy; };
 
- public:
-  ProtoClass();
-  virtual ~ProtoClass();
+  void increaseMaxEnergy(float increase);
+
+  bool weaponValid(const Weapon* weapon);
+  void fillWeapon(Weapon* weapon);
 
 
  private:
+   float  energy;
+   float  maxEnergy;
 
+   ClassID projectileType;
 };
 
-#endif /* _PROTO_CLASS_H */
+#endif /* _AMMO_CONTAINER_H */