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

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.h (modified) (4 diffs)

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

@@ -59 +59 @@
     xmlcontainer##loadfunction##savefunction->port(this, xmlelement, loading)
 
-#define XMLPortObject(classname, objectclass, sectionname, loadfunction, savefunction, xmlelement, loading) \
+#define XMLPortObject(classname, objectclass, sectionname, loadfunction, savefunction, xmlelement, loading, bApplyLoaderMask) \
     orxonox::XMLPortClassObjectContainer<classname, objectclass>* xmlcontainer##loadfunction##savefunction = (orxonox::XMLPortClassObjectContainer<classname, objectclass>*)(this->getIdentifier()->getXMLPortObjectContainer(sectionname)); \
     if (!xmlcontainer##loadfunction##savefunction) \
     { \
-        xmlcontainer##loadfunction##savefunction = new orxonox::XMLPortClassObjectContainer<classname, objectclass>(this->getIdentifier()->getName(), std::string(sectionname), &classname::loadfunction, &classname::savefunction); \
+        xmlcontainer##loadfunction##savefunction = new orxonox::XMLPortClassObjectContainer<classname, objectclass>(this->getIdentifier()->getName(), std::string(sectionname), &classname::loadfunction, &classname::savefunction, bApplyLoaderMask); \
         this->getIdentifier()->addXMLPortObjectContainer(sectionname, xmlcontainer##loadfunction##savefunction); \
     } \
@@ -196 +196 @@
             XMLPortObjectContainer& description(const std::string description);
             const std::string& getDescription();
-            static bool identifierIsIncludedInLoaderMask(const Identifier* identifier);
+            bool identifierIsIncludedInLoaderMask(const Identifier* identifier);
 
         protected:
             std::string classname_;
             std::string sectionname_;
+            bool bApplyLoaderMask_;
 
         private:
@@ -211 +212 @@
     {
         public:
-            XMLPortClassObjectContainer(const std::string classname, const std::string sectionname, void (T::*loadfunction)(O*), const O* (T::*savefunction)(unsigned int) const)
+            XMLPortClassObjectContainer(const std::string classname, const std::string sectionname, void (T::*loadfunction)(O*), const O* (T::*savefunction)(unsigned int) const, bool bApplyLoaderMask)
             {
                 this->classname_ = classname;
@@ -217 +218 @@
                 this->loadfunction_ = loadfunction;
                 this->savefunction_ = savefunction;
+                this->bApplyLoaderMask_ = bApplyLoaderMask;
             }