Changeset 10534 in orxonox.OLD for trunk/src

Timestamp:

Jan 31, 2007, 3:13:28 AM (18 years ago)

Author:

patrick

Message:

mounting weapon slots

Location:

trunk/src/world_entities

Files:

• mount_point.cc (modified) (2 diffs)
• mount_point.h (modified) (1 diff)
• weapons/weapon_slot.cc (modified) (2 diffs)
• weapons/weapon_slot.h (modified) (1 diff)

trunk/src/world_entities/mount_point.cc

@@ -186 +186 @@
       this->_mount->setParent( this);
 
-      this->_mount->toList((OM_LIST)(this->getOMListNumber()));
+      dynamic_cast<WorldEntity*>(this->_mount)->toList((OM_LIST)(this->getOMListNumber()));
     }
     else if( obj->isA( WeaponSlot::staticClassID()))
     {
       PRINTF(0)("=========+>we got a weapon slot\n");
+
+      // cast down the object to WE
+      this->_mount = dynamic_cast<WeaponSlot*>(obj);
+
+      // now set the position, direction and reparent it to this node
+      this->_mount->setAbsCoor( this->getAbsCoor());
+      this->_mount->setAbsDir( this->getAbsDir());
+      this->_mount->setParent( this);
     }
   }
@@ -232 +240 @@
  * @param entity entity to be added
  */
-void MountPoint::mount(WorldEntity* entity)
+void MountPoint::mount(PNode* entity)
 {
   this->_mount = entity;

trunk/src/world_entities/mount_point.h

@@ -29 +29 @@
 
 
-    void mount(WorldEntity* entity);
+    void mount(PNode* entity);
     void unmount();
 
 
   private:
-    WorldEntity*         _mount;       //!< the entity mounted at this mount point
+    PNode*               _mount;       //!< the entity mounted at this mount point
     std::string          _name;        //!< the name of the mount point
 

trunk/src/world_entities/weapons/weapon_slot.cc

@@ -23 +23 @@
 
 ObjectListDefinition(WeaponSlot);
+CREATE_FACTORY(WeaponSlot);
+
 
 
@@ -51 +53 @@
   LoadParam(root, "WeaponClass", this, WeaponSlot, setWeaponClass)
   .describe("Sets the class this mount points should host");
+
+  LoadParam(root, "slot", this, WeaponSlot, setWeaponConfig)
+      .describe("sets the weapon slot");
 }
 

trunk/src/world_entities/weapons/weapon_slot.h

@@ -36 +36 @@
   inline void setNextWeapon(Weapon* weapon) { this->nextWeapon = weapon; }
 
+
+  inline void setWeaponConfig(int slot, int side) { this->weaponSlot = slot; this->weaponSide = side; }
+  inline int getWeaponSlot() { return this->weaponSlot; }
+  inline int getWeaponSide() { return this->weaponSide; }
+
+
 private:
+
+  int           weaponSlot;
+  int           weaponSide;
 
   long          capability;             //!< the capabilities of the Slot @see WeaponSlotCapability.