Merge branch 'master' into sdl_input

apps/openmw/mwgui/inventorywindow.cpp

@@ -67,7 +67,7 @@ namespace MWGui
 
         setCoord(0, 342, 498, 258);
 
-        MWBase::Environment::get().getWorld ()->setupExternalRendering (mPreview);
+        mPreview.setup();
 
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
         openContainer(player);

apps/openmw/mwgui/race.cpp

@@ -106,7 +106,7 @@ void RaceDialog::open()
     updateSpellPowers();
 
     mPreview = new MWRender::RaceSelectionPreview();
-    MWBase::Environment::get().getWorld ()->setupExternalRendering (*mPreview);
+    mPreview->setup();
     mPreview->update (0);
 
     const ESM::NPC proto = mPreview->getPrototype();

apps/openmw/mwrender/characterpreview.cpp

@@ -2,6 +2,7 @@
 
 
 #include <OgreSceneManager.h>
+#include <OgreRoot.h>
 #include <OgreHardwarePixelBuffer.h>
 
 #include <libs/openengine/ogre/selectionbuffer.hpp>
@@ -35,13 +36,18 @@ namespace MWRender
 
     }
 
-    void CharacterPreview::setup (Ogre::SceneManager *sceneManager)
+    void CharacterPreview::setup ()
     {
-        mSceneMgr = sceneManager;
+        mSceneMgr = Ogre::Root::getSingleton().createSceneManager(Ogre::ST_GENERIC);
         mCamera = mSceneMgr->createCamera (mName);
         mCamera->setAspectRatio (float(mSizeX) / float(mSizeY));
 
-        mNode = static_cast<Ogre::SceneNode*>(mSceneMgr->getRootSceneNode()->getChild("mwRoot"))->createChildSceneNode ();
+        Ogre::SceneNode* renderRoot = mSceneMgr->getRootSceneNode()->createChildSceneNode("renderRoot");
+
+        //we do this with mwRoot in renderingManager, do it here too.
+        renderRoot->pitch(Ogre::Degree(-90));
+
+        mNode = renderRoot->createChildSceneNode();
 
         mAnimation = new NpcAnimation(mCharacter, mNode,
             MWWorld::Class::get(mCharacter).getInventoryStore (mCharacter), RV_PlayerPreview);
@@ -79,6 +85,7 @@ namespace MWRender
         //Ogre::TextureManager::getSingleton().remove(mName);
         mSceneMgr->destroyCamera (mName);
         delete mAnimation;
+        Ogre::Root::getSingleton().destroySceneManager(mSceneMgr);
     }
 
     void CharacterPreview::rebuild()

apps/openmw/mwrender/characterpreview.hpp

@@ -23,14 +23,14 @@ namespace MWRender
 
     class NpcAnimation;
 
