Changeset 5689 for code/branches

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

Files:

• cmake/LibraryConfig.cmake (modified) (1 diff)
• data/particle/Example-Water.particle (modified) (1 diff)
• data/particle/Example.particle (modified) (8 diffs)
• data/particle/ExplosionComp1.particle (modified) (1 diff)
• data/particle/ExplosionComp2.particle (modified) (1 diff)
• data/particle/ExplosionComp4.particle (modified) (2 diffs)
• data/particle/FireComp2.particle (modified) (1 diff)
• data/particle/LaserGun.particle (modified) (1 diff)
• data/particle/ThrusterFire.particle (modified) (1 diff)
• data/particle/bigexplosion1part1.particle (modified) (1 diff)
• data/particle/bigexplosion1part2.particle (modified) (1 diff)
• data/particle/bigexplosion1part3.particle (modified) (1 diff)
• data/particle/emitted_emitter.particle (modified) (1 diff)
• data/particle/engineglow.particle (modified) (1 diff)
• data/particle/explosion1.particle (modified) (1 diff)
• data/particle/explosion2.particle (modified) (1 diff)
• data/particle/explosion2b.particle (modified) (1 diff)
• data/particle/explosion3.particle (modified) (1 diff)
• data/particle/fairytwirl.particle (modified) (1 diff)
• data/particle/fire3.particle (modified) (1 diff)
• data/particle/fire4.particle (modified) (1 diff)
• data/particle/forcefield.particle (modified) (6 diffs)
• data/particle/ray1.particle (modified) (1 diff)
• data/particle/ray2.particle (modified) (1 diff)
• data/particle/repairGold.particle (modified) (1 diff)
• data/particle/repairSilver.particle (modified) (1 diff)
• data/particle/shot1.particle (modified) (1 diff)
• data/particle/shot2.particle (modified) (1 diff)
• data/particle/shot2_small.particle (modified) (1 diff)
• data/particle/shot3_small.particle (modified) (1 diff)
• data/particle/shotTest.particle (modified) (1 diff)
• data/particle/smoke1.particle (modified) (1 diff)
• data/particle/smoke2.particle (modified) (1 diff)
• data/particle/smoke3.particle (modified) (1 diff)
• data/particle/smoke4.particle (modified) (1 diff)
• data/particle/smoke5.particle (modified) (1 diff)
• data/particle/smoke6.particle (modified) (1 diff)
• data/particle/smoke7.particle (modified) (1 diff)
• data/particle/sparks.particle (modified) (1 diff)
• data/particle/thruster1.particle (modified) (1 diff)
• data/particle/thruster2.particle (modified) (1 diff)
• data/particle/thruster3.particle (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (1 diff)
• src/core/CorePrereqs.h (modified) (1 diff)
• src/core/GraphicsManager.cc (modified) (4 diffs)
• src/core/GraphicsManager.h (modified) (1 diff)
• src/core/MemoryArchive.cc (added)
• src/core/MemoryArchive.h (added)

code/branches/resource2/cmake/LibraryConfig.cmake

@@ -85 +85 @@
 # Performs the search and sets the variables    #
 
-FIND_PACKAGE(OGRE  1.4 EXACT REQUIRED)
+FIND_PACKAGE(OGRE  1.4       REQUIRED)
 FIND_PACKAGE(ENet  1.1       REQUIRED)
 FIND_PACKAGE(Ogg             REQUIRED)

code/branches/resource2/data/particle/Example-Water.particle

@@ -1 @@
-Examples/Water/Rain
+particle_system Examples/Water/Rain
 {
     material        Examples/Droplet

code/branches/resource2/data/particle/Example.particle

@@ -2 +2 @@
 
 // Exudes greeny particles which float upwards
-Examples/GreenyNimbus
+particle_system Examples/GreenyNimbus
 {
     material        Examples/FlarePointSprite
@@ -49 +49 @@
 
 // A sparkly purple fountain
-Examples/PurpleFountain
+particle_system Examples/PurpleFountain
 {
     material        Examples/Flare2
@@ -89 +89 @@
 
 // A downpour
-Examples/Rain
+particle_system Examples/Rain
 {
     material        Examples/Droplet
@@ -125 +125 @@
 
 // A jet engine (of sorts)
-Examples/JetEngine1
+particle_system Examples/JetEngine1
 {
         material                Examples/Flare
@@ -154 +154 @@
         
 }
-Examples/JetEngine2
+particle_system Examples/JetEngine2
 {
         material                Examples/Flare
@@ -185 +185 @@
 
 // Exudes aureola particles which around the model float upwards
-Examples/Aureola
+particle_system Examples/Aureola
 {
     material        Examples/Aureola
@@ -247 +247 @@
 
 
-Examples/Swarm
+particle_system Examples/Swarm
 {
         quota   3000
@@ -342 +342 @@
 
 
-Examples/Snow
+particle_system Examples/Snow
 {
         quota   2000

code/branches/resource2/data/particle/ExplosionComp1.particle

@@ -1 +1 @@
 
-Orxonox/ExplosionComp1
+particle_system Orxonox/ExplosionComp1
 {
         quota   150

code/branches/resource2/data/particle/ExplosionComp2.particle

@@ -1 +1 @@
 
-Orxonox/ExplosionComp2
+particle_system Orxonox/ExplosionComp2
 {
         quota   1000

code/branches/resource2/data/particle/ExplosionComp4.particle

@@ -1 +1 @@
 
-ExplosionComp4
+particle_system ExplosionComp4
 {
         quota   10
@@ -20 +20 @@
 }
 
-Orxonox/ExplosionComp4
+particle_system Orxonox/ExplosionComp4
 {
         quota   500

code/branches/resource2/data/particle/FireComp2.particle

@@ -1 +1 @@
 
-Orxonox/FireComp2
+particle_system Orxonox/FireComp2
 {
         quota   10000

code/branches/resource2/data/particle/LaserGun.particle

@@ -1 +1 @@
 
-Orxonox/LaserGun
+particle_system Orxonox/LaserGun
 {
         quota   1000

code/branches/resource2/data/particle/ThrusterFire.particle

@@ -1 +1 @@
 
-Orxonox/ThrusterFire
+particle_system Orxonox/ThrusterFire
 {
         quota   50

code/branches/resource2/data/particle/bigexplosion1part1.particle

@@ -1 +1 @@
 
-Orxonox/BigExplosion1part1
+particle_system Orxonox/BigExplosion1part1
 {
         quota   100

code/branches/resource2/data/particle/bigexplosion1part2.particle

@@ -1 +1 @@
 
-Orxonox/BigExplosion1part2
+particle_system Orxonox/BigExplosion1part2
 {
         quota   50

code/branches/resource2/data/particle/bigexplosion1part3.particle

@@ -1 +1 @@
 
-Orxonox/BigExplosion1part3
+particle_system Orxonox/BigExplosion1part3
 {
         quota   120

code/branches/resource2/data/particle/emitted_emitter.particle

@@ -1 +1 @@
 // Example emitted emitters
-Examples/Fireworks
+particle_system Examples/Fireworks
 {
      material Examples/Flare

code/branches/resource2/data/particle/engineglow.particle

@@ -1 +1 @@
 
-Orxonox/engineglow
+particle_system Orxonox/engineglow
 {
         quota   200

code/branches/resource2/data/particle/explosion1.particle

@@ -1 +1 @@
 
-Orxonox/explosion1
+particle_system Orxonox/explosion1
 {
         quota   200

code/branches/resource2/data/particle/explosion2.particle

@@ -1 +1 @@
 
-Orxonox/explosion2
+particle_system Orxonox/explosion2
 {
         quota   150

code/branches/resource2/data/particle/explosion2b.particle

@@ -1 +1 @@
 
-Orxonox/explosion2b
+particle_system Orxonox/explosion2b
 {
         quota   150

code/branches/resource2/data/particle/explosion3.particle

@@ -1 +1 @@
 
-Orxonox/explosion3
+particle_system Orxonox/explosion3
 {
         quota   10

code/branches/resource2/data/particle/fairytwirl.particle

@@ -1 +1 @@
 
-Orxonox/fairytwirl
+particle_system Orxonox/fairytwirl
 {
         quota   500

code/branches/resource2/data/particle/fire3.particle

@@ -1 +1 @@
 
-Orxonox/fire3
+particle_system Orxonox/fire3
 {
         quota   50

code/branches/resource2/data/particle/fire4.particle

@@ -1 +1 @@
 
-Orxonox/fire4
+particle_system Orxonox/fire4
 {
         quota   25

code/branches/resource2/data/particle/forcefield.particle

@@ -1 @@
-Orxonox/ForceFieldPurpleBig
+particle_system Orxonox/ForceFieldPurpleBig
 {
         quota   10000
@@ -91 +91 @@
 }
 
-Orxonox/ForceFieldPurpleSmall
+particle_system Orxonox/ForceFieldPurpleSmall
 {
         quota   10000
@@ -183 +183 @@
 }       
 
-Orxonox/ForceFieldGreenBig
+particle_system Orxonox/ForceFieldGreenBig
 {
         quota   10000
@@ -275 +275 @@
 }
 
-Orxonox/ForceFieldGreenSmall
+particle_system Orxonox/ForceFieldGreenSmall
 {
         quota   10000
@@ -370 +370 @@
 
                         
-Orxonox/ForceFieldBlueBig
+particle_system Orxonox/ForceFieldBlueBig
 {
         quota   10000
@@ -462 +462 @@
 }
 
-Orxonox/ForceFieldBlueSmall
+particle_system Orxonox/ForceFieldBlueSmall
 {
         quota   10000

code/branches/resource2/data/particle/ray1.particle

@@ -1 +1 @@
 
-Orxonox/ray1
+particle_system Orxonox/ray1
 {
         quota   1000

code/branches/resource2/data/particle/ray2.particle

@@ -1 +1 @@
 
-Orxonox/ray2
+particle_system Orxonox/ray2
 {
         quota   1200

code/branches/resource2/data/particle/repairGold.particle

@@ -1 +1 @@
 
-Orxonox/repairGold
+particle_system Orxonox/repairGold
 {
         quota   200

code/branches/resource2/data/particle/repairSilver.particle

@@ -1 +1 @@
 
-Orxonox/repairSilver
+particle_system Orxonox/repairSilver
 {
         quota   500

code/branches/resource2/data/particle/shot1.particle

@@ -1 @@
-Orxonox/shot1
+particle_system Orxonox/shot1
 {
         quota   5000

code/branches/resource2/data/particle/shot2.particle

@@ -1 +1 @@
 
-Orxonox/shot2
+particle_system Orxonox/shot2
 {
         quota   25

code/branches/resource2/data/particle/shot2_small.particle

@@ -1 +1 @@
 
-Orxonox/shot2_small
+particle_system Orxonox/shot2_small
 {
         quota   25

code/branches/resource2/data/particle/shot3_small.particle

@@ -1 +1 @@
 
-Orxonox/shot3_small
+particle_system Orxonox/shot3_small
 {
         quota   25

code/branches/resource2/data/particle/shotTest.particle

@@ -1 +1 @@
 
-Orxonox/shotTest
+particle_system Orxonox/shotTest
 {
         quota   3000

code/branches/resource2/data/particle/smoke1.particle

@@ -2 +2 @@
 
 // smoke
-Examples/Smoke
+particle_system Examples/Smoke
 {
         material                Examples/Smoke

code/branches/resource2/data/particle/smoke2.particle

@@ -1 +1 @@
 
-Orxonox/smoke2
+particle_system Orxonox/smoke2
 {
         quota   1000

code/branches/resource2/data/particle/smoke3.particle

@@ -1 +1 @@
 
-Orxonox/smoke3
+particle_system Orxonox/smoke3
 {
         quota   10

code/branches/resource2/data/particle/smoke4.particle

@@ -1 +1 @@
 
-Orxonox/smoke4
+particle_system Orxonox/smoke4
 {
         quota   10

code/branches/resource2/data/particle/smoke5.particle

@@ -1 +1 @@
 
-Orxonox/smoke5
+particle_system Orxonox/smoke5
 {
         quota   80

code/branches/resource2/data/particle/smoke6.particle

@@ -1 +1 @@
 
-Orxonox/smoke6
+particle_system Orxonox/smoke6
 {
         quota   50

code/branches/resource2/data/particle/smoke7.particle

@@ -1 +1 @@
 
-Orxonox/smoke7
+particle_system Orxonox/smoke7
 {
         quota   25

code/branches/resource2/data/particle/sparks.particle

@@ -1 +1 @@
 
-Orxonox/sparks
+particle_system Orxonox/sparks
 {
         quota   100

code/branches/resource2/data/particle/thruster1.particle

@@ -1 @@
-Orxonox/thruster1
+particle_system Orxonox/thruster1
 {
         quota   100

code/branches/resource2/data/particle/thruster2.particle

@@ -1 @@
-Orxonox/thruster2
+particle_system Orxonox/thruster2
 {
         quota   150

code/branches/resource2/data/particle/thruster3.particle

@@ -1 @@
-Orxonox/thruster3
+particle_system Orxonox/thruster3
 {
         quota   100

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