Changeset 10549 in orxonox.OLD for trunk/src

Timestamp:

Jan 31, 2007, 6:30:06 AM (18 years ago)

Author:

patrick

Message:

more on mounting weapons

Location:

trunk/src/world_entities

Files:

• mount_point.cc (modified) (3 diffs)
• mount_point.h (modified) (2 diffs)
• npcs/npc.cc (modified) (2 diffs)

trunk/src/world_entities/mount_point.cc

@@ -44 +44 @@
   this->setRelCoor( center);
   this->setRelDir( Quaternion(forward, up));
+
+  this->_center = center;
+  this->_up = up;
+  this->_forward = forward;
 
   this->init();
@@ -191 +195 @@
     {
       PRINTF(0)("=========+>we got a weapon slot at\n");
-      this->getRelCoor().debug();
+      this->getAbsCoor().debug();
+      this->_center.debug();
 
 
@@ -198 +203 @@
 
       // now set the position, direction and reparent it to this node
-      this->_mount->setRelCoor( this->getRelCoor());
-      this->_mount->setRelDir( this->getRelDir());
+      this->_mount->setAbsCoor( this->_center);
+      this->_mount->setAbsDir( this->getAbsDir());
       this->_mount->setParent( this);
     }

trunk/src/world_entities/mount_point.h

@@ -28 +28 @@
     void debugDraw() const;
 
+    inline const Vector& getCenter() { return this->_center; }
 
     void mount(PNode* entity);
@@ -39 +40 @@
     std::string          _description; //!< string containing an optional description
 
+    Vector               _center;
+    Vector               _up;
+    Vector               _forward;
+
 };
 

trunk/src/world_entities/npcs/npc.cc

@@ -304 +304 @@
   this->setAI( false);
   this->setAbsCoor(-10000,-10000,-10000);
-  
+
 
 }
@@ -409 +409 @@
         int slot = ws->getWeaponSlot();
         int side = ws->getWeaponSide();
-        this->getWeaponManager().setSlotPosition(slot, ws->getRelCoor());
+        this->getWeaponManager().setSlotPosition(slot, (*it).second->getCenter());
         this->getWeaponManager().setSlotDirection(slot, ws->getRelDir());
         PRINTF(0)("setting slot %i\n", slot);
-        ws->getRelCoor().debug();
+        (*it).second->getCenter().debug();
       }
     }