Fixed ui bug when moving window to another screen.

src/Core/OgreRenderingModule/OgreModuleFwd.h

@@ -41,6 +41,7 @@ typedef shared_ptr<Ogre::Root> OgreRootPtr;
 namespace OgreRenderer
 {
     class OgreRenderingModule;
+    class OgreRenderSystemListener;
     class Renderer;
     typedef shared_ptr<Renderer> RendererPtr;
     typedef weak_ptr<Renderer> RendererWeakPtr;

src/Core/OgreRenderingModule/OgreRenderingModule.cpp

@@ -202,6 +202,12 @@ void OgreRenderingModule::Initialize()
 #endif
     framework_->Console()->RegisterCommand("setMaterialAttribute", "Sets an attribute on a material asset",
         this, SLOT(SetMaterialAttribute(const QStringList &)));
+
+    // Create and add Ogre rendersystem listener.
+    renderSystemListener = new OgreRenderSystemListener(this);
+    if(!renderSystemListener)
+        return;
+    Ogre::Root::getSingleton().getRenderSystem()->addListener(renderSystemListener);
 }
 
 void OgreRenderingModule::Uninitialize()
@@ -212,6 +218,12 @@ void OgreRenderingModule::Uninitialize()
 
     // Clear up the renderer object, so that it will not be left dangling.
     framework_->RegisterRenderer(0);
+
+    // Destroy Ogre rendersystem listener.
+    if(!renderSystemListener)
+        return;
+    Ogre::Root::getSingleton().getRenderSystem()->removeListener(renderSystemListener);
+    delete renderSystemListener;
 }
 
 void OgreRenderingModule::ConsoleStats()
@@ -286,6 +298,48 @@ void OgreRenderingModule::SetMaterialAttribute(const QStringList &params)
     matAsset->SetAttribute(params[1], params[2]);
 }
 
+void OgreRenderingModule::EmitDeviceLost()
+{
+    emit DeviceLost();
+}
+
+void OgreRenderingModule::EmitDeviceRestored()
+{
+    emit DeviceRestored();
+}
+
+void OgreRenderingModule::EmitDeviceCreated()
+{
+    emit DeviceCreated();
+}
+
+void OgreRenderingModule::EmitDeviceReleased()
+{
+    emit DeviceReleased();
+}
+
+OgreRenderSystemListener::OgreRenderSystemListener(OgreRenderingModule* renderingModule) :
+    _renderingModule(renderingModule)
+{}
+
+OgreRenderSystemListener::~OgreRenderSystemListener()
+{}
+
+void OgreRenderSystemListener::eventOccurred(const Ogre::String& eventName, const Ogre::NameValuePairList* parameters)
+{
+    if (!_renderingModule)
+        return;
+
+    if (eventName == "DeviceLost")
+        _renderingModule->EmitDeviceLost();
+    else if (eventName == "DeviceRestored") 
+        _renderingModule->EmitDeviceRestored();
+    else if(eventName == "DeviceCreated")
+        _renderingModule->EmitDeviceCreated();
+    else if(eventName == "DeviceReleased")
+        _renderingModule->EmitDeviceReleased();
+}
+
 } // ~namespace OgreRenderer
 
 extern "C"

src/Core/OgreRenderingModule/OgreRenderingModule.h

@@ -6,6 +6,7 @@
 #include "OgreModuleApi.h"
 #include "OgreModuleFwd.h"
 #include "SceneFwd.h"
+#include <OgreRenderSystem.h>
 
 namespace OgreRenderer
 {
@@ -40,6 +41,16 @@ namespace OgreRenderer
         const RendererPtr &GetRenderer() const { return Renderer(); } /**< @deprecated Use Renderer() instead. @todo Remove. */
         /// @endcond
 
+    signals:
+        /// DirectX device lost signal.
+        void DeviceLost();
+        /// DirectX device restored signal.
+        void DeviceRestored();
+        /// DirectX device created signal.
+        void DeviceCreated();
+        /// DirectX device released signal.
+        void DeviceReleased();
+
     public slots:
         /// Prints renderer stats to console.
         void ConsoleStats();
@@ -57,7 +68,32 @@ namespace OgreRenderer
         /// Removes OgreWorld from a Scene.
         void RemoveOgreWorld(Scene *scene);
 
+    protected:
+        /// Emit DeviceLost signal.
+        void EmitDeviceLost();
+        /// Emit DeviceRestored signal.
+        void EmitDeviceRestored();
+        /// Emit DeviceCreated signal.
+        void EmitDeviceCreated();
+        /// Emit DeviceReleased signal.
+        void EmitDeviceReleased();
+
     private:
         RendererPtr renderer;  ///< Renderer
+
+        OgreRenderSystemListener* renderSystemListener;
+        friend class OgreRenderSystemListener;
+    };
+
+    class OgreRenderSystemListener : public Ogre::RenderSystem::Listener
+    {
+    public:
+        OgreRenderSystemListener(OgreRenderer::OgreRenderingModule* renderingModule);
+        ~OgreRenderSystemListener();
+
+        void eventOccurred(const Ogre::String& eventName, const Ogre::NameValuePairList* parameters = 0);
+
+    private:
+        OgreRenderer::OgreRenderingModule* _renderingModule;
     };
 }

src/Core/OgreRenderingModule/RenderWindow.cpp

@@ -7,6 +7,7 @@
 #include "RenderWindow.h"
 #include "CoreStringUtils.h"
 #include "ConfigAPI.h"
+#include "OgreRenderingModule.h"
 
 #include <QWidget>
 #include <QImage>
@@ -199,18 +200,31 @@ void RenderWindow::CreateRenderWindow(QWidget *targetWindow, const QString &name
 #ifndef ANDROID
     CreateRenderTargetOverlay(width, height);
 #endif
+
+    // Hook to DeviceRestored signal
+    OgreRenderer::OgreRenderingModule* ogreRenderingModule = fw->GetModule<OgreRenderer::OgreRenderingModule>();
+    if(!ogreRenderingModule)
+        return;
+    connect(ogreRenderingModule, SIGNAL(DeviceReleased()), this, SLOT(OnDeviceReleased()));
 }
 
 void RenderWindow::CreateRenderTargetOverlay(int width, int height)
 {
     width = max(1, width);
     height = max(1, height);
 
-    Ogre::TexturePtr renderTarget = Ogre::TextureManager::getSingleton().createManual(
+    Ogre::TexturePtr renderTarget = Ogre::TextureManager::getSingleton().getByName(rttTextureName);
+    if(renderTarget.get())
+        Ogre::TextureManager::getSingleton().remove(renderTarget->getName());
+
+    renderTarget = Ogre::TextureManager::getSingleton().createManual(
         rttTextureName, Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
         Ogre::TEX_TYPE_2D, width, height, 0, Ogre::PF_A8R8G8B8, Ogre::TU_DYNAMIC_WRITE_ONLY_DISCARDABLE);
 
-    Ogre::MaterialPtr rttMaterial = Ogre::MaterialManager::getSingleton().create(
+    Ogre::MaterialPtr rttMaterial = Ogre::MaterialManager::getSingleton().getByName(rttMaterialName);
+    if(rttMaterial.get())
+        Ogre::MaterialManager::getSingleton().remove(rttMaterial->getName());
+    rttMaterial = Ogre::MaterialManager::getSingleton().create(
         rttMaterialName, Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
 
     Ogre::TextureUnitState *rttTuState = rttMaterial->getTechnique(0)->getPass(0)->createTextureUnitState();
@@ -230,13 +244,18 @@ void RenderWindow::CreateRenderTargetOverlay(int width, int height)
     rttMaterial->getTechnique(0)->getPass(0)->setLightingEnabled(false);
     rttMaterial->getTechnique(0)->getPass(0)->setCullingMode(Ogre::CULL_NONE);
 
+    if(Ogre::OverlayManager::getSingleton().hasOverlayElement("MainWindow Overlay Panel"))
+        Ogre::OverlayManager::getSingleton().destroyOverlayElement("MainWindow Overlay Panel");
     overlayContainer = Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", "MainWindow Overlay Panel");
     overlayContainer->setMaterialName(rttMaterialName);
     overlayContainer->setMetricsMode(Ogre::GMM_PIXELS);
     overlayContainer->setPosition(0, 0);
     overlayContainer->setDimensions((Ogre::Real)width, (Ogre::Real)height);
     overlayContainer->setPosition(0,0);
 
+    overlay = Ogre::OverlayManager::getSingleton().getByName("MainWindow Overlay");
+    if(overlay)
+        Ogre::OverlayManager::getSingleton().destroy(overlay);
     overlay = Ogre::OverlayManager::getSingleton().create("MainWindow Overlay");
     overlay->add2D(static_cast<Ogre::OverlayContainer *>(overlayContainer));
     overlay->setZOrder(500);
@@ -347,6 +366,13 @@ int RenderWindow::Height() const
     return renderWindow->getHeight();
 }
 
+void RenderWindow::OnDeviceReleased()
+{
+    int width = renderWindow->getWidth();
+    int height = renderWindow->getHeight();
+    CreateRenderTargetOverlay(width, height);
+}
+
 #ifdef ANDROID
 extern "C" {
 

src/Core/OgreRenderingModule/RenderWindow.h

@@ -55,6 +55,10 @@ public slots:
 
     int Height() const;
 
+private slots:
+    /// Recreate resources when DirectX device is released.
+    void OnDeviceReleased();
+
 private:
     void CreateRenderTargetOverlay(int width, int height);
     Ogre::RenderWindow *renderWindow;