Changeset 5679 in orxonox.OLD

Timestamp:

Nov 21, 2005, 10:06:50 PM (18 years ago)

Author:

manuel

Message:

debug commit

Location:

branches/world_entities/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (4 diffs)
• defs/class_id.h (modified) (1 diff)
• world_entities/Makefile.am (modified) (1 diff)
• world_entities/weapons/ground_turret.cc (modified) (4 diffs)
• world_entities/weapons/ground_turret.h (modified) (2 diffs)

branches/world_entities/src/Makefile.am

@@ -62 +62 @@
                   world_entities/weapons/test_gun.cc \
                   world_entities/weapons/turret.cc \
+                  world_entities/weapons/ground_turret.cc \
                   world_entities/weapons/aiming_turret.cc \
                   world_entities/weapons/cannon.cc \

branches/world_entities/src/Makefile.in

@@ -65 +65 @@
         orxonox-weapon.$(OBJEXT) orxonox-projectile.$(OBJEXT) \
         orxonox-test_gun.$(OBJEXT) orxonox-turret.$(OBJEXT) \
+        orxonox-ground_turret.$(OBJEXT) \
         orxonox-aiming_turret.$(OBJEXT) orxonox-cannon.$(OBJEXT) \
         orxonox-test_bullet.$(OBJEXT) orxonox-rocket.$(OBJEXT) \
@@ -258 +259 @@
                   world_entities/weapons/test_gun.cc \
                   world_entities/weapons/turret.cc \
+                  world_entities/weapons/ground_turret.cc \
                   world_entities/weapons/aiming_turret.cc \
                   world_entities/weapons/cannon.cc \
@@ -412 +414 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-crosshair.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-environment.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-ground_turret.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-laser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-laser_power_up.Po@am__quote@
@@ -743 +746 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-turret.obj `if test -f 'world_entities/weapons/turret.cc'; then $(CYGPATH_W) 'world_entities/weapons/turret.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/turret.cc'; fi`
+
+orxonox-ground_turret.o: world_entities/weapons/ground_turret.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-ground_turret.o -MD -MP -MF "$(DEPDIR)/orxonox-ground_turret.Tpo" -c -o orxonox-ground_turret.o `test -f 'world_entities/weapons/ground_turret.cc' || echo '$(srcdir)/'`world_entities/weapons/ground_turret.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-ground_turret.Tpo" "$(DEPDIR)/orxonox-ground_turret.Po"; else rm -f "$(DEPDIR)/orxonox-ground_turret.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/ground_turret.cc' object='orxonox-ground_turret.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-ground_turret.o `test -f 'world_entities/weapons/ground_turret.cc' || echo '$(srcdir)/'`world_entities/weapons/ground_turret.cc
+
+orxonox-ground_turret.obj: world_entities/weapons/ground_turret.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-ground_turret.obj -MD -MP -MF "$(DEPDIR)/orxonox-ground_turret.Tpo" -c -o orxonox-ground_turret.obj `if test -f 'world_entities/weapons/ground_turret.cc'; then $(CYGPATH_W) 'world_entities/weapons/ground_turret.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/ground_turret.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-ground_turret.Tpo" "$(DEPDIR)/orxonox-ground_turret.Po"; else rm -f "$(DEPDIR)/orxonox-ground_turret.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapons/ground_turret.cc' object='orxonox-ground_turret.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-ground_turret.obj `if test -f 'world_entities/weapons/ground_turret.cc'; then $(CYGPATH_W) 'world_entities/weapons/ground_turret.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/ground_turret.cc'; fi`
 
 orxonox-aiming_turret.o: world_entities/weapons/aiming_turret.cc

branches/world_entities/src/defs/class_id.h

@@ -142 +142 @@
   CL_LASER                      =    0x00000242,
   CL_BOMB                       =    0x00000243,
-
+  CL_GROUND_TURRET              =    0x00000244,
 
   // gamePlay (range from 0x00000500 0x000005ff)

branches/world_entities/src/world_entities/Makefile.am

@@ -25 +25 @@
                   weapons/rocket.cc \
                   weapons/laser.cc \
+                  weapons/ground_turret.cc \
                   weapons/crosshair.cc \
                   power_ups/power_up.cc \

branches/world_entities/src/world_entities/weapons/ground_turret.cc

@@ -46 +46 @@
 void GroundTurret::init()
 {
-  this->setClassID(CL_PROTO_WORLD_ENTITY, "GroundTurret");
-
-  /**
-   * @todo: Write CL_PROTO_WORLD_ENTITY INTO THE src/defs/class_id.h (your own definition)
-   */
+  this->setClassID(CL_GROUND_TURRET, "GroundTurret");
 
 }
@@ -63 +59 @@
 {
   // all the clases this Entity is directly derived from must be called in this way, to load all settings.
-  static_cast<WorldEntity*>(this)->loadParam(root);
+//  static_cast<WorldEntity*>(this)->loadParam(root);
 
 
@@ -76 +72 @@
  * @param time the Time to step
  */
-GroundTurret::tick(float time)
-{
-
-}
+//GroundTurret::tick(float time)
+//{
+//
+//}
 
 /**
@@ -98 +94 @@
   glMultMatrixf((float*)matrix);
 
-  if (model)
-    model->draw();
+//  if (model)
+//    model->draw();
   glPopMatrix();
 }

branches/world_entities/src/world_entities/weapons/ground_turret.h

@@ -7 +7 @@
 #define _GROUND_TURRET_H
 
-#include "world_entity.h"
+#include "weapon.h"
 
 //! A Class to ...
-class GroundTurret : public WorldEntity
+class GroundTurret : public Weapon
 {
 
  public:
-  ProtoWorldEntity(const TiXmlElement* root = NULL);
-  virtual ~ProtoWorldEntity();
+  GroundTurret(const TiXmlElement* root = NULL);
+  virtual ~GroundTurret();
 
   void loadParams(const TiXmlElement* root);
@@ -25 +25 @@
 
   virtual void draw() const;
-  virtual void tick(float time);
+//  virtual void tick(float time);
   virtual void collidesWith (WorldEntity* entity, const Vector& location);