Changeset 6170 in orxonox.OLD

Timestamp:

Dec 20, 2005, 12:59:06 AM (18 years ago)

Author:

patrick

Message:

christmas: link error

Location:

branches/christmas_branche/src

Files:

• Makefile.am (modified) (2 diffs)
• lib/graphics/importer/md2Model.h (modified) (1 diff)
• world_entities/Makefile.am (modified) (1 diff)
• world_entities/creatures/md2_creature.cc (modified) (3 diffs)
• world_entities/world_entity.h (modified) (1 diff)

branches/christmas_branche/src/Makefile.am

@@ -86 +86 @@
                   world_entities/space_ships/space_ship.cc \
                   world_entities/space_ships/helicopter.cc \
+                  world_entities/creatures/md2_creature.cc \
                   world_entities/spawning_point.cc \
                   subprojects/benchmark.cc
@@ -133 +134 @@
                  world_entities/space_ships/space_ship.h \
                  world_entities/space_ships/helicopter.h \
+                 world_entities/creatures/md2_creature.h \
                  world_entities/spawning_point.h \
                  defs/stdincl.h \

branches/christmas_branche/src/lib/graphics/importer/md2Model.h

@@ -152 +152 @@
   void scaleModel(float scaleFactor) { this->scaleFactor = scaleFactor;}
 
-  void tick(float dtS);
+  virtual void tick(float dtS);
   void debug();
 

branches/christmas_branche/src/world_entities/Makefile.am

@@ -50 +50 @@
                  test_entity.h \
                  space_ships/space_ship.h \
-                 creatures/md2_creature.h \
+                 creatures/md2_creature.cc \
                  weapons/weapon_manager.h \
                  weapons/weapon.h \

branches/christmas_branche/src/world_entities/creatures/md2_creature.cc

@@ -21 +21 @@
 
 #include "objModel.h"
+#include "md2Model.h"
 #include "resource_manager.h"
 
@@ -112 +113 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
-  EventHandler::getInstance()->grabEvents(true);
+//   EventHandler::getInstance()->grabEvents(true);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;
@@ -253 +254 @@
 {
 
+  if( likely(this->models[0] != NULL))
+    ((MD2Model*)this->models[0])->tick(time);
+
+
   // MD2Creature controlled movement
   this->calculateVelocity(time);

branches/christmas_branche/src/world_entities/world_entity.h

@@ -72 +72 @@
   /** @returns a Reference to the Iterator */
   std::list<WorldEntity*>::iterator& getEntityIterator() { return this->objectListIterator; }
+
+
  protected:
   //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
+   std::vector<Model*>     models;             //!< The model that should be loaded for this entity.
 
  private:
-  std::vector<Model*>     models;             //!< The model that should be loaded for this entity.
   bool                    supportsLOD;        //!< If this model format supports LOD (level of detail) this is true
   BVTree*                 obbTree;            //!< this is the obb tree reference needed for collision detection