Changeset 10058 in orxonox.OLD

Timestamp:

Dec 13, 2006, 10:44:37 AM (17 years ago)

Author:

patrick

Message:

mount point interaction

Location:

branches/mount_points/src/world_entities

Files:

• mount_point.cc (modified) (3 diffs)
• mount_point.h (modified) (1 diff)
• world_entity.cc (modified) (4 diffs)

branches/mount_points/src/world_entities/mount_point.cc

@@ -76 +76 @@
   this->toList(OM_GROUP_00);
 
-  this->mount = NULL;
+  this->_mount = NULL;
 }
 
@@ -126 +126 @@
  */
 void MountPoint::mount(WorldEntity* entity)
-{}
+{
+  this->_mount = entity;
+}
 
 
@@ -133 +135 @@
  */
 void MountPoint::unmount()
-{}
+{
+  this->_mount = NULL;
+}
+

branches/mount_points/src/world_entities/mount_point.h

@@ -31 +31 @@
 
   private:
-    WorldEntity*         mount;       //!< the entity mounted at this mount point
+    WorldEntity*         _mount;       //!< the entity mounted at this mount point
 
 };

branches/mount_points/src/world_entities/world_entity.cc

@@ -24 +24 @@
 #include "md2/md2Model.h"
 #include "md3/md3_model.h"
+
 #include "oif/object_information_file.h"
+#include "mount_point.h"
 
 #include "aabb_tree_node.h"
@@ -334 +336 @@
   if( this->mountPoints[slot] != NULL)
   {
-    PRINTF(0)("adding a mount point to a slot, that already exists! ignoring - maybe some object do not get connected well (object: %s)", this->getClassCName());
+    PRINTF(0)("adding a mount point to a slot, that already exists! ignoring - maybe some object do not get connected well (object: %s)\n", this->getClassCName());
   }
 
@@ -348 +350 @@
 void WorldEntity::mount(int slot, WorldEntity* entity)
 {
-
+  if( this->mountPoints[slot] == NULL)
+  {
+    PRINTF(0)("you tried to add an entity to a mount point that doesn't exist (slot %i)\n", slot);
+    return;
+  }
+
+  // mount the entity
+  this->mountPoints[slot]->mount(entity);
 }
 
@@ -358 +367 @@
 void WorldEntity::unmount(int slot)
 {
+    if( this->mountPoints[slot] == NULL)
+  {
+    PRINTF(0)("you tried to remove an entity from a mount point that doesn't exist (slot %i)\n", slot);
+    return;
+  }
+
+  // unmount the entity
+  this->mountPoints[slot]->unmount();
 }