Revert "Indentation style changed to Horstmann"
This reverts commit f2259f712d.
Conflicts:
src/GameWorld.cpp
src/Systems/PhysicsSystem.cpp
This commit is contained in:
@@ -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;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user