Changeset 11085 for code/trunk/src/libraries/core

Timestamp:

Jan 23, 2016, 9:34:29 PM (9 years ago)

Author:

landauf

Message:

enable glow shader in all scenes

Location:

code/trunk/src/libraries/core

Files:

• CorePrereqs.h (modified) (1 diff)
• GlowMaterialListener.h (added)
• GraphicsManager.cc (modified) (6 diffs)
• GraphicsManager.h (modified) (1 diff)

code/trunk/src/libraries/core/CorePrereqs.h

@@ -184 +184 @@
     struct GameStateInfo;
     struct GameStateTreeNode;
+    class GlowMaterialListener;
     class GraphicsManager;
     class GUIManager;

code/trunk/src/libraries/core/GraphicsManager.cc

@@ -38 +38 @@
 #include <OgreRoot.h>
 #include <OgreLogManager.h>
+#include <OgreMaterialManager.h>
 #include <OgreRenderWindow.h>
 #include <OgreRenderSystem.h>
@@ -56 +57 @@
 #include "Game.h"
 #include "GameMode.h"
+#include "GlowMaterialListener.h"
 #include "GUIManager.h"
 #include "Loader.h"
@@ -100 +102 @@
         , renderWindow_(nullptr)
         , viewport_(nullptr)
+        , glowMaterialListener_(nullptr)
         , lastFrameStartTime_(0.0f)
         , lastFrameEndTime_(0.0f)
@@ -140 +143 @@
         orxout(internal_status) << "destroying GraphicsManager..." << endl;
 
+        Ogre::MaterialManager::getSingleton().removeListener(this->glowMaterialListener_);
         Ogre::WindowEventUtilities::removeWindowEventListener(renderWindow_, ogreWindowEventListener_);
+
         ModifyConsoleCommand(__CC_printScreen_name).resetFunction();
         ModifyConsoleCommand(__CC_GraphicsManager_group, __CC_setScreenResolution_name).resetFunction();
@@ -153 +158 @@
         safeObjectDelete(&ogreLogger_);
         safeObjectDelete(&ogreWindowEventListener_);
+        safeObjectDelete(&glowMaterialListener_);
 
         orxout(internal_status) << "finished destroying GraphicsManager" << endl;
@@ -306 +312 @@
 
         Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(Ogre::MIP_UNLIMITED);
+
+        this->glowMaterialListener_ = new GlowMaterialListener();
+        Ogre::MaterialManager::getSingleton().addListener(this->glowMaterialListener_);
 
         //Add program icon

code/trunk/src/libraries/core/GraphicsManager.h

@@ -127 +127 @@
         Ogre::LogManager*        ogreLogger_;
         Ogre::Root*              ogreRoot_;                //!< Ogre's root
-        Ogre::RenderWindow* renderWindow_;             //!< the one and only render window
-        Ogre::Viewport*     viewport_;                 //!< default full size viewport
-        float               lastFrameStartTime_;       //!< Time stamp of the beginning of the last frame
-        float               lastFrameEndTime_;         //!< Time stamp of the end of the last frame
+        Ogre::RenderWindow*      renderWindow_;            //!< the one and only render window
+        Ogre::Viewport*          viewport_;                //!< default full size viewport
+        GlowMaterialListener*    glowMaterialListener_;    //!< Material Listener for the 'Glow' compositor
+        float                    lastFrameStartTime_;      //!< Time stamp of the beginning of the last frame
+        float                    lastFrameEndTime_;        //!< Time stamp of the end of the last frame
 
         // XML files for the resources and the debug overlay