Changeset 878 for code/branches/core2/src/orxonox/core/XMLPort.cc

Timestamp:

Mar 10, 2008, 4:34:20 PM (16 years ago)

Author:

landauf

Message:

added boolean bApplyLoaderMask to the XMLPortObject macro to determine whether the ClassTreeMask from the Loader should be applied or not (the idea is: objects included in excluded objects are excluded too, no matter what the mask sais. but objects included in a namespace or directly in a level-file are filtered by the mask.)

File:

• code/branches/core2/src/orxonox/core/XMLPort.cc (modified) (3 diffs)

code/branches/core2/src/orxonox/core/XMLPort.cc

@@ -29 +29 @@
 #include "Language.h"
 #include "Loader.h"
+#include "Namespace.h"
+#include "CoreIncludes.h"
 
 namespace orxonox
@@ -65 +67 @@
     {
         this->bAddedDescription_ = false;
+        this->bApplyLoaderMask_ = false;
     }
 
@@ -86 +89 @@
     bool XMLPortObjectContainer::identifierIsIncludedInLoaderMask(const Identifier* identifier)
     {
-        return Loader::currentMask_s.isIncluded(identifier);
+        return ((!this->bApplyLoaderMask_) || identifier->isA(Class(Namespace)) || Loader::currentMask_s.isIncluded(identifier));
     }
 }