INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-10 06:49:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

replace alignas with macros per compiler in asset headers

Browse Source
This commit is contained in:
Jan
2021-03-03 13:49:58 -08:00
parent 8dfd91e71e
commit 9d05282ffb
2 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/Common/Game/T6/T6_Assets.h
View File

@ -641,7 +641,7 @@ namespace T6
};
struct alignas(8) MaterialInfo
struct type_align(8) MaterialInfo
{
const char* name;
unsigned int gameFlags;
@ -810,7 +810,7 @@ namespace T6
};
#pragma pack(push, 1)
struct alignas(2) SndRuntimeAssetBank
struct type_align(2) SndRuntimeAssetBank
{
const char* zone;
const char* language;
@ -911,7 +911,7 @@ namespace T6
};
struct alignas(4) cLeaf_s
struct type_align(4) cLeaf_s
{
uint16_t firstCollAabbIndex;
uint16_t collAabbCount;
@ -1339,7 +1339,7 @@ namespace T6
};
struct alignas(4) GfxLightImage
struct type_align(4) GfxLightImage
{
GfxImage* image;
char samplerState;
@ -1433,7 +1433,7 @@ namespace T6
};
struct alignas(8) menuDef_t
struct type_align(8) menuDef_t
{
windowDef_t window;
const char* font;
@ -2662,7 +2662,7 @@ namespace T6
typedef tdef_align(16) unsigned short r_index16_t;
struct alignas(16) XSurface
struct type_align(16) XSurface
{
char tileMode;
unsigned char vertListCount;
@ -2692,7 +2692,7 @@ namespace T6
};
struct alignas(4) XBoneInfo
struct type_align(4) XBoneInfo
{
vec3_t bounds[2];
vec3_t offset;
@ -2720,7 +2720,7 @@ namespace T6
};
struct alignas(16) MaterialConstantDef
struct type_align(16) MaterialConstantDef
{
unsigned int nameHash;
char name[12];
@ -2786,7 +2786,7 @@ namespace T6
};*/
struct alignas(4) GfxImageLoadDef
struct type_align(4) GfxImageLoadDef
{
char levelCount;
char flags;
@ -2806,7 +2806,7 @@ namespace T6
};
struct alignas(4) SndIndexEntry
struct type_align(4) SndIndexEntry
{
uint16_t value;
uint16_t next;
@ -2931,7 +2931,7 @@ namespace T6
};
struct alignas(16) cbrush_t
struct type_align(16) cbrush_t
{
vec3_t mins;
int contents;
@ -2993,7 +2993,7 @@ namespace T6
};
struct alignas(16) CollisionAabbTree
struct type_align(16) CollisionAabbTree
{
vec3_t origin;
uint16_t materialIndex;
@ -3094,7 +3094,7 @@ namespace T6
};
struct alignas(4) constraint_t
struct type_align(4) constraint_t
{
vec3_t p;
rope_constraint_e type;
@ -3119,7 +3119,7 @@ namespace T6
};
struct alignas(4) rope_t
struct type_align(4) rope_t
{
par_t m_particles[25];
constraint_t m_constraints[30];
@ -3239,7 +3239,7 @@ namespace T6
};
struct alignas(4) pathnode_dynamic_t
struct type_align(4) pathnode_dynamic_t
{
SentientHandle pOwner;
int iFreeTime;
@ -3279,7 +3279,7 @@ namespace T6
};
struct alignas(16) pathbasenode_t
struct type_align(16) pathbasenode_t
{
vec3_t vOrigin;
unsigned int type;
@ -3333,7 +3333,7 @@ namespace T6
};
struct alignas(16) GfxStreamingAabbTree
struct type_align(16) GfxStreamingAabbTree
{
vec4_t mins;
vec4_t maxs;
@ -3347,7 +3347,7 @@ namespace T6
};
struct alignas(16) float44
struct type_align(16) float44
{
union
{
@ -3357,7 +3357,7 @@ namespace T6
};
struct alignas(16) GfxLight
struct type_align(16) GfxLight
{
char type;
char canUseShadowMap;
@ -3508,7 +3508,7 @@ namespace T6
};*/
struct alignas(4) GfxLightGridEntry
struct type_align(4) GfxLightGridEntry
{
uint16_t colorsIndex;
char primaryLightIndex;
@ -3516,7 +3516,7 @@ namespace T6
};
struct alignas(4) GfxCompressedLightGridColors
struct type_align(4) GfxCompressedLightGridColors
{
char rgb[56][3];
};
@ -3548,7 +3548,7 @@ namespace T6
};
struct alignas(16) GfxBrushModel
struct type_align(16) GfxBrushModel
{
GfxBrushModelWritable writable;
vec3_t bounds[2];
@ -3592,7 +3592,7 @@ namespace T6
};
struct alignas(4) GfxSceneDynBrush
struct type_align(4) GfxSceneDynBrush
{
BModelDrawInfo info;
uint16_t dynEntId;
@ -3627,7 +3627,7 @@ namespace T6
};
struct alignas(16) SSkinInstance
struct type_align(16) SSkinInstance
{
union
{
@ -3684,7 +3684,7 @@ namespace T6
};
struct alignas(16) GfxSurface
struct type_align(16) GfxSurface
{
srfTriangles_t tris;
Material* material;
@ -3712,7 +3712,7 @@ namespace T6
};
struct alignas(4) GfxStaticModelLmapVertexInfo
struct type_align(4) GfxStaticModelLmapVertexInfo
{
unsigned int* lmapVertexColors;
void/*ID3D11Buffer*/* lmapVertexColorsVB;
@ -3935,7 +3935,7 @@ namespace T6
};
struct alignas(8) itemDef_s
struct type_align(8) itemDef_s
{
windowDef_t window;
int type;
@ -5462,7 +5462,7 @@ namespace T6
};
struct alignas(4) DevGraph
struct type_align(4) DevGraph
{
vec2_t* knots;
int* knotCount;
@ -5501,7 +5501,7 @@ namespace T6
};
struct alignas(4) XAnimPartTransFrames
struct type_align(4) XAnimPartTransFrames
{
vec3_t mins;
vec3_t size;
@ -5532,7 +5532,7 @@ namespace T6
typedef tdef_align(4) int16_t XQuat2[2];
struct alignas(4) XAnimDeltaPartQuatDataFrames2
struct type_align(4) XAnimDeltaPartQuatDataFrames2
{
XQuat2 *frames;
XAnimDynamicIndicesDeltaQuat2 indices;
@ -5560,7 +5560,7 @@ namespace T6
typedef tdef_align(4) int16_t XQuat[4];
struct alignas(4) XAnimDeltaPartQuatDataFrames
struct type_align(4) XAnimDeltaPartQuatDataFrames
{
XQuat *frames;
XAnimDynamicIndicesDeltaQuat indices;
@ -5600,7 +5600,7 @@ namespace T6
};
struct alignas(16) GfxPackedVertex
struct type_align(16) GfxPackedVertex
{
vec3_t xyz;
float binormalSign;
@ -5780,7 +5780,7 @@ namespace T6
};
struct alignas(4) pathlink_s
struct type_align(4) pathlink_s
{
float fDist;
uint16_t nodeNum;
@ -5901,7 +5901,7 @@ namespace T6
};
struct alignas(4) SSkinVert
struct type_align(4) SSkinVert
{
half4 pos_bone;
PackedUnitVec normal;
@ -5998,7 +5998,7 @@ namespace T6
};
struct alignas(8) dvar_t
struct type_align(8) dvar_t
{
const char* name;
const char* description;
@ -6529,7 +6529,7 @@ namespace T6
};
struct alignas(16) XSurfaceCollisionNode
struct type_align(16) XSurfaceCollisionNode
{
XSurfaceCollisionAabb aabb;
uint16_t childBeginIndex;
@ -6543,7 +6543,7 @@ namespace T6
};
struct alignas(16) BrushWrapper
struct type_align(16) BrushWrapper
{
vec3_t mins;
int contents;