Changeset 878 for code/branches/core2/src/orxonox/core/Loader.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/Loader.cc (modified) (2 diffs)

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;