Changeset 820 for code/branches/core/src/orxonox

Timestamp:

Feb 17, 2008, 3:40:02 PM (17 years ago)

Author:

landauf

Message:

added a Level-class and a first implementation of the Loader, using ClassTreeMask and TinyXML++

Location:

code/branches/core/src/orxonox

Files:

• Orxonox.cc (modified) (4 diffs)
• core/BaseObject.cc (modified) (1 diff)
• core/BaseObject.h (modified) (1 diff)
• core/CMakeLists.txt (modified) (1 diff)
• core/ConfigValueContainer.cc (modified) (2 diffs)
• core/CoreIncludes.h (modified) (2 diffs)
• core/CorePrereqs.h (modified) (2 diffs)
• core/Identifier.cc (modified) (1 diff)
• core/Identifier.h (modified) (5 diffs)
• core/Language.cc (modified) (3 diffs)
• core/Level.h (added)
• core/Loader.cc (added)
• core/Loader.h (added)
• core/MetaObjectList.h (modified) (1 diff)

code/branches/core/src/orxonox/Orxonox.cc

@@ -84 +84 @@
 #include "objects/test2.h"
 #include "objects/test3.h"
+#include "core/Loader.h"
 
 #include "Orxonox.h"
@@ -849 +850 @@
         std::cout << "2\n";
 */
-
+/*
         std::cout << "Test 13\n";
 
@@ -1110 +1111 @@
 
         std::cout << "13\n";
+*/
 /*
         std::cout << "Test 14\n";
@@ -1134 +1136 @@
         std::cout << "2\n";
 */
+
+        std::cout << "Test 15\n";
+        std::cout << "1\n";
+
+        Level* test15_1 = new Level("levels/sample.oxw");
+        Loader::open(test15_1);
+
+        std::cout << "2\n";
+
 //    startRenderLoop();
   }

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

@@ -45 +45 @@
     {
         RegisterRootObject(BaseObject);
+
+        this->level_ = 0;
     }
 

code/branches/core/src/orxonox/core/BaseObject.h

@@ -50 +50 @@
             virtual ~BaseObject();
             virtual void loadParams(TiXmlElement* xmlElem);
+
+            /** @brief Returns a pointer to the level that loaded this object. @return The level */
+            inline const Level* getLevel() const { return this->level_; }
+
+        private:
+            const Level* level_;                        //!< The level that loaded this object
     };
     ExportClass(BaseObject, Core);

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

@@ -14 +14 @@
   Language.cc
   ClassTreeMask.cc
-#  Level.cc
+  Loader.cc
 )
 

code/branches/core/src/orxonox/core/ConfigValueContainer.cc

