Skip to content

Commit

Permalink
Merge pull request #6 from BSzili/master
Browse files Browse the repository at this point in the history
WallVertex 4 byte alignment
  • Loading branch information
Panzerschrek authored Nov 22, 2017
2 parents d47d697 + fe82d25 commit 7aefb4c
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions PanzerChasm/client/map_drawer_gl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,19 @@ SIZE_ASSERT( FloorVertex, 4u );
struct WallVertex
{
unsigned short xyz[3]; // 8.8 fixed
unsigned short pad1;
short tex_coord[2]; // 8.8 fixed
unsigned char texture_id;
unsigned char pad2[3];
char normal[2];
char pad3[2];
unsigned char lightmap_coord[2];
unsigned char reserved[1];
unsigned char pad4[2];
//unsigned char reserved[1];
};

SIZE_ASSERT( WallVertex, 16u );
//SIZE_ASSERT( WallVertex, 16u );
SIZE_ASSERT( WallVertex, 24u );

struct ModelsTexturesPlacement
{
Expand Down

0 comments on commit 7aefb4c

Please sign in to comment.