Changeset 3618 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Mar 21, 2005, 3:26:26 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: adding TestGun to implement a test gun some smaller changes in ghe weapon.h interface. some doxytags for primitive

Location:

orxonox/trunk/src/world_entities

Files:

• player.cc (modified) (1 diff)
• primitive.h (modified) (2 diffs)
• projectile.cc (modified) (2 diffs)
• projectile.h (modified) (2 diffs)
• test_gun.cc (added)
• test_gun.h (added)
• weapon.h (modified) (1 diff)

orxonox/trunk/src/world_entities/player.cc

@@ -192 +192 @@
 void Player::fire()
 {
-  if(this->bFire)
+  if( this->bFire)
     {
       if(this->activeWeapon != NULL)
         this->activeWeapon->fire();
     }
-  if(this->bWeaponChange)
+  if( this->bWeaponChange && this->weapons->getSize() > 1)
     {
-      Weapon* w = this->weapons->enumerate(); 
+      PRINTF(1)("changing the weapon of the player: deactivate old, activate new\n");
+      this->activeWeapon->deactivate();
+      this->weapons->enumerate(); 
       this->activeWeapon = this->weapons->nextElement(this->activeWeapon);
+      this->activeWeapon->activate();
     }
 }

orxonox/trunk/src/world_entities/primitive.h

@@ +1 @@
+/*! 
+    \primitive.h
+    \brief representing a primitive body in the world: cube, sphere, cylinder  etc...
+*/
+
+
 #ifndef _PRIMITIVE_H
 #define _PRIMITIVE_H
@@ -34 +40 @@
   GLUquadricObj* object; //!< the object to be rendered
   Material* material;    //!< A Material for the SkySphere.
-  pForm form;
-  char* textureName;
-  float size;
-  int segments;
+  pForm form;            //!< the chooesen form for the entity
+  char* textureName;     //!< if there is a texture. this is the name for it
+  float size;            //!< size of the object, from [0..1]
+  int segments;          //!< segment count
 
   void glDrawCube();

orxonox/trunk/src/world_entities/projectile.cc

@@ -18 +18 @@
 
 #include "projectile.h"
-#include "stdincl.h"
+
 #include "world_entity.h"
+#include "objModel.h"
+#include "primitive.h"
 #include "vector.h"
-#include "objModel.h"
 
 using namespace std;
@@ -31 +32 @@
 Projectile::Projectile () : WorldEntity()
 {
-  this->model = new OBJModel("");
+  //this->model = new OBJModel("");
+  this->projectileModel = new Primitive(P_SPHERE);
 }
 

orxonox/trunk/src/world_entities/projectile.h

@@ -9 +9 @@
 #include "world_entity.h"
 
+class Primitive;
 
 class Projectile : public WorldEntity 
@@ -26 +27 @@
  private:
   //physical attriutes like: force, speed, acceleration etc.
+  Primitive* projectileModel;
 
 };

orxonox/trunk/src/world_entities/weapon.h

@@ -57 +57 @@
   bool isActive(void);
 
-  virtual void setWeaponIdleTime(float time);
-  virtual float getWeaponIdleTime(void);
-  virtual bool hasWeaponIdleTimeElapsed(void);
+  void setWeaponIdleTime(float time);
+  float getWeaponIdleTime(void);
+  bool hasWeaponIdleTimeElapsed(void);
 
   virtual void fire(void);