Changeset 856 for code/branches/core/src/orxonox/objects

Timestamp:

Mar 5, 2008, 11:07:16 PM (17 years ago)

Author:

landauf

Message:

loader seems to work now
added function/macro XMLPortObject to load objects as subobjects into another object (like attaching a weapon to a player) + nice debug output with indentation

Location:

code/branches/core/src/orxonox/objects

Files:

• WorldEntity.cc (modified) (3 diffs)
• WorldEntity.h (modified) (2 diffs)

code/branches/core/src/orxonox/objects/WorldEntity.cc

@@ -167 +167 @@
     Element& WorldEntity::XMLPort(Element& xmlelement, bool loading)
     {
-std::cout << "2_1: " << this->getPosition() << std::endl;
         BaseObject::XMLPort(xmlelement, loading);
 
@@ -178 +177 @@
         XMLPortParam(WorldEntity, "rotationAxis", setRotationAxis, getRotationAxis, xmlelement, loading);
         XMLPortParam(WorldEntity, "rotationRate", setRotationRate, getRotationRate, xmlelement, loading);
-std::cout << "2_2: " << this->getPosition() << std::endl;
+
+        XMLPortObject(WorldEntity, WorldEntity, "attached", attachWorldEntity, getAttachedWorldEntity, xmlelement, loading);
 
         return xmlelement;
@@ -210 +210 @@
       registerVar( (void*) &(this->getRotationAxis().z), sizeof(this->getRotationAxis().z), network::DATA);*/
     }
+
+    void WorldEntity::attachWorldEntity(WorldEntity* entity)
+    {
+        this->attachedWorldEntities_.push_back(entity);
+    }
+
+    const WorldEntity* WorldEntity::getAttachedWorldEntity(unsigned int index)
+    {
+        if (index < this->attachedWorldEntities_.size())
+            return this->attachedWorldEntities_[index];
+        else
+            return 0;
+    }
 }

code/branches/core/src/orxonox/objects/WorldEntity.h

@@ -27 +27 @@
             virtual Element& XMLPort(Element& xmlelement, bool loading);
             bool create();
+
+            void attachWorldEntity(WorldEntity* entity);
+            const WorldEntity* getAttachedWorldEntity(unsigned int index);
 
             inline Ogre::SceneNode* getNode()
@@ -156 +159 @@
             Ogre::SceneNode* node_;
             bool bStatic_;
+            std::vector<WorldEntity*> attachedWorldEntities_;
     };
 }