diff --git a/src/Trade/AbstractMaterialData.cpp b/src/Trade/AbstractMaterialData.cpp index 39135072c..d62afcf40 100644 --- a/src/Trade/AbstractMaterialData.cpp +++ b/src/Trade/AbstractMaterialData.cpp @@ -26,7 +26,7 @@ namespace Magnum { namespace Trade { -AbstractMaterialData::AbstractMaterialData(AbstractMaterialData::Type type): _type(type) {} +AbstractMaterialData::AbstractMaterialData(Type type): _type(type) {} AbstractMaterialData::~AbstractMaterialData() {} diff --git a/src/Trade/AbstractMaterialData.h b/src/Trade/AbstractMaterialData.h index 4c4cd9903..23654384e 100644 --- a/src/Trade/AbstractMaterialData.h +++ b/src/Trade/AbstractMaterialData.h @@ -29,6 +29,7 @@ */ #include "magnumVisibility.h" +#include "Types.h" namespace Magnum { namespace Trade { @@ -45,7 +46,7 @@ class MAGNUM_EXPORT AbstractMaterialData { public: /** @brief Material type */ - enum Type { + enum class Type: UnsignedByte { Phong /**< Phong shading */ }; diff --git a/src/Trade/PhongMaterialData.cpp b/src/Trade/PhongMaterialData.cpp index 5f640a4fa..339ced677 100644 --- a/src/Trade/PhongMaterialData.cpp +++ b/src/Trade/PhongMaterialData.cpp @@ -26,6 +26,6 @@ namespace Magnum { namespace Trade { -PhongMaterialData::PhongMaterialData(const Vector3& ambientColor, const Vector3& diffuseColor, const Vector3& specularColor, Float shininess): AbstractMaterialData(Phong), _ambientColor(ambientColor), _diffuseColor(diffuseColor), _specularColor(specularColor), _shininess(shininess) {} +PhongMaterialData::PhongMaterialData(const Vector3& ambientColor, const Vector3& diffuseColor, const Vector3& specularColor, Float shininess): AbstractMaterialData(Type::Phong), _ambientColor(ambientColor), _diffuseColor(diffuseColor), _specularColor(specularColor), _shininess(shininess) {} }}