Changeset 3077 for code/trunk/src

Timestamp:

May 25, 2009, 11:16:27 PM (16 years ago)

Author:

landauf

Message:

Added Attacher - a class which attaches itself to an object with a given name

Location:

code/trunk/src/orxonox/objects/worldentities

Files:

• Attacher.cc (added)
• Attacher.h (added)
• CMakeLists.txt (modified) (1 diff)
• WorldEntity.cc (modified) (3 diffs)
• WorldEntity.h (modified) (2 diffs)

code/trunk/src/orxonox/objects/worldentities/CMakeLists.txt

@@ -6 +6 @@
   ControllableEntity.cc
 
+  Attacher.cc
   Backlight.cc
   Billboard.cc

code/trunk/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -69 +69 @@
         this->parent_ = 0;
         this->parentID_ = OBJECTID_UNKNOWN;
+        this->bDeleteWithParent_ = true;
 
         this->node_->setPosition(Vector3::ZERO);
@@ -108 +109 @@
 
             for (std::set<WorldEntity*>::const_iterator it = this->children_.begin(); it != this->children_.end(); )
-                delete (*(it++));
+            {
+                if ((*it)->getDeleteWithParent())
+                    delete (*(it++));
+                else
+                {
+                    this->detach(*it);
+                    (*it)->setPosition(this->getWorldPosition());
+                    ++it;
+                }
+            }
 
             if (this->physicalBody_)
@@ -138 +148 @@
         XMLPortParamLoadOnly(WorldEntity, "pitch",       pitch_xmlport,        xmlelement, mode);
         XMLPortParamLoadOnly(WorldEntity, "roll",        roll_xmlport,         xmlelement, mode);
+        XMLPortParam        (WorldEntity, "deletewithparent", setDeleteWithParent, getDeleteWithParent, xmlelement, mode);
 
         // Physics

code/trunk/src/orxonox/objects/worldentities/WorldEntity.h

@@ -173 +173 @@
             void detachFromNode(Ogre::SceneNode* node);
 
+            inline void setDeleteWithParent(bool value)
+                { this->bDeleteWithParent_ = value; }
+            inline bool getDeleteWithParent() const
+                { return this->bDeleteWithParent_; }
+
             void notifyChildPropsChanged();
 
@@ -200 +205 @@
             unsigned int parentID_;
             std::set<WorldEntity*> children_;
+            bool bDeleteWithParent_;