@@ -876 +876 @@
         if (!file.is_open())
         {
-            COUT(1) << "An error occurred in ConfigValueContainer:" << std::endl;
+            COUT(1) << "An error occurred in ConfigValueContainer.cc:" << std::endl;
             COUT(1) << "Error: Couldn't open config-file " << filename << " to read the config values!" << std::endl;
             return;
@@ -923 +923 @@
         if (!file.is_open())
         {
-            COUT(1) << "An error occurred in ConfigValueContainer:" << std::endl;
+            COUT(1) << "An error occurred in ConfigValueContainer.cc:" << std::endl;
             COUT(1) << "Error: Couldn't open config-file " << filename << " to write the config values!" << std::endl;
             return;

code/branches/core/src/orxonox/core/CoreIncludes.h

@@ -79 +79 @@
 */
 #define RegisterObject(ClassName) \
-    COUT(4) << "*** Register Object: " << #ClassName << std::endl; \
+    COUT(5) << "*** Register Object: " << #ClassName << std::endl; \
     InternRegisterObject(ClassName, false)
 
@@ -87 +87 @@
 */
 #define RegisterRootObject(ClassName) \
-    COUT(4) << "*** Register Root-Object: " << #ClassName << std::endl; \
+    COUT(5) << "*** Register Root-Object: " << #ClassName << std::endl; \
     InternRegisterRootObject(ClassName)
 

code/branches/core/src/orxonox/core/CorePrereqs.h

@@ -81 +81 @@
   class Identifier;
   class IdentifierDistributor;
-//  class IdentifierList;
-//  class IdentifierListElement;
   template <class T>
   class Iterator;
@@ -88 +86 @@
   class LanguageEntry;
   class Level;
+  class Loader;
   class MetaObjectList;
   template <class T>

code/branches/core/src/orxonox/core/Identifier.cc

@@ -125 +125 @@
         else
         {
-            COUT(1) << "An error occurred in Identifier:" << std::endl;
+            COUT(1) << "An error occurred in Identifier.cc:" << std::endl;
             COUT(1) << "Error: Cannot fabricate an object of type '" << this->name_ << "'. Class has no factory." << std::endl;
             COUT(1) << "Aborting..." << std::endl;

code/branches/core/src/orxonox/core/Identifier.h

@@ -266 +266 @@
     ClassIdentifier<T>* ClassIdentifier<T>::registerClass(std::list<const Identifier*>* parents, const std::string& name, bool bRootClass)
     {
-        COUT(4) << "*** ClassIdentifier: Register Class in " << name << "-Singleton." << std::endl;
+        COUT(5) << "*** ClassIdentifier: Register Class in " << name << "-Singleton." << std::endl;
 
         // Check if at least one object of the given type was created
@@ -305 +305 @@
     void ClassIdentifier<T>::addObject(T* object)
     {
-        COUT(4) << "*** ClassIdentifier: Added object to " << this->getName() << "-list." << std::endl;
+        COUT(5) << "*** ClassIdentifier: Added object to " << this->getName() << "-list." << std::endl;
         object->getMetaList().add(this->objects_, this->objects_->add(object));
     }
@@ -359 +359 @@
                 if (!identifier->isA(ClassManager<T>::getIdentifier()))
                 {
-                    COUT(1) << "An error occurred in SubclassIdentifier:" << std::endl;
+                    COUT(1) << "An error occurred in SubclassIdentifier (Identifier.h):" << std::endl;
                     COUT(1) << "Error: Class " << identifier->getName() << " is not a " << ClassManager<T>::getIdentifier()->getName() << "!" << std::endl;
                     COUT(1) << "Error: SubclassIdentifier<" << ClassManager<T>::getIdentifier()->getName() << "> = Class(" << identifier->getName() << ") is forbidden." << std::endl;
@@ -406 +406 @@
                     if (this->identifier_)
                     {
-                        COUT(1) << "An error occurred in SubclassIdentifier:" << std::endl;
+                        COUT(1) << "An error occurred in SubclassIdentifier (Identifier.h):" << std::endl;
                         COUT(1) << "Error: Class " << this->identifier_->getName() << " is not a " << ClassManager<T>::getIdentifier()->getName() << "!" << std::endl;
                         COUT(1) << "Error: Couldn't fabricate a new Object." << std::endl;
@@ -413 +413 @@
                     else
                     {
-                        COUT(1) << "An error occurred in SubclassIdentifier:" << std::endl;
+                        COUT(1) << "An error occurred in SubclassIdentifier (Identifier.h):" << std::endl;
                         COUT(1) << "Error: Couldn't fabricate a new Object - Identifier is undefined." << std::endl;
                         COUT(1) << "Aborting..." << std::endl;

code/branches/core/src/orxonox/core/Language.cc

@@ -230 +230 @@
         if (!file.is_open())
         {
-            COUT(1) << "An error occurred in Language:" << std::endl;
+            COUT(1) << "An error occurred in Language.cc:" << std::endl;
             COUT(1) << "Error: Couldn't open file " << getFileName(this->defaultLanguage_) << " to read the default language entries!" << std::endl;
             return;
@@ -272 +272 @@
         if (!file.is_open())
         {
-            COUT(1) << "An error occurred in Language:" << std::endl;
+            COUT(1) << "An error occurred in Language.cc:" << std::endl;
             COUT(1) << "Error: Couldn't open file " << getFileName(this->language_) << " to read the translated language entries!" << std::endl;
             ResetConfigValue(language_);
@@ -324 +324 @@
         if (!file.is_open())
         {
-            COUT(1) << "An error occurred in Language:" << std::endl;
+            COUT(1) << "An error occurred in Language.cc:" << std::endl;
             COUT(1) << "Error: Couldn't open file " << getFileName(this->defaultLanguage_) << " to write the default language entries!" << std::endl;
             return;

code/branches/core/src/orxonox/core/MetaObjectList.h

@@ -99 +99 @@
 
 
-        COUT(4) << "*** MetaObjectList: Removing Object from " << this->element_->object_->getIdentifier()->getName() << "-list." << std::endl;
+        COUT(5) << "*** MetaObjectList: Removing Object from " << this->element_->object_->getIdentifier()->getName() << "-list." << std::endl;
         delete this->element_;
     }