Changeset 5689 for code/branches/resource2/src/core

Timestamp:

Aug 29, 2009, 10:04:04 PM (15 years ago)

Author:

rgrieder

Message:

Experimental support for OGRE v1.6 "Shoggoth".
I had to write a little script that removes all the "particle_system" keywords from the particle scripts. But since we can't write to the media folder and creating unique temporary folders is quite tedious, I derived from Ogre::Archive and created a little MemoryArchive that accepts those new particle scripts and feeds them back to the Ogre::ResourceGroupManager.
Also adjusted all particle scripts for the new script compiler (i.e. just added "particle_system" everywhere).

Note: It seems that overlays don't work anymore on Windows, compiling with MinGW.

Location:

code/branches/resource2/src/core

Files:

• CMakeLists.txt (modified) (1 diff)
• CorePrereqs.h (modified) (1 diff)
• GraphicsManager.cc (modified) (4 diffs)
• GraphicsManager.h (modified) (1 diff)
• MemoryArchive.cc (added)
• MemoryArchive.h (added)

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

@@ -31 +31 @@
   Language.cc
   LuaState.cc
+  MemoryArchive.cc
   ObjectListBase.cc
   OrxonoxClass.cc

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

@@ -134 +134 @@
     class Loader;
     class LuaState;
+    class MemoryArchive;
+    class MemoryArchiveFactory;
     class MetaObjectList;
     class MetaObjectListElement;

code/branches/resource2/src/core/GraphicsManager.cc

@@ -28 +28 @@
  */
 
-/**
-@file
-@brief
-    Implementation of an partial interface to Ogre.
-*/
-
 #include "GraphicsManager.h"
 
 #include <fstream>
+#include <sstream>
 #include <boost/filesystem.hpp>
-
+#include <boost/shared_array.hpp>
+
+#include <OgreArchiveFactory.h>
+#include <OgreArchiveManager.h>
 #include <OgreFrameListener.h>
 #include <OgreRoot.h>
 #include <OgreLogManager.h>
-#include <OgreException.h>
 #include <OgreRenderWindow.h>
 #include <OgreRenderSystem.h>
@@ -62 +59 @@
 #include "GameMode.h"
 #include "Loader.h"
+#include "MemoryArchive.h"
 #include "WindowEventListener.h"
 #include "XMLFile.h"
@@ -88 +86 @@
     GraphicsManager::GraphicsManager(bool bLoadRenderer)
         : ogreWindowEventListener_(new OgreWindowEventListener())
+#if OGRE_VERSION < 0x010600
+        , memoryArchiveFactory_(new MemoryArchiveFactory())
+#endif
         , renderWindow_(0)
         , viewport_(0)
@@ -165 +166 @@
 
         this->loadRenderer();
+
+#if OGRE_VERSION < 0x010600
+        // WORKAROUND: There is an incompatibility for particle scripts when trying
+        // to support both Ogre 1.4 and 1.6. The hacky solution is to create
+        // scripts for the 1.6 version and then remove the inserted "particle_system"
+        // keyword. But we need to supply these new scripts as well, which is why
+        // there is an extra Ogre::Archive dealing with in the memory.
+        using namespace Ogre;
+        ArchiveManager::getSingleton().addArchiveFactory(memoryArchiveFactory_.get());
+        const StringVector& groups = ResourceGroupManager::getSingleton().getResourceGroups();
+        // Travers all groups
+        for (StringVector::const_iterator itGroup = groups.begin(); itGroup != groups.end(); ++itGroup)
+        {
+            FileInfoListPtr files = ResourceGroupManager::getSingleton().findResourceFileInfo(*itGroup, "*.particle");
+            for (FileInfoList::const_iterator itFile = files->begin(); itFile != files->end(); ++itFile)
+            {
+                // open file
+                Ogre::DataStreamPtr input = ResourceGroupManager::getSingleton().openResource(itFile->filename, *itGroup, false);
+                std::stringstream output;
+                // Parse file and replace "particle_system" with nothing
+                while (!input->eof())
+                {
+                    std::string line = input->getLine();
+                    size_t pos = line.find("particle_system");
+                    if (pos != std::string::npos)
+                    {
+                        // 15 is the length of "particle_system"
+                        line.replace(pos, 15, "");
+                    }
+                    output << line << std::endl;
+                }
+                // Add file to the memory archive
+                shared_array<char> data(new char[output.str().size()]);
+                // Debug optimisations
+                const std::string outputStr = output.str();
+                char* rawData = data.get();
+                for (unsigned i = 0; i < outputStr.size(); ++i)
+                    rawData[i] = outputStr[i];
+                MemoryArchive::addFile("particle_scripts_ogre_1.4_" + *itGroup, itFile->filename, data, output.str().size());
+            }
+            if (!files->empty())
+            {
+                // Declare the files, but using a new group
+                ResourceGroupManager::getSingleton().addResourceLocation("particle_scripts_ogre_1.4_" + *itGroup,
+                    "Memory", "particle_scripts_ogre_1.4_" + *itGroup);
+            }
+        }
+#endif
 
         // Initialise all resources (do this AFTER the renderer has been loaded!)

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

@@ -91 +91 @@
 
         scoped_ptr<OgreWindowEventListener> ogreWindowEventListener_; //!< Pimpl to hide OgreWindowUtilities.h
+#if OGRE_VERSION < 0x010600
+        scoped_ptr<MemoryArchiveFactory>    memoryArchiveFactory_;    //!< Stores the modified particle scripts
+#endif
         scoped_ptr<Ogre::LogManager>        ogreLogger_;
         scoped_ptr<Ogre::Root>              ogreRoot_;                //!< Ogre's root