[Orxonox-commit 7153] r11770 - in code/branches/Presentation_HS17_merge/src: libraries/tools orxonox/graphics

[landauf at orxonox.net]

Author: landauf
Date: 2018-02-18 17:33:19 +0100 (Sun, 18 Feb 2018)
New Revision: 11770

Modified:
   code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.cc
   code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.h
   code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.cc
   code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.h
Log:
[SOBv2_HS17] some cleanup in Model/Mesh

Modified: code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.cc	2018-02-18 16:23:29 UTC (rev 11769)
+++ code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.cc	2018-02-18 16:33:19 UTC (rev 11770)
@@ -78,8 +78,6 @@
         }
     }
 
-    
-
     void Mesh::setCastShadows(bool bCastShadows)
     {
         this->bCastShadows_ = bCastShadows;

Modified: code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.h	2018-02-18 16:23:29 UTC (rev 11769)
+++ code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.h	2018-02-18 16:33:19 UTC (rev 11770)
@@ -49,7 +49,9 @@
 
             void setMaterial(const std::string& name);
             const std::string& getMaterial() const;
+
             void setSubMaterial(const std::string& name, const int index);
+
             void setVisible(bool bVisible);
             bool isVisible() const;
 

Modified: code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.cc	2018-02-18 16:23:29 UTC (rev 11769)
+++ code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.cc	2018-02-18 16:33:19 UTC (rev 11770)
@@ -1,4 +1,3 @@
-
 /*
  *   ORXONOX - the hottest 3D action shooter ever to exist
  *                    > www.orxonox.net <
@@ -41,7 +40,6 @@
 #include "graphics/MeshLodInformation.h"
 #include "Level.h"
 
-
 namespace orxonox
 {
     RegisterClass(Model);

Modified: code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.h	2018-02-18 16:23:29 UTC (rev 11769)
+++ code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.h	2018-02-18 16:33:19 UTC (rev 11770)
@@ -87,7 +87,6 @@
 
             void setSubMaterial(const std::string& name, const int index);
 
-
         protected:
             /**
             @brief