Changeset 5653

Timestamp:

Aug 17, 2009, 3:42:39 PM (15 years ago)

Author:

rgrieder

Message:

Added class to handle handle resources more easily via Ogre::ResourceGroupManager.
And modified the XMLFile to store the resource group as well.

Location:

code/branches/resource2/src

Files:

• core/CMakeLists.txt (modified) (1 diff)
• core/CorePrereqs.h (modified) (2 diffs)
• core/Resource.cc (added)
• core/Resource.h (added)
• core/XMLFile.h (modified) (1 diff)
• orxonox/objects/Level.cc (modified) (1 diff)

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

@@ -33 +33 @@
   ObjectListBase.cc
   OrxonoxClass.cc
+  Resource.cc
   WindowEventListener.cc
 

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

@@ -148 +148 @@
     class OgreWindowEventListener;
     class OrxonoxClass;
+    struct ResourceInfo;
     class Shell;
     class ShellListener;
@@ -223 +224 @@
 }
 
+// Ogre
+namespace Ogre
+{
+    class DataStream;
+    template <class T> class SharedPtr;
+    typedef SharedPtr<DataStream> DataStreamPtr;
+}
+namespace orxonox
+{
+    // Import the Ogre::DataStream
+    using Ogre::DataStream;
+    using Ogre::DataStreamPtr;
+}
+
 // CEGUI
 namespace CEGUI

code/branches/resource2/src/core/XMLFile.h

@@ -40 +40 @@
     {
         public:
-            XMLFile(const std::string& filename) : filename_(filename) {}
-            XMLFile(const std::string& filename, const ClassTreeMask& mask) : filename_(filename), mask_(mask) {};
+            XMLFile(const std::string& filename, const std::string& resourceGroup = "General")
+                : filename_(filename)
+                , group_(resourceGroup)
+            { }
+            XMLFile(const ClassTreeMask& mask, const std::string& filename, const std::string& resourceGroup = "General")
+                : filename_(filename)
+                , group_(resourceGroup)
+                , mask_(mask)
+            { }
 
             const std::string& getFilename() const { return this->filename_; }
+            const std::string& getResourceGroup() const { return this->group_; }
             const ClassTreeMask& getMask() const { return this->mask_; }
 
         private:
             std::string filename_;
+            std::string group_;
             ClassTreeMask mask_;
     };

code/branches/resource2/src/orxonox/objects/Level.cc

@@ -101 +101 @@
         mask.include(Class(OverlayGroup)); // HACK to include the ChatOverlay
 
-        this->xmlfile_ = new XMLFile(Core::getDataPathString() + this->xmlfilename_, mask);
+        this->xmlfile_ = new XMLFile(mask, this->xmlfilename_);
 
         Loader::open(this->xmlfile_);