Changeset 11795 for code/branches/cegui0.8_ogre1.9/src/libraries

Timestamp:

Feb 21, 2018, 12:03:52 AM (6 years ago)

Author:

landauf

Message:

merged ogre1.9 (including cegui0.8) into new branch

Location:

code/branches/cegui0.8_ogre1.9

Files:

• . (modified) (1 prop)
• src/libraries/core/CMakeLists.txt (modified) (1 diff)
• src/libraries/core/GUIManager.cc (modified) (3 diffs)
• src/libraries/core/GraphicsManager.cc (modified) (3 diffs)
• src/libraries/core/GraphicsManager.h (modified) (3 diffs)
• src/libraries/util/DisplayStringConversions.h (modified) (1 diff)
• src/libraries/util/OgreForwardRefs.h (modified) (8 diffs)

code/branches/cegui0.8_ogre1.9/src/libraries/core/CMakeLists.txt

@@ -95 +95 @@
   LINK_LIBRARIES
     ${OGRE_LIBRARY}
+    ${OGRE_OVERLAY_LIBRARY}
     ${Boost_FILESYSTEM_LIBRARY}
     ${Boost_SYSTEM_LIBRARY} # Filesystem dependency

code/branches/cegui0.8_ogre1.9/src/libraries/core/GUIManager.cc

@@ -482 +482 @@
         assert(guiSystem_);
         this->protectedCeguiSystemCall(std::bind(&CEGUI::System::injectTimePulse, arg::_1, time.getDeltaTime()));
+#if CEGUI_VERSION >= 0x000800
+        this->protectedCeguiContextCall(std::bind(&CEGUI::GUIContext::injectTimePulse, arg::_1, time.getDeltaTime()));
+#endif
     }
 
@@ -664 +667 @@
             this->setBackgroundImage("");
         else
-            this->setBackgroundImage("set: " + imageSet + " image: " + imageName);
+            this->setBackgroundImage(imageSet + "/" + imageName);
     }
 
@@ -846 +849 @@
     bool GUIManager::protectedCeguiContextCall(FunctionType function)
     {
-        return this->protectedCall(function, this->guiSystem_->getDefaultGUIContext());
+        return this->protectedCall(function, &this->guiSystem_->getDefaultGUIContext());
     }
 #endif

code/branches/cegui0.8_ogre1.9/src/libraries/core/GraphicsManager.cc

@@ -45 +45 @@
 #include <OgreViewport.h>
 #include <OgreWindowEventUtilities.h>
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreOverlaySystem.h>
+#endif
 
 #include "SpecialConfig.h"
@@ -115 +118 @@
         this->loadOgreRoot();
 
+#if OGRE_VERSION >= 0x010900
+        this->overlaySystem_ = new Ogre::OverlaySystem();
+#else
+        this->overlaySystem_ = nullptr;
+#endif
+
         // At first, add the root paths of the data directories as resource locations
         Ogre::ResourceGroupManager::getSingleton().addResourceLocation(ConfigurablePaths::getDataPathString(), "FileSystem");
@@ -155 +164 @@
         Loader::getInstance().unload(extResources_.get());
 
+#if OGRE_VERSION >= 0x010900
+        safeObjectDelete(&overlaySystem_);
+#endif
         safeObjectDelete(&ogreRoot_);
         safeObjectDelete(&ogreLogger_);

code/branches/cegui0.8_ogre1.9/src/libraries/core/GraphicsManager.h

@@ -52 +52 @@
 
 #include "util/DestructionHelper.h"
+#include "util/OgreForwardRefs.h"
 #include "util/Singleton.h"
 #include "config/Configurable.h"
@@ -79 +80 @@
         void postUpdate(const Clock& time);
 
-        Ogre::Viewport* getViewport()         { return this->viewport_; }
-        Ogre::RenderWindow* getRenderWindow() { return this->renderWindow_; }
+        Ogre::Viewport* getViewport()           { return this->viewport_; }
+        Ogre::RenderWindow* getRenderWindow()   { return this->renderWindow_; }
+        Ogre::OverlaySystem* getOverlaySystem() { return this->overlaySystem_; }
         size_t getRenderWindowHandle();
 
@@ -129 +131 @@
         Ogre::RenderWindow*      renderWindow_;            //!< the one and only render window
         Ogre::Viewport*          viewport_;                //!< default full size viewport
+        Ogre::OverlaySystem*     overlaySystem_;
         GlowMaterialListener*    glowMaterialListener_;    //!< Material Listener for the 'Glow' compositor
         float                    lastFrameStartTime_;      //!< Time stamp of the beginning of the last frame

code/branches/cegui0.8_ogre1.9/src/libraries/util/DisplayStringConversions.h

@@ -37 +37 @@
 
 #include "UtilPrereqs.h"
-#include <OgreOverlayElement.h>
+#include <OgrePrerequisites.h>
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreOverlayElement.h>
+#else
+#   include <OgreOverlayElement.h>
+#endif
 
 #if OGRE_UNICODE_SUPPORT

code/branches/cegui0.8_ogre1.9/src/libraries/util/OgreForwardRefs.h

@@ -67 +67 @@
     class Factory;
     class Font;
-    class FontPtr;
     class FontManager;
     struct FrameEvent;
@@ -73 +72 @@
     class Frustum;
     class GpuProgram;
-    class GpuProgramPtr;
     class GpuProgramManager;
     class GpuProgramUsage;
@@ -82 +80 @@
     class HardwarePixelBufferSharedPtr;
     class HighLevelGpuProgram;
-    class HighLevelGpuProgramPtr;
     class HighLevelGpuProgramManager;
     class HighLevelGpuProgramFactory;
@@ -96 +93 @@
     class ManualObject;
     class Material;
-    class MaterialPtr;
     class MaterialManager;
     class MaterialScriptCompiler;
@@ -104 +100 @@
     class MemoryManager;
     class Mesh;
-    class MeshPtr;
     class MeshSerializer;
     class MeshSerializerImpl;
@@ -120 +115 @@
     class OverlayElementFactory;
     class OverlayManager;
+    class OverlaySystem;
     class Particle;
     class ParticleAffector;
@@ -179 +175 @@
     class SimpleSpline;
     class Skeleton;
-    class SkeletonPtr;
     class SkeletonInstance;
     class SkeletonManager;
@@ -195 +190 @@
     class TextureUnitState;
     class Texture;
-    class TexturePtr;
     class TextureFont;
     class TextureManager;