Changeset 6489

Timestamp:

Mar 8, 2010, 8:09:17 AM (15 years ago)

Author:

dafrick

Message:

Changed changedActivity and changedVisibility such that when transiting to inactive/invisible the current activity/visibility of all atached objects is saved by them and restored once the parent node transits to active/visible again.

Location:

code/branches/pickup3/src/orxonox/worldentities

Files:

• WorldEntity.cc (modified) (3 diffs)
• WorldEntity.h (modified) (1 diff)

code/branches/pickup3/src/orxonox/worldentities/WorldEntity.cc

@@ -81 +81 @@
         this->node_->setPosition(Vector3::ZERO);
         this->node_->setOrientation(Quaternion::IDENTITY);
+        
+        // Activity and visibility memory.
+        this->bActiveMem_ = true;
+        this->bVisibleMem_ = true;
 
 
@@ -212 +216 @@
         for (std::set<WorldEntity*>::const_iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); it++)
         {
-            (*it)->setActive(this->isActive());
+            if(!this->isActive())
+            {
+                (*it)->bActiveMem_ = (*it)->isActive();
+                (*it)->setActive(this->isActive());
+            }
+            else
+            {
+                (*it)->setActive((*it)->bActiveMem_);
+            }
         }
     }
@@ -226 +238 @@
         for (std::set<WorldEntity*>::const_iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); it++)
         {
-            (*it)->setVisible(this->isVisible());
+            if(!this->isVisible())
+            {
+                (*it)->bVisibleMem_ = (*it)->isVisible();
+                (*it)->setVisible(this->isVisible());
+            }
+            else
+            {
+                (*it)->setVisible((*it)->bVisibleMem_);
+            }
         }
     }

code/branches/pickup3/src/orxonox/worldentities/WorldEntity.h

@@ -235 +235 @@
             std::set<WorldEntity*> children_;
             bool bDeleteWithParent_;
+            
+            bool bActiveMem_;
+            bool bVisibleMem_;