zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-05-16 23:11:42 +00:00
Code Activity

chore: disable type alignment on x64 for x86 games

Browse Source
This commit is contained in:
Jan Laupetin
2025-04-26 18:59:18 +02:00
parent 3b00c1d45b
commit a6107e24a2
6 changed files with 204 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Common/Game/IW5/IW5_Assets.h
+27 -27
View File
@@ -221,9 +221,9 @@ namespace IW5
};
};
typedef tdef_align(16) char raw_byte16;
typedef tdef_align(16) float raw_float16;
typedef tdef_align(128) unsigned int raw_uint128;
typedef tdef_align32(16) char raw_byte16;
typedef tdef_align32(16) float raw_float16;
typedef tdef_align32(128) unsigned int raw_uint128;
typedef unsigned char raw_byte;
typedef unsigned int raw_uint;
typedef unsigned short r_index_t;
@@ -338,7 +338,7 @@ namespace IW5
};
typedef unsigned char ByteVec[3];
typedef tdef_align(4) unsigned short UShortVec[3];
typedef tdef_align32(4) unsigned short UShortVec[3];
union XAnimDynamicFrames
{
@@ -352,7 +352,7 @@ namespace IW5
uint16_t _2[1];
};
struct type_align(4) XAnimPartTransFrames
struct type_align32(4) XAnimPartTransFrames
{
float mins[3];
float size[3];
@@ -379,9 +379,9 @@ namespace IW5
uint16_t _2[1];
};
typedef tdef_align(4) short XQuat2[2];
typedef tdef_align32(4) short XQuat2[2];
struct type_align(4) XAnimDeltaPartQuatDataFrames2
struct type_align32(4) XAnimDeltaPartQuatDataFrames2
{
XQuat2* frames;
XAnimDynamicIndicesQuat2 indices;
@@ -405,7 +405,7 @@ namespace IW5
uint16_t _2[1];
};
typedef tdef_align(4) short XQuat[4];
typedef tdef_align32(4) short XQuat[4];
struct XAnimDeltaPartQuatDataFrames
{
@@ -491,7 +491,7 @@ namespace IW5
unsigned char array[4];
};
struct type_align(16) GfxPackedVertex
struct type_align32(16) GfxPackedVertex
{
vec3_t xyz;
float binormalSign;
@@ -507,7 +507,7 @@ namespace IW5
unsigned short maxs[3];
};
struct type_align(16) XSurfaceCollisionNode
struct type_align32(16) XSurfaceCollisionNode
{
XSurfaceCollisionAabb aabb;
unsigned short childBeginIndex;
@@ -543,7 +543,7 @@ namespace IW5
uint16_t i[3];
};
typedef tdef_align(16) XSurfaceTri XSurfaceTri16;
typedef tdef_align32(16) XSurfaceTri XSurfaceTri16;
struct XSurface
{
@@ -653,7 +653,7 @@ namespace IW5
float quantization;
};
struct gcc_align(8) GfxDrawSurfFields
struct gcc_align32(8) GfxDrawSurfFields
{
uint64_t unused : 1;
uint64_t primarySortKey : 6;
@@ -671,8 +671,8 @@ namespace IW5
union GfxDrawSurf
{
gcc_align(8) GfxDrawSurfFields fields;
gcc_align(8) uint64_t packed;
gcc_align32(8) GfxDrawSurfFields fields;
gcc_align32(8) uint64_t packed;
};
enum MaterialGameFlags
@@ -822,7 +822,7 @@ namespace IW5
MaterialTextureDefInfo u;
};
struct type_align(16) MaterialConstantDef
struct type_align32(16) MaterialConstantDef
{
unsigned int nameHash;
char name[12];
@@ -1127,7 +1127,7 @@ namespace IW5
MaterialTechnique* techniques[54];
};
struct type_align(4) GfxImageLoadDef
struct type_align32(4) GfxImageLoadDef
{
char levelCount;
char pad[3];
@@ -1339,8 +1339,8 @@ namespace IW5
unsigned char edgeCount[2][3];
};
typedef tdef_align(128) cbrush_t cbrush_array_t;
typedef tdef_align(128) Bounds BoundsArray;
typedef tdef_align32(128) cbrush_t cbrush_array_t;
typedef tdef_align32(128) Bounds BoundsArray;
struct ClipInfo
{
@@ -1410,7 +1410,7 @@ namespace IW5
int partitionIndex;
};
struct type_align(16) CollisionAabbTree
struct type_align32(16) CollisionAabbTree
{
float midPoint[3];
unsigned short materialIndex;
@@ -1761,7 +1761,7 @@ namespace IW5
pathnode_transient_t transient;
};
struct type_align(16) pathbasenode_t
struct type_align32(16) pathbasenode_t
{
float vOrigin[3];
unsigned int type;
@@ -1948,7 +1948,7 @@ namespace IW5
unsigned char endVertIndex;
};
union type_align(4) FxGlassGeometryData
union type_align32(4) FxGlassGeometryData
{
FxGlassVertex vert;
FxGlassHoleHeader hole;
@@ -2155,14 +2155,14 @@ namespace IW5
r_index_t* indices;
};
struct type_align(4) GfxLightGridEntry
struct type_align32(4) GfxLightGridEntry
{
unsigned short colorsIndex;
unsigned char primaryLightIndex;
unsigned char needsTrace;
};
struct type_align(4) GfxLightGridColors
struct type_align32(4) GfxLightGridColors
{
unsigned char rgb[56][3];
};
@@ -2190,7 +2190,7 @@ namespace IW5
Bounds bounds;
};
struct type_align(4) GfxBrushModel
struct type_align32(4) GfxBrushModel
{
GfxBrushModelWritable writable;
Bounds bounds;
@@ -2250,7 +2250,7 @@ namespace IW5
unsigned short surfId;
};
struct type_align(4) GfxSceneDynBrush
struct type_align32(4) GfxSceneDynBrush
{
BModelDrawInfo info;
unsigned short dynEntId;
@@ -2396,7 +2396,7 @@ namespace IW5
int exponent;
};
typedef tdef_align(128) GfxCellTree GfxCellTree128;
typedef tdef_align32(128) GfxCellTree GfxCellTree128;
struct GfxWorld
{
@@ -3446,7 +3446,7 @@ namespace IW5
SndAliasCustom projIgnitionSound;
};
typedef tdef_align(4) AttSight AttSight4;
typedef tdef_align32(4) AttSight AttSight4;
struct WeaponAttachment
{