-    class CharacterPreview : public ExternalRendering
+    class CharacterPreview
     {
     public:
         CharacterPreview(MWWorld::Ptr character, int sizeX, int sizeY, const std::string& name,
                          Ogre::Vector3 position, Ogre::Vector3 lookAt);
         virtual ~CharacterPreview();
 
-        virtual void setup (Ogre::SceneManager *sceneManager);
+        virtual void setup ();
         virtual void onSetup();
 
         virtual void rebuild();

components/bsa/bsa_archive.cpp

@@ -29,6 +29,8 @@
 #include <OgreArchiveManager.h>
 #include "bsa_file.hpp"
 
+#include "../files/constrainedfiledatastream.hpp"
+
 namespace
 {
 
@@ -60,104 +62,64 @@ public:
 static bool fsstrict = false;
 
 /// An OGRE Archive wrapping a BSAFile archive
-class DirArchive: public Ogre::FileSystemArchive
+class DirArchive: public Ogre::Archive
 {
-    boost::filesystem::path currentdir;
+    typedef std::map <std::string, std::string> index;
-    std::map<std::string, std::vector<std::string>, ciLessBoost> m;
-    unsigned int cutoff;
 
-    bool findFile(const String& filename, std::string& copy) const
+    index mIndex;
+
+    static char strict_normalize_char(char ch)
     {
-        copy = filename;
+        return ch == '\\' ? '/' : ch;
-        std::replace(copy.begin(), copy.end(), '\\', '/');
-
-        if(copy.at(0) == '/')
-            copy.erase(0, 1);
-
-        if(fsstrict == true)
-            return true;
-
-        std::string folder;
-        //int delimiter = 0;
-        size_t lastSlash = copy.rfind('/');
-        if (lastSlash != std::string::npos)
-        {
-            folder = copy.substr(0, lastSlash);
-            //delimiter = lastSlash+1;
     }
 
-        std::vector<std::string> current;
+    static char nonstrict_normalize_char(char ch)
     {
-            std::map<std::string,std::vector<std::string>,ciLessBoost>::const_iterator found = m.find(folder);
+        return ch == '\\' ? '/' : std::tolower (ch);
+    }
 
-            if (found == m.end())
+    static std::string normalize_path (std::string::const_iterator begin, std::string::const_iterator end)
     {
-                return false;
+        std::string normalized;
-            }
+        normalized.reserve (end-begin);
-            else
+        char (*normalize_char) (char) = fsstrict ? &strict_normalize_char : &nonstrict_normalize_char;
-                current = found->second;
+        std::transform (begin, end, std::back_inserter (normalized), normalize_char);
+        return normalized;
     }
 
-        std::vector<std::string>::iterator find = std::lower_bound(current.begin(), current.end(), copy, ciLessBoost());
+    index::const_iterator lookup_filename (std::string const & filename) const
-        if (find != current.end() && !ciLessBoost()(copy, current.front()))
     {
-            if (!boost::iequals(copy, *find))
+        std::string normalized = normalize_path (filename.begin (), filename.end ());
-                if ((find = std::find_if(current.begin(), current.end(), pathComparer(copy))) == current.end()) //\todo Check if this line is actually needed
-                    return false;
 
-            copy = *find;
+        return mIndex.find (normalized);
-            return true;
     }
 
-        return false;
+public:
-    }
-
-    public:
 
     DirArchive(const String& name)
-    : FileSystemArchive(name, "Dir"), currentdir (name)
+        : Archive(name, "Dir")
     {
-        mType = "Dir";
+        typedef boost::filesystem::recursive_directory_iterator directory_iterator;
-        std::string s = name;
-        cutoff = s.size() + 1;
-        if(fsstrict == false)
-            populateMap(currentdir);
 
-  }
+        directory_iterator end;
-  void populateMap(boost::filesystem::path d){
+
-     //need to cut off first
+        size_t prefix = name.size ();
-      boost::filesystem::directory_iterator dir_iter(d), dir_end;
+
-      std::vector<std::string> filesind;
+        if (name.size () > 0 && name [prefix - 1] != '\\' && name [prefix - 1] != '/')
-      for(;dir_iter != dir_end; dir_iter++)
+            ++prefix;
+
+        for (directory_iterator i (name); i != end; ++i)
         {
-        if(boost::filesystem::is_directory(*dir_iter))
+            if(boost::filesystem::is_directory (*i))
-            populateMap(*dir_iter);
+                continue;
-        else
-        {
-            std::string s = dir_iter->path().string();
-            std::replace(s.begin(), s.end(), '\\', '/');
 
-            std::string small;
+            std::string proper = i->path ().string ();
-            if(cutoff < s.size())
-                small = s.substr(cutoff, s.size() - cutoff);
-            else
-                small = s.substr(cutoff - 1, s.size() - cutoff);
 
-            filesind.push_back(small);
+            std::string searchable = normalize_path (proper.begin () + prefix, proper.end ());
+
+            mIndex.insert (std::make_pair (std::move (searchable), std::move (proper)));
         }
     }
-    std::sort(filesind.begin(), filesind.end(), ciLessBoost());
-
-    std::string small;
-    std::string original = d.string();
-    std::replace(original.begin(), original.end(), '\\', '/');
-    if(cutoff < original.size())
-        small = original.substr(cutoff, original.size() - cutoff);
-    else
-        small = original.substr(cutoff - 1, original.size() - cutoff);
-
-    m[small] = filesind;
-  }
 
     bool isCaseSensitive() const { return fsstrict; }
 
@@ -165,26 +127,76 @@ class DirArchive: public Ogre::FileSystemArchive
     void load() {}
     void unload() {}
 
-     bool exists(const String& filename) {
-        std::string copy;
-
-        if (findFile(filename, copy))
-            return FileSystemArchive::exists(copy);
-
-      return false;
-     }
-
     DataStreamPtr open(const String& filename, bool readonly = true) const
     {
-        std::string copy;
+        index::const_iterator i = lookup_filename (filename);
 
-        if (findFile(filename, copy))
+        if (i == mIndex.end ())
-            return FileSystemArchive::open(copy, readonly);
+        {
-
+            std::ostringstream os;
-        DataStreamPtr p;
+            os << "The file '" << filename << "' could not be found.";
-      return p;
+            throw std::runtime_error (os.str ());
         }
 
+        return openConstrainedFileDataStream (i->second.c_str ());
+    }
+
+    StringVectorPtr list(bool recursive = true, bool dirs = false)
+    {
+        StringVectorPtr ptr = StringVectorPtr(new StringVector());
+        std::cout << "DirArchive<" << getName () << ">::list" << std::endl;
+        return ptr;
+    }
+
+    FileInfoListPtr listFileInfo(bool recursive = true, bool dirs = false)
+    {
+        FileInfoListPtr ptr = FileInfoListPtr(new FileInfoList());
+        std::cout << "DirArchive<" << getName () << ">::listFileInfo" << std::endl;
+        return ptr;
+    }
+
+    StringVectorPtr find(const String& pattern, bool recursive = true,
+                        bool dirs = false)
+    {
+        StringVectorPtr ptr = StringVectorPtr(new StringVector());
+
+        if (pattern == "*")
+            for (index::const_iterator i = mIndex.begin (); i != mIndex.end (); ++i)
+                ptr->push_back (i->first);
+
+        return ptr;
+    }
+
+    bool exists(const String& filename)
+    {
+        return lookup_filename (filename) != mIndex.end ();
+    }
+
+    time_t getModifiedTime(const String&) { return 0; }
+
+    FileInfoListPtr findFileInfo(const String& pattern, bool recursive = true,
+                            bool dirs = false) const
+    {
+        FileInfoListPtr ptr = FileInfoListPtr(new FileInfoList());
+
+        index::const_iterator i = lookup_filename (pattern);
+
+        if (i != mIndex.end ())
+        {
+            FileInfo fi;
+
+            std::size_t npos = i->first.rfind ('/');
+
+            fi.archive = this;
+            fi.filename = npos != -1 ? i->first.substr (npos) : i->first;
+            fi.path = npos != -1 ? i->first.substr (0, npos) : "";
+            fi.compressedSize = fi.uncompressedSize = 0;
+
+            ptr->push_back(fi);
+        }
+
+        return ptr;
+    }
 };
 
 class BSAArchive : public Archive
@@ -249,6 +261,13 @@ public:
     //std::cout << "find(" << pattern << ", " << recursive
     //          << ", " << dirs << ")\n";
     StringVectorPtr ptr = StringVectorPtr(new StringVector());
+
+    BSAFile::FileList const & files = arc.getList ();
+
+    if (pattern == "*")
+        for (BSAFile::FileList::const_iterator i = files.begin (); i != files.end (); ++i)
+            ptr->push_back (i->name);
+
     return ptr;
   }