Browse Source

Trade: use strongly typed enum for AbstractMaterialData::Type.

pull/278/head
Vladimír Vondruš 13 years ago
parent
commit
b57a8e9264
  1. 2
      src/Trade/AbstractMaterialData.cpp
  2. 3
      src/Trade/AbstractMaterialData.h
  3. 2
      src/Trade/PhongMaterialData.cpp

2
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() {}

3
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 */
};

2
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) {}
}}

Loading…
Cancel
Save