Changeset 3661

Timestamp:

06/01/11 04:43:27 (2 years ago)

Author:

vtchill

Message:

Removed the need to add the map file directory to the VFS as a source to search. Instead the loader now prepends the map file directory to any import being loaded from the map file since the map saver stores the filename relative to the map file directory. The saver could be changed in the future to not save relative to map file if needed. The AnimationLoader? constructor no longer takes the map file path as it was not being used at all by the class. [t:491]

Location:

branches/active/0.3.3dev/engine/core/loaders/native/map

Files:

• animationloader.cpp (modified) (1 diff)
• animationloader.h (modified) (2 diffs)
• maploader.cpp (modified) (2 diffs)

branches/active/0.3.3dev/engine/core/loaders/native/map/animationloader.cpp

@@ -47 +47 @@
     static Logger _log(LM_NATIVE_LOADERS);
 
-    AnimationLoader::AnimationLoader(VFS* vfs, ImageManager* imageManager, const std::string& mapDirectory)
-    : m_vfs(vfs), m_imageManager(imageManager), m_mapDirectory(mapDirectory) {
+    AnimationLoader::AnimationLoader(VFS* vfs, ImageManager* imageManager)
+    : m_vfs(vfs), m_imageManager(imageManager) {
 
     }

branches/active/0.3.3dev/engine/core/loaders/native/map/animationloader.h

@@ -42 +42 @@
     class AnimationLoader : public IAnimationLoader {
     public:
-        AnimationLoader(VFS* vfs, ImageManager* imageManager, const std::string& mapDirectory);
+        AnimationLoader(VFS* vfs, ImageManager* imageManager);
 
         /** 
@@ -57 +57 @@
         VFS* m_vfs;
         ImageManager* m_imageManager;
-        std::string m_mapDirectory;
     };
 }

branches/active/0.3.3dev/engine/core/loaders/native/map/maploader.cpp

@@ -86 +86 @@
 
                 // create a new animation loader
-                m_animationLoader.reset(new AnimationLoader(m_vfs, m_imageManager, m_mapDirectory));
-
-                            m_vfs->addSource(new VFSDirectory(m_vfs, mapPath.branch_path().directory_string()));
+                m_animationLoader.reset(new AnimationLoader(m_vfs, m_imageManager));
             }
                 }
@@ -171 +169 @@
 
                         if (importDir && !importFile) {
-                            loadImportDirectory(directory);
+                            fs::path fullPath(m_mapDirectory);
+                            fullPath /= directory;
+                            loadImportDirectory(fullPath.directory_string());
                         }
                         else if (importFile) {
-                            loadImportFile(file, directory);
+                            fs::path fullFilePath(file);
+                            fs::path fullDirPath(directory);
+                            if (importDir) {
+                                fullDirPath = fs::path(m_mapDirectory);
+                                fullDirPath /= directory;
+                            }
+                            else {
+                                fullFilePath = fs::path(m_mapDirectory);
+                                fullFilePath /= file;
+                            }
+                            loadImportFile(fullFilePath.file_string(), fullDirPath.directory_string());
                         }
                                         }