Changeset 10542 in orxonox.OLD for trunk/src

Timestamp:

Jan 31, 2007, 5:15:54 AM (18 years ago)

Author:

patrick

Message:

slightly less debug. fixed segfault and better slot setting

Location:

trunk/src/world_entities

Files:

• mount_point.cc (modified) (3 diffs)
• npcs/npc.cc (modified) (1 diff)

trunk/src/world_entities/mount_point.cc

@@ -140 +140 @@
   if( this->_mount != NULL)
   {
-    PRINTF(0)("Got detailed informations\n");
+//     PRINTF(0)("Got detailed informations\n");
     this->_mount->loadParams( root);
 
     if( this->_mount->isA(ParticleSystem::staticClassID()))
     {
-      PRINTF(0)("got particle system. attaching it to mp\n");
+//       PRINTF(0)("got particle system. attaching it to mp\n");
       dynamic_cast<ParticleSystem*>(this->_mount)->attachEmmittersTo(this, Vector(0,0,0),
                                     this->getRelDir()*Quaternion(M_PI, Vector(0,1,0)));
@@ -177 +177 @@
     if( obj->isA( WorldEntity::staticClassID()))
     {
-      PRINTF(0)("Mount Point created a %s\n", obj->getCName());
+//       PRINTF(0)("Mount Point created a %s\n", obj->getCName());
       // cast down the object to WE
       this->_mount = dynamic_cast<WorldEntity*>(obj);
@@ -190 +190 @@
     else if( obj->isA( WeaponSlot::staticClassID()))
     {
-      PRINTF(0)("=========+>we got a weapon slot\n");
+//       PRINTF(0)("=========+>we got a weapon slot\n");
 
       // cast down the object to WE

trunk/src/world_entities/npcs/npc.cc

@@ -173 +173 @@
   this->getWeaponManager().setSlotCount(7);
 
+  this->getWeaponManager().setSlotPosition(0, Vector(-2.6, .1, -3.0));
+  this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+
+  this->getWeaponManager().setSlotPosition(1, Vector(-2.6, .1, 3.0));
+  this->getWeaponManager().setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+
+  this->getWeaponManager().setSlotPosition(2, Vector(-1.5, .5, -.5));
+  this->getWeaponManager().setSlotDirection(2, Quaternion(-M_PI_4*.5, Vector(1,0,0)));
+
+  this->getWeaponManager().setSlotPosition(3, Vector(-1.5, .5, .5));
+  this->getWeaponManager().setSlotDirection(3, Quaternion(M_PI_4*.5, Vector(1,0,0)));
+
+  this->getWeaponManager().setSlotPosition(4, Vector(-1.5, -.5, .5));
+  this->getWeaponManager().setSlotDirection(4, Quaternion(-M_PI_4*.5+M_PI, Vector(1,0,0)));
+
+  this->getWeaponManager().setSlotPosition(5, Vector(-1.5, -.5, -.5));
+  this->getWeaponManager().setSlotDirection(5, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0)));
+
+  this->getWeaponManager().setSlotPosition(6, Vector(-1, 0.0, 0));
+  this->getWeaponManager().setSlotCapability(6, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+
 
   // 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());
+      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().setSlotPosition(0, Vector(-2.6, .1, -3.0));
-  this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-  this->getWeaponManager().setSlotPosition(1, Vector(-2.6, .1, 3.0));
-  this->getWeaponManager().setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-  this->getWeaponManager().setSlotPosition(2, Vector(-1.5, .5, -.5));
-  this->getWeaponManager().setSlotDirection(2, Quaternion(-M_PI_4*.5, Vector(1,0,0)));
-
-  this->getWeaponManager().setSlotPosition(3, Vector(-1.5, .5, .5));
-  this->getWeaponManager().setSlotDirection(3, Quaternion(M_PI_4*.5, Vector(1,0,0)));
-
-  this->getWeaponManager().setSlotPosition(4, Vector(-1.5, -.5, .5));
-  this->getWeaponManager().setSlotDirection(4, Quaternion(-M_PI_4*.5+M_PI, Vector(1,0,0)));
-
-  this->getWeaponManager().setSlotPosition(5, Vector(-1.5, -.5, -.5));
-  this->getWeaponManager().setSlotDirection(5, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0)));
-
-  this->getWeaponManager().setSlotPosition(6, Vector(-1, 0.0, 0));
-  this->getWeaponManager().setSlotCapability(6, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
   this->getWeaponManager().getFixedTarget()->setParent(this);
   this->getWeaponManager().getFixedTarget()->setRelCoor(100000,0,0);
-
-
-
-
 }