Changeset 10540 in orxonox.OLD for trunk/src

Timestamp:

Jan 31, 2007, 5:04:11 AM (18 years ago)

Author:

patrick

Message:

mounting point rewritten partially, for weapon slots

Location:

trunk/src/world_entities

Files:

• mount_point.cc (modified) (1 diff)
• mount_point.h (modified) (1 diff)
• npcs/npc.cc (modified) (2 diffs)
• world_entity.cc (modified) (3 diffs)
• world_entity.h (modified) (4 diffs)

trunk/src/world_entities/mount_point.cc

@@ -140 +140 @@
   if( this->_mount != NULL)
   {
-    PRINTF(0)("Got detail informations\n");
+    PRINTF(0)("Got detailed informations\n");
     this->_mount->loadParams( root);
 

trunk/src/world_entities/mount_point.h

@@ -31 +31 @@
     void mount(PNode* entity);
     void unmount();
-
+    PNode* getMount() { return this->_mount; }
 
   private:

trunk/src/world_entities/npcs/npc.cc

@@ -52 +52 @@
 #include "weapons/turret.h"
 #include "weapons/cannon.h"
+
+#include "mount_point.h"
+#include "weapons/weapon_slot.h"
 
 #include "npc.h"
@@ -169 +172 @@
 
   this->getWeaponManager().setSlotCount(7);
+
+
+  // now get slots from the mount points
+//   const std::vector<MountPoint*>::const_iterator it = this->beginMountPoints();
+//   std::vector<MountPoint*> list = this->getMountPoints();
+  std::map<int, MountPoint*>::iterator it = this->mountPointMap.begin();
+//   PRINTF(0)("\n\n\n\nsize: %i\n", this->mountPointMap.size());
+  for( ;it != this->mountPointMap.end(); it++)
+  {
+    PRINTF(0)("5555555555 this npc got mountss\n\n\n");
+    WeaponSlot* ws = dynamic_cast<WeaponSlot*>((*it).second->getMount());
+    printf("more\n");
+    if( ws != NULL && ws->isA(WeaponSlot::staticClassID()))
+    {
+      //
+      PRINTF(0)("5555555555 this npc got slots\n\n\n");
+
+      this->getWeaponManager().setSlotPosition(ws->getWeaponSlot(), ws->getRelCoor());
+      this->getWeaponManager().setSlotDirection(ws->getWeaponSlot(), ws->getRelDir());
+    }
+  }
+
+
 
   this->getWeaponManager().setSlotPosition(0, Vector(-2.6, .1, -3.0));

trunk/src/world_entities/world_entity.cc

@@ -416 +416 @@
 {
   // add the mount point at the last position
-  this->mountPoints.push_back(mountPoint);
+//   this->mountPointMap[](mountPoint);
+  assert(false);
 }
 
@@ -425 +426 @@
 void WorldEntity::addMountPoint(int slot, MountPoint* mountPoint)
 {
-  if( this->mountPoints.capacity() < (unsigned int)slot)
-  {
-    // reserve 5 more slots than needed so this function is called as rare as possible
-    this->mountPoints.reserve(slot + 5);
-  }
-  else if( this->mountPoints[slot] != NULL)
-  {
-    PRINTF(4)("adding a mount point to a slot, that already is occupied! ignoring - maybe some object did not get connected well (object: %s)\n", this->getClassCName());
+  if( this->mountPointMap.find(slot) == this->mountPointMap.end())
+  {
+    PRINTF(2)("adding a mount point to a slot, that already is occupied! ignoring - maybe some object did not get connected well (object: %s)\n", this->getClassCName());
   }
 
   // just connect the mount point
-  this->mountPoints[slot] = mountPoint;
+  this->mountPointMap[slot] = mountPoint;
 }
 
@@ -446 +442 @@
 void WorldEntity::mount(int slot, WorldEntity* entity)
 {
-  if( this->mountPoints[slot] == NULL)
+  if( this->mountPointMap.find(slot) == this->mountPointMap.end())
   {
     PRINTF(0)("you tried to add an entity to a mount point that doesn't exist (slot %i)\n", slot);

trunk/src/world_entities/world_entity.h

@@ -62 +62 @@
   void mount(int slot, WorldEntity* entity);
   void unmount(int slot);
+
+
 
   /** @param visibility if the Entity should be visible (been draw) */
@@ -176 +178 @@
   ;  ///FIXME
   void debugEntity() const;
-  
+
   void pauseTrack(bool stop);
 
@@ -194 +196 @@
   void updateHealthWidget();
   void addTrack(const TiXmlElement* root);
-  
+
+
+
+  protected:
+      std::vector<MountPoint*> mountPoints;       //!< A list with mount points for this model
+      std::map<int, MountPoint*> mountPointMap;
+
 
 
@@ -206 +214 @@
   std::vector<Model*>     models;             //!< The model that should be loaded for this entity.
   ObjectInformationFile*  oiFile;             //!< Reference to the object information file discribing the model of this WE
-  std::vector<MountPoint*> mountPoints;       //!< A list with mount points for this model
   std::string             md2TextureFileName; //!< the file name of the md2 model texture, only if this
   std::string             modelLODName;       //!< the name of the model lod file