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

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.cc (modified) (5 diffs)

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

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
- *      Reto Grieder (physics)
+ *      David 'davidsa' Salvisberg
  *   Co-authors:
  *      ...
@@ -41 +40 @@
 namespace orxonox
 {
-    RenderQueueListener::RenderQueueListener() : pixelCount_(0), pixelState_(RenderQueueListener::READY_FOR_RENDER)
+    RenderQueueListener::RenderQueueListener() : pixelCount_(0), pixelState_(PixelState::READY_FOR_RENDER)
     {
         hardwareOcclusionQuery_ = Ogre::Root::getSingleton().getRenderSystem()->createHardwareOcclusionQuery(); //create a new HOQ for the scene this listener is used in
@@ -60 +59 @@
     unsigned int RenderQueueListener::getPixelCount()
     {
-        if(this->pixelState_==RenderQueueListener::READY_FOR_ACCESS)
+        if(this->pixelState_==PixelState::READY_FOR_ACCESS)
         {
             this->hardwareOcclusionQuery_->pullOcclusionQuery(&(this->pixelCount_));
-            this->pixelState_=RenderQueueListener::READY_FOR_RENDER;
+            this->pixelState_=PixelState::READY_FOR_RENDER;
         }
         return this->pixelCount_;
@@ -94 +93 @@
                 Ogre::SOP_KEEP,Ogre::SOP_KEEP,Ogre::SOP_REPLACE,false);       
         }
-        if (queueGroupId == RENDER_QUEUE_HOQ && this->pixelState_==RenderQueueListener::READY_FOR_RENDER)
+        if (queueGroupId == RENDER_QUEUE_HOQ && this->pixelState_==PixelState::READY_FOR_RENDER)
         { 
             this->hardwareOcclusionQuery_->beginOcclusionQuery();
-            this->pixelState_=RenderQueueListener::QUERY_STARTED;
+            this->pixelState_=PixelState::QUERY_STARTED;
             //TODO: Skip this rendering step altogheter if we haven't requested the pixel count yet, not sure if this is possible without a custom SceneManager
         }
@@ -116 +115 @@
             renderSystem->setStencilBufferParams(); 
         }
-        if (queueGroupId == RENDER_QUEUE_HOQ && this->pixelState_==RenderQueueListener::QUERY_STARTED)
+        if (queueGroupId == RENDER_QUEUE_HOQ && this->pixelState_==PixelState::QUERY_STARTED)
         {
             this->hardwareOcclusionQuery_->endOcclusionQuery();
-            this->pixelState_=RenderQueueListener::READY_FOR_ACCESS;
+            this->pixelState_=PixelState::READY_FOR_ACCESS;
         }
     }