Changeset 10546 in orxonox.OLD for trunk

Timestamp:

Jan 31, 2007, 5:44:06 AM (17 years ago)

Author:

patrick

Message:

debug, and better slot pos

Location:

trunk/src/world_entities

Files:

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

trunk/src/world_entities/mount_point.cc

@@ -190 +190 @@
     else if( obj->isA( WeaponSlot::staticClassID()))
     {
-//       PRINTF(0)("=========+>we got a weapon slot\n");
+      PRINTF(0)("=========+>we got a weapon slot at\n");
+      this->getRelCoor().debug();
+
 
       // cast down the object to WE
@@ -196 +198 @@
 
       // now set the position, direction and reparent it to this node
-      this->_mount->setAbsCoor( this->getAbsCoor());
-      this->_mount->setAbsDir( this->getAbsDir());
+      this->_mount->setRelCoor( this->getRelCoor());
+      this->_mount->setRelDir( this->getRelDir());
       this->_mount->setParent( this);
     }

trunk/src/world_entities/npcs/npc.cc

@@ -195 +195 @@
 
 
-  // now get slots from the mount points
-  std::map<int, MountPoint*>::iterator it = this->mountPointMap.begin();
-  for( ;it != this->mountPointMap.end(); it++)
-  {
-    WeaponSlot* ws = dynamic_cast<WeaponSlot*>((*it).second->getMount());
-    if( ws != NULL && ws->isA(WeaponSlot::staticClassID()))
-    {
-      int slot = ws->getWeaponSlot();
-      int side = ws->getWeaponSide();
-      this->getWeaponManager().setSlotPosition(slot, ws->getRelCoor());
-      this->getWeaponManager().setSlotDirection(slot, ws->getRelDir());
-      PRINTF(0)("setting slot %i\n", slot);
-    }
-  }
 
   this->getWeaponManager().getFixedTarget()->setParent(this);
   this->getWeaponManager().getFixedTarget()->setRelCoor(100000,0,0);
+  this->bInit = false;
 }
 
@@ -411 +398 @@
 void NPC::tick(float dt)
 {
+  if( !this->bInit)
+  {
+    // now get slots from the mount points
+    std::map<int, MountPoint*>::iterator it = this->mountPointMap.begin();
+    for( ;it != this->mountPointMap.end(); it++)
+    {
+      WeaponSlot* ws = dynamic_cast<WeaponSlot*>((*it).second->getMount());
+      if( ws != NULL && ws->isA(WeaponSlot::staticClassID()))
+      {
+        int slot = ws->getWeaponSlot();
+        int side = ws->getWeaponSide();
+        this->getWeaponManager().setSlotPosition(slot, ws->getRelCoor());
+        this->getWeaponManager().setSlotDirection(slot, ws->getRelDir());
+        PRINTF(0)("setting slot %i\n", slot);
+        ws->getRelCoor().debug();
+      }
+    }
+  this->bInit = true;
+  }
+
+
+
   this->weaponMan.tick(dt);
   if (this->bFire)

trunk/src/world_entities/npcs/npc.h

@@ -57 +57 @@
   WeaponManager         weaponMan;    //!< weapon manager
   bool                  bFire;        //!< fire
+  bool                  bInit;
 
   AIModule*             aiModule;

trunk/src/world_entities/world_entity.cc

@@ -426 +426 @@
 void WorldEntity::addMountPoint(int slot, MountPoint* mountPoint)
 {
-  if( this->mountPointMap.find(slot) == this->mountPointMap.end())
+  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());
@@ -442 +442 @@
 void WorldEntity::mount(int slot, WorldEntity* entity)
 {
-  if( this->mountPointMap.find(slot) == this->mountPointMap.end())
+  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);