Changeset 5652 for code/branches/resource2/src/orxonox

Timestamp:

Aug 17, 2009, 3:35:34 PM (15 years ago)

Author:

rgrieder

Message:

Modified ResourceLocation to actually find the given paths.
Plus a few small changes.

Location:

code/branches/resource2/src/orxonox

Files:

• gamestates/GSDedicated.cc (modified) (2 diffs)
• tools/ResourceCollection.cc (modified) (1 diff)
• tools/ResourceLocation.cc (modified) (3 diffs)

code/branches/resource2/src/orxonox/gamestates/GSDedicated.cc

@@ -28 +28 @@
 
 #include "GSDedicated.h"
+
+#include <iomanip>
+#include <iostream>
+#include <boost/bind.hpp>
 
 #include "util/Debug.h"
@@ -37 +41 @@
 #include "core/GameMode.h"
 #include "network/Server.h"
-
-#include <iostream>
-#include <iomanip>
-#include <boost/bind.hpp>
 
 #ifdef ORXONOX_PLATFORM_UNIX

code/branches/resource2/src/orxonox/tools/ResourceCollection.cc

@@ -36 +36 @@
 namespace orxonox
 {
+    CreateFactory(ResourceCollection);
+
     ResourceCollection::ResourceCollection(BaseObject* creator)
         : BaseObject(creator)

code/branches/resource2/src/orxonox/tools/ResourceLocation.cc

@@ -30 +30 @@
 
 #include <OgreResourceGroupManager.h>
+#include <boost/filesystem.hpp>
+
 #include "util/Exception.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLFile.h"
 #include "core/XMLPort.h"
 
 namespace orxonox
 {
+    CreateFactory(ResourceLocation);
+
     ResourceLocation::ResourceLocation(BaseObject* creator)
         : BaseObject(creator)
@@ -43 +49 @@
         // Default values
         archiveType_ = "FileSystem";
-        bRecursive_  = false;
+        bRecursive_  = true;
     }
 
@@ -63 +69 @@
         if (path_.empty())
             ThrowException(InitialisationFailed, "ResourceLocation: Trying to add one without the path being set");
+
+        // Find the path
+        boost::filesystem::path path;
+        if (boost::filesystem::exists(Core::getDataPath() / this->getPath()))
+            path = Core::getDataPath() / this->getPath();
+        else if (Core::isDevelopmentRun() && boost::filesystem::exists(Core::getExternalDataPath() / this->getPath()))
+            path = Core::getExternalDataPath() / this->getPath();
+        else
+        {
+            COUT(2) << "Warning: ResourceLocation '" << this->getPath() << "' does not seem to exist" << std::endl;
+            return;
+        }
+
         // Add it to the Ogre paths
         Ogre::ResourceGroupManager::getSingleton().addResourceLocation(
-            this->getPath(), this->getArchiveType(), resourceGroup, this->getRecursive());
+            path.string(), this->getArchiveType(), resourceGroup, this->getRecursive());
         resourceGroup_ = resourceGroup;
     }