Changeset 3618 in orxonox.OLD for orxonox

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

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (6 diffs)
• world_entities/player.cc (modified) (1 diff)
• world_entities/primitive.h (modified) (2 diffs)
• world_entities/projectile.cc (modified) (2 diffs)
• world_entities/projectile.h (modified) (2 diffs)
• world_entities/test_gun.cc (added)
• world_entities/test_gun.h (added)
• world_entities/weapon.h (modified) (1 diff)

orxonox/trunk/src/Makefile.am

@@ -47 +47 @@
                  world_entities/projectile.cc \
                  world_entities/character_attributes.cc \
+                 world_entities/test_gun.cc \
                  ai/ai.cc \
                  lib/coord/p_node.cc \
@@ -95 +96 @@
                  world_entities/projectile.h \
                  world_entities/character_attributes.h \
+                 world_entities/test_gun.h \
                  ai/ai.h \
                  network/synchronisable.h \

orxonox/trunk/src/Makefile.in

@@ -61 +61 @@
         terrain.$(OBJEXT) primitive.$(OBJEXT) weapon.$(OBJEXT) \
         projectile.$(OBJEXT) character_attributes.$(OBJEXT) \
-        ai.$(OBJEXT) p_node.$(OBJEXT) null_parent.$(OBJEXT) \
-        helper_parent.$(OBJEXT) data_tank.$(OBJEXT) \
-        graphics_engine.$(OBJEXT) light.$(OBJEXT) fontset.$(OBJEXT) \
-        array.$(OBJEXT) objModel.$(OBJEXT) model.$(OBJEXT) \
-        material.$(OBJEXT) texture.$(OBJEXT) base_entity.$(OBJEXT) \
-        base_object.$(OBJEXT) ini_parser.$(OBJEXT) list.$(OBJEXT) \
-        vector.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT)
+        test_gun.$(OBJEXT) ai.$(OBJEXT) p_node.$(OBJEXT) \
+        null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
+        data_tank.$(OBJEXT) graphics_engine.$(OBJEXT) light.$(OBJEXT) \
+        fontset.$(OBJEXT) array.$(OBJEXT) objModel.$(OBJEXT) \
+        model.$(OBJEXT) material.$(OBJEXT) texture.$(OBJEXT) \
+        base_entity.$(OBJEXT) base_object.$(OBJEXT) \
+        ini_parser.$(OBJEXT) list.$(OBJEXT) vector.$(OBJEXT) \
+        curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
 orxonox_LDADD = $(LDADD)
@@ -95 +96 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/skysphere.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/terrain.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/texture.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/test_gun.Po ./$(DEPDIR)/texture.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/track_manager.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/track_node.Po ./$(DEPDIR)/vector.Po \
@@ -249 +250 @@
                  world_entities/projectile.cc \
                  world_entities/character_attributes.cc \
+                 world_entities/test_gun.cc \
                  ai/ai.cc \
                  lib/coord/p_node.cc \
@@ -297 +299 @@
                  world_entities/projectile.h \
                  world_entities/character_attributes.h \
+                 world_entities/test_gun.h \
                  ai/ai.h \
                  network/synchronisable.h \
@@ -427 +430 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/story_entity.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gun.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/track_manager.Po@am__quote@
@@ -642 +646 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o character_attributes.obj `if test -f 'world_entities/character_attributes.cc'; then $(CYGPATH_W) 'world_entities/character_attributes.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/character_attributes.cc'; fi`
+
+test_gun.o: world_entities/test_gun.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_gun.o -MD -MP -MF "$(DEPDIR)/test_gun.Tpo" -c -o test_gun.o `test -f 'world_entities/test_gun.cc' || echo '$(srcdir)/'`world_entities/test_gun.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_gun.Tpo" "$(DEPDIR)/test_gun.Po"; else rm -f "$(DEPDIR)/test_gun.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_gun.cc' object='test_gun.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_gun.Po' tmpdepfile='$(DEPDIR)/test_gun.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_gun.o `test -f 'world_entities/test_gun.cc' || echo '$(srcdir)/'`world_entities/test_gun.cc
+
+test_gun.obj: world_entities/test_gun.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_gun.obj -MD -MP -MF "$(DEPDIR)/test_gun.Tpo" -c -o test_gun.obj `if test -f 'world_entities/test_gun.cc'; then $(CYGPATH_W) 'world_entities/test_gun.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/test_gun.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_gun.Tpo" "$(DEPDIR)/test_gun.Po"; else rm -f "$(DEPDIR)/test_gun.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_gun.cc' object='test_gun.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_gun.Po' tmpdepfile='$(DEPDIR)/test_gun.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_gun.obj `if test -f 'world_entities/test_gun.cc'; then $(CYGPATH_W) 'world_entities/test_gun.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/test_gun.cc'; fi`
 
 ai.o: ai/ai.cc

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);