Fixed the god-awful indentation

This commit is contained in:
mathusummut
2018-05-06 00:01:36 +02:00
parent 643e3820f5
commit 35b7b1f1a6
459 changed files with 204893 additions and 217545 deletions

View File

@@ -20,102 +20,104 @@ using Shared::Platform::uint16;
using Shared::Platform::uint32;
using Shared::Platform::float32;
namespace Shared{ namespace Graphics{
namespace Shared {
namespace Graphics {
#pragma pack(push, 1)
struct FileHeader{
uint8 id[3];
uint8 version;
};
struct FileHeader {
uint8 id[3];
uint8 version;
};
//version 4
//version 4
struct ModelHeader{
uint16 meshCount;
uint8 type;
};
struct ModelHeader {
uint16 meshCount;
uint8 type;
};
enum ModelType{
mtMorphMesh
};
enum ModelType {
mtMorphMesh
};
enum MeshPropertyFlag{
mpfCustomColor= 1,
mpfTwoSided= 2,
mpfNoSelect= 4,
mpfGlow= 8
};
enum MeshPropertyFlag {
mpfCustomColor = 1,
mpfTwoSided = 2,
mpfNoSelect = 4,
mpfGlow = 8
};
enum MeshTexture{
mtDiffuse,
mtSpecular,
mtNormal,
mtReflection,
mtColorMask,
enum MeshTexture {
mtDiffuse,
mtSpecular,
mtNormal,
mtReflection,
mtColorMask,
meshTextureCount
};
meshTextureCount
};
const int meshTextureChannelCount[]= {-1, 1, 3, 1, 1};
const int meshTextureChannelCount[] = { -1, 1, 3, 1, 1 };
const uint32 meshNameSize= 64;
const uint32 mapPathSize= 64;
const uint32 meshNameSize = 64;
const uint32 mapPathSize = 64;
struct MeshHeader{
uint8 name[meshNameSize];
uint32 frameCount;
uint32 vertexCount;
uint32 indexCount;
float32 diffuseColor[3];
float32 specularColor[3];
float32 specularPower;
float32 opacity;
uint32 properties;
uint32 textures;
};
struct MeshHeader {
uint8 name[meshNameSize];
uint32 frameCount;
uint32 vertexCount;
uint32 indexCount;
float32 diffuseColor[3];
float32 specularColor[3];
float32 specularPower;
float32 opacity;
uint32 properties;
uint32 textures;
};
#pragma pack(pop)
//version 3
//version 3
//front faces are clockwise faces
struct ModelHeaderV3{
uint32 meshCount;
};
//front faces are clockwise faces
struct ModelHeaderV3 {
uint32 meshCount;
};
enum MeshPropertyV3{
mp3NoTexture= 1,
mp3TwoSided= 2,
mp3CustomColor= 4
};
enum MeshPropertyV3 {
mp3NoTexture = 1,
mp3TwoSided = 2,
mp3CustomColor = 4
};
struct MeshHeaderV3{
uint32 vertexFrameCount;
uint32 normalFrameCount;
uint32 texCoordFrameCount;
uint32 colorFrameCount;
uint32 pointCount;
uint32 indexCount;
uint32 properties;
uint8 texName[64];
};
struct MeshHeaderV3 {
uint32 vertexFrameCount;
uint32 normalFrameCount;
uint32 texCoordFrameCount;
uint32 colorFrameCount;
uint32 pointCount;
uint32 indexCount;
uint32 properties;
uint8 texName[64];
};
//version 2
//version 2
struct MeshHeaderV2{
uint32 vertexFrameCount;
uint32 normalFrameCount;
uint32 texCoordFrameCount;
uint32 colorFrameCount;
uint32 pointCount;
uint32 indexCount;
uint8 hasTexture;
uint8 primitive;
uint8 cullFace;
uint8 texName[64];
};
struct MeshHeaderV2 {
uint32 vertexFrameCount;
uint32 normalFrameCount;
uint32 texCoordFrameCount;
uint32 colorFrameCount;
uint32 pointCount;
uint32 indexCount;
uint8 hasTexture;
uint8 primitive;
uint8 cullFace;
uint8 texName[64];
};
}}//end namespace
}
}//end namespace
#endif