Changeset 7614

Timestamp:

Nov 4, 2010, 5:01:40 PM (14 years ago)

Author:

dafrick

Message:

Trying out some stuff.

Location:

code/branches/releasetodo

Files:

• data/levels/notifications.oxw (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/Level.cc (modified) (1 diff)
• src/orxonox/LevelInfo.cc (added)
• src/orxonox/LevelInfo.h (added)
• src/orxonox/LevelManager.cc (modified) (3 diffs)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)

code/branches/releasetodo/data/levels/notifications.oxw

@@ -5 +5 @@
   include("templates/lodinformation.oxt")
 ?>
+
+<LevelInfo
+ name = "Notifications showcase"
+ description = "Level to test and showcase notifications."
+ tags = "test, showcase, notifications"
+/>
 
 <Level

code/branches/releasetodo/src/orxonox/CMakeLists.txt

@@ -25 +25 @@
 SET_SOURCE_FILES(ORXONOX_SRC_FILES
   Level.cc
+  LevelInfo.cc
   LevelManager.cc
   Main.cc
@@ -58 +59 @@
   TOLUA_FILES
     ChatInputHandler.h
+    LevelInfo.h
     LevelManager.h
     MoodManager.h

code/branches/releasetodo/src/orxonox/Level.cc

@@ -76 +76 @@
         XMLPortObject(Level, MeshLodInformation, "lodinformation", addLodInfo, getLodInfo, xmlelement, mode);
         XMLPortObjectExtended(Level, BaseObject, "", addObject, getObject, xmlelement, mode, true, false);
-}
+    }
 
     void Level::registerVariables()

code/branches/releasetodo/src/orxonox/LevelManager.cc

@@ -32 +32 @@
 
 #include "util/ScopedSingletonManager.h"
+#include "core/ClassTreeMask.h"
 #include "core/CommandLineParser.h"
 #include "core/ConfigValueIncludes.h"
@@ -37 +38 @@
 #include "core/Loader.h"
 #include "core/Resource.h"
+#include "core/XMLFile.h"
 #include "PlayerManager.h"
 #include "Level.h"
+#include "LevelInfo.h"
 
 namespace orxonox
@@ -142 +145 @@
             {
                 size_t pos = it->find(".oxw");
+                COUT(0) << *it << std::endl;
+                XMLFile file = XMLFile(*it);
+                ClassTreeMask mask = ClassTreeMask();
+                mask.exclude(ClassIdentifier<BaseObject>::getIdentifier());
+                mask.include(ClassIdentifier<LevelInfo>::getIdentifier());
+                Loader::load(&file, mask);
+                
                 this->availableLevels_.push_back(it->substr(0, pos));
             }
         }
+
     }
 }

code/branches/releasetodo/src/orxonox/OrxonoxPrereqs.h

@@ -67 +67 @@
     class CameraManager;
     class Level;
+    class LevelInfo;
     class LevelManager;
     class PawnManager;