Changeset 878 for code/branches/core2/src

Timestamp:

Mar 10, 2008, 4:34:20 PM (17 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.)

Location:

code/branches/core2/src/orxonox

Files:

• core/BaseObject.cc (modified) (1 diff)
• core/Loader.cc (modified) (2 diffs)
• core/Namespace.cc (modified) (2 diffs)
• core/Namespace.h (modified) (1 diff)
• core/XMLPort.cc (modified) (3 diffs)
• core/XMLPort.h (modified) (4 diffs)
• objects/WorldEntity.cc (modified) (1 diff)

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

@@ -52 +52 @@
         this->bVisible_ = true;
         this->level_ = 0;
+        this->namespace_ = 0;
     }
 

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

@@ -33 +33 @@
 #include "Debug.h"
 #include "CoreIncludes.h"
+#include "Namespace.h"
 
 #include "util/tinyxml/ticpp.h"
@@ -120 +121 @@
                 if (identifier)
                 {
-                    if (Loader::currentMask_s.isIncluded(identifier))
+                    if (identifier->isA(Class(Namespace)) || Loader::currentMask_s.isIncluded(identifier))
                     {
                         COUT(4) << "  fabricating " << child->Value() << "..." << std::endl;

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

@@ -37 +37 @@
     {
         RegisterObject(Namespace);
+
+        this->representingNamespace_ = 0;
     }
 
@@ -53 +55 @@
         BaseObject::XMLPort(xmlelement, loading);
 
-        XMLPortObject(Namespace, BaseObject, "", loadObjects, saveObjects, xmlelement, loading);
+        XMLPortObject(Namespace, BaseObject, "", loadObjects, saveObjects, xmlelement, loading, true);
     }
 

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

@@ -51 +51 @@
         private:
             std::list<Namespace*> namespaces_;
+            Namespace* representingNamespace_;
     };
 }

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));
     }
 }

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;
             }
 

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

@@ -182 +182 @@
         XMLPortParam(WorldEntity, "rotationRate", setRotationRate, getRotationRate, xmlelement, loading);
 
-        XMLPortObject(WorldEntity, WorldEntity, "attached", attachWorldEntity, getAttachedWorldEntity, xmlelement, loading);
+        XMLPortObject(WorldEntity, WorldEntity, "attached", attachWorldEntity, getAttachedWorldEntity, xmlelement, loading, false);
     }