Changeset 8336 for code/branches/kicklib2

Timestamp:

Apr 26, 2011, 6:49:49 AM (14 years ago)

Author:

rgrieder

Message:

Added solution to the rendering order problem proposed by Crazy Eddie. However the GUI is still drawn on top of the overlays.
However if you click on "Singleplayer", then get back to the main menu and now open the console, you will see part of it inside the Singleplayer button

Location:

code/branches/kicklib2/src/libraries/core

Files:

• GUIManager.cc (modified) (7 diffs)
• GUIManager.h (modified) (1 diff)

code/branches/kicklib2/src/libraries/core/GUIManager.cc

@@ -57 +57 @@
 #  include <RendererModules/Ogre/CEGUIOgreRenderer.h>
 #  include <RendererModules/Ogre/CEGUIOgreResourceProvider.h>
+#  include <OgreCamera.h>
+#  include <OgreRenderQueueListener.h>
+#  include <OgreSceneManager.h>
 #endif
 
@@ -109 +112 @@
         We need this to fix a problem with an uninitialised member variable
         in CEGUI < 0.7 <br>
-        Notice that "public" modifier for the otherwise private variables.
-    */
-    class CEGUILUA_API LuaScriptModuleWorkaround : public CEGUI::ScriptModule
+        Notice the "public" modifier for the otherwise private variables.
+    */
+    class LuaScriptModuleWorkaround : public CEGUI::ScriptModule
     {
     public:
@@ -125 +128 @@
         int d_activeErrFuncIndex;
     };
+#else
+    /// RenderQueueListener based class used to hook into the ogre rendering system
+    class RQListener : public Ogre::RenderQueueListener
+    {
+    public:
+        /// Callback from Ogre invoked before other stuff in our target queue is rendered
+        void renderQueueEnded(Ogre::uint8 id, const Ogre::String& invocation, bool& skipThisQueue)
+        {
+            if (id == Ogre::RENDER_QUEUE_SKIES_LATE)//Ogre::RENDER_QUEUE_OVERLAY)
+                CEGUI::System::getSingleton().renderGUI();
+        }
+    };
 #endif
 
@@ -171 +186 @@
 #else
         guiRenderer_ = &OgreRenderer::create(*GraphicsManager::getInstance().getRenderWindow());
+        // We use our own RenderQueueListener so we can draw UNDER overlays
+        guiRenderer_->setFrameControlExecutionEnabled(false);
+        rqListener_ = new RQListener();
         resourceProvider_ = &OgreRenderer::createOgreResourceProvider();
         imageCodec_ = &OgreRenderer::createOgreImageCodec();
@@ -245 +263 @@
 #else
         System::destroy();
-        delete ceguiLogger_;
         OgreRenderer::destroyOgreResourceProvider(*resourceProvider_);
         OgreRenderer::destroyOgreImageCodec(*imageCodec_);
         OgreRenderer::destroy(*guiRenderer_);
         LuaScriptModule::destroy(*scriptModule_);
+        delete ceguiLogger_;
+        delete rqListener_;
 #endif
         delete luaState_;
@@ -292 +311 @@
     void GUIManager::setCamera(Ogre::Camera* camera)
     {
-        this->camera_ = camera;
 #ifdef ORXONOX_OLD_CEGUI
         if (camera == NULL)
@@ -298 +316 @@
         else
             this->guiRenderer_->setTargetSceneManager(camera->getSceneManager());
-#endif
+#else
+        if (camera_ != NULL && camera_->getSceneManager() != NULL)
+            camera_->getSceneManager()->removeRenderQueueListener(rqListener_);
+        if (camera != NULL && camera->getSceneManager() != NULL)
+            camera->getSceneManager()->addRenderQueueListener(rqListener_);
+#endif
+        this->camera_ = camera;
     }
 

code/branches/kicklib2/src/libraries/core/GUIManager.h

@@ -165 +165 @@
 #else
         CEGUI::OgreRenderer*                 guiRenderer_;      //!< CEGUI's interface to the Ogre Engine
+        Ogre::RenderQueueListener*           rqListener_;       //!< RQ listener so we can draw UNDER Ogre overlays
         CEGUI::OgreResourceProvider*         resourceProvider_; //!< CEGUI's resource provider
         CEGUI::OgreImageCodec*               imageCodec_;