Revert "Indentation style changed to Horstmann"

This reverts commit f2259f712d.

Conflicts:

	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
This commit is contained in:
2014-04-12 01:48:15 +02:00
parent d7e65ff118
commit 3470a80f40
61 changed files with 697 additions and 354 deletions
+6 -3
View File
@@ -15,7 +15,8 @@ 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;
@@ -27,13 +28,15 @@ 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;
};