Changeset 11075 for code/branches/shaders_merge/src/orxonox/RenderQueueListener.h

Timestamp:

Jan 18, 2016, 10:35:11 PM (8 years ago)

Author:

landauf

Message:

fixed author and added some c++11 features

File:

• code/branches/shaders_merge/src/orxonox/RenderQueueListener.h (modified) (5 diffs)

code/branches/shaders_merge/src/orxonox/RenderQueueListener.h

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
- *      Reto Grieder (physics)
+ *      David 'davidsa' Salvisberg
  *   Co-authors:
  *      ...
@@ -52 +51 @@
     };
 
-    const int STENCIL_VALUE_FOR_GLOW = 1; //!< this is a reference value for our mask, 
+    constexpr int STENCIL_VALUE_FOR_GLOW = 1; //!< this is a reference value for our mask, 
                                           //!< if more than one type of stencil mask is to be used, each of them need their own value
-    const int STENCIL_FULL_MASK = 0xFFFFFFFF; //!< this is a reference mask used in our stencil buffer
+    constexpr int STENCIL_FULL_MASK = 0xFFFFFFFF; //!< this is a reference mask used in our stencil buffer
     
     /**
@@ -85 +84 @@
                 In this case we use it to set the stencil buffer parameters of the render system
             */
-            virtual void renderQueueStarted(Ogre::uint8 queueGroupId, const Ogre::String& invocation, bool& skipThisInvocation);
+            virtual void renderQueueStarted(Ogre::uint8 queueGroupId, const Ogre::String& invocation, bool& skipThisInvocation) override;
             /**
             @brief
@@ -92 +91 @@
                 in this case we use it to unset the stencil buffer parameters, so the rest of the render queue is unaffected by it.
             */
-            virtual void renderQueueEnded(Ogre::uint8 queueGroupId, const Ogre::String& invocation, bool& repeatThisInvocation);
+            virtual void renderQueueEnded(Ogre::uint8 queueGroupId, const Ogre::String& invocation, bool& repeatThisInvocation) override;
             
         private:
@@ -98 +97 @@
             unsigned int pixelCount_; //!< this stores the last pixel count returned by the last HOQ in the corresponding render group
             
-            enum PixelState //!< enum to distinguish the several HOQ pixel count states
+            enum class PixelState //!< enum to distinguish the several HOQ pixel count states
             {
                 READY_FOR_RENDER,