Changeset 11770 for code/branches/Presentation_HS17_merge

Timestamp:

Feb 18, 2018, 5:33:19 PM (7 years ago)

Author:

landauf

Message:

[SOBv2_HS17] some cleanup in Model/Mesh

Location:

code/branches/Presentation_HS17_merge/src

Files:

• libraries/tools/Mesh.cc (modified) (1 diff)
• libraries/tools/Mesh.h (modified) (1 diff)
• orxonox/graphics/Model.cc (modified) (2 diffs)
• orxonox/graphics/Model.h (modified) (1 diff)

code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.cc

@@ -79 +79 @@
     }
 
-    
-
     void Mesh::setCastShadows(bool bCastShadows)
     {

code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.h

@@ -50 +50 @@
             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;

code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.cc

@@ -1 @@
-
 /*
  *   ORXONOX - the hottest 3D action shooter ever to exist
@@ -41 +40 @@
 #include "graphics/MeshLodInformation.h"
 #include "Level.h"
-
 
 namespace orxonox

code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.h

@@ -88 +88 @@
             void setSubMaterial(const std::string& name, const int index);
 
-
         protected:
             /**