Indentation style changed to Horstmann

This commit is contained in:
2014-04-11 21:53:05 +02:00
parent e70e18a27b
commit f2259f712d
61 changed files with 353 additions and 697 deletions
+3 -6
View File
@@ -15,8 +15,7 @@ class OBJ
{
public:
struct MaterialInfo
{
std::string TextureFile;
{ std::string TextureFile;
std::tuple<float, float, float> AmbientColor;
std::tuple<float, float, float> DiffuseColor;
std::tuple<float, float, float> SpecularColor;
@@ -28,15 +27,13 @@ public:
};
struct FaceDefinition
{
int VertexIndex;
{ int VertexIndex;
int TextureCoordIndex;
int NormalIndex;
};
struct Face
{
Face() : Material(nullptr) { }
{ Face() : Material(nullptr) { }
std::vector<FaceDefinition> Definitions;
MaterialInfo* Material;
};