Changeset 11075 for code/branches/shaders_merge/src/orxonox/graphics

Timestamp:

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

Author:

landauf

Message:

fixed author and added some c++11 features

Location:

code/branches/shaders_merge/src/orxonox/graphics

Files:

• Billboard.cc (modified) (2 diffs)
• LensFlare.cc (modified) (1 diff)
• LensFlare.h (modified) (2 diffs)

code/branches/shaders_merge/src/orxonox/graphics/Billboard.cc

@@ -175 +175 @@
     {
         Ogre::BillboardSet* bSet = this->billboard_.getBillboardSet();
-        if( bSet != NULL )
+        if( bSet != nullptr )
         {
             bSet->setRenderQueueGroup(groupID);
@@ -184 +184 @@
     {
         Ogre::BillboardSet* bSet = this->billboard_.getBillboardSet();
-        if( bSet != NULL )
+        if( bSet != nullptr )
         {
             bSet->setBounds(Ogre::AxisAlignedBox(Ogre::AxisAlignedBox::EXTENT_INFINITE),0);

code/branches/shaders_merge/src/orxonox/graphics/LensFlare.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
- *      Reto Grieder (physics)
+ *      David 'davidsa' Salvisberg
  *   Co-authors:
  *      ...

code/branches/shaders_merge/src/orxonox/graphics/LensFlare.h

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
- *      Reto Grieder (physics)
+ *      David 'davidsa' Salvisberg
  *   Co-authors:
  *      ...
@@ -164 +163 @@
                 { return this->fadeOnViewBorder_; }
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual void changedVisibility();
+            virtual void changedVisibility() override;
 
         private: