More CMake bullshit

This commit is contained in:
sippeangelo
2015-11-30 11:16:43 +01:00
parent 8419d2e7b9
commit 52278d7bc2
20 changed files with 264 additions and 85 deletions
+19
View File
@@ -0,0 +1,19 @@
#ifndef Image_h
#define Image_h
struct Image
{
enum class ImageFormat
{
Unknown,
RGB,
RGBA
};
unsigned int Width = 0;
unsigned int Height = 0;
ImageFormat Format = ImageFormat::Unknown;
unsigned char* Data = nullptr;
};
#endif
+3 -3
View File
@@ -47,9 +47,9 @@ public:
struct MaterialGroup
{
float Shininess;
std::shared_ptr<dd::Texture> Texture;
std::shared_ptr<dd::Texture> NormalMap;
std::shared_ptr<dd::Texture> SpecularMap;
std::shared_ptr<::Texture> Texture;
std::shared_ptr<::Texture> NormalMap;
std::shared_ptr<::Texture> SpecularMap;
unsigned int StartIndex;
unsigned int EndIndex;
};