zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-06 16:37:42 +00:00
Code

ZoneCode: Fix alignments and structs for XAnims

Browse Source
This commit is contained in:
Jan 2019-12-23 21:24:23 +01:00
parent d6f49c459c
commit db8e4c987c
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ZoneCode/Game/T6/T6_Commands.txt
View File

@ -132,6 +132,7 @@ set count indices::_2 indexCount;
set condition indices::_1 numframes < 256; set condition indices::_1 numframes < 256;
set condition indices::data never; set condition indices::data never;
reorder: reorder:
name
names names
notify notify
deltaPart deltaPart
@ -188,6 +189,11 @@ set arraysize u::frames::indices::_1 size + 1;
set arraysize u::frames::indices::_2 size + 1; set arraysize u::frames::indices::_2 size + 1;
set count u::frames::frames size + 1; set count u::frames::frames size + 1;
// XAnimDeltaPartQuatDataFrames
reorder XAnimDeltaPartQuatDataFrames:
indices
frames;
// ========================================= // =========================================
// XModel // XModel
// ========================================= // =========================================
@ -994,7 +1000,7 @@ set string worldModelTag;
set string szXAnims; set string szXAnims;
set count szXAnims 88; set count szXAnims 88;
set reusable szXAnims; set reusable szXAnims;
set count locationDamageMultipliers 84; set count locationDamageMultipliers 21;
set reusable locationDamageMultipliers; set reusable locationDamageMultipliers;
set string fireSound; set string fireSound;
set string fireSoundPlayer; set string fireSoundPlayer;
@ -1070,6 +1076,7 @@ set condition anonymous never;
set condition model FxElemDef::elemType == FX_ELEM_TYPE_MODEL; set condition model FxElemDef::elemType == FX_ELEM_TYPE_MODEL;
set condition effectDef FxElemDef::elemType == FX_ELEM_TYPE_RUNNER; set condition effectDef FxElemDef::elemType == FX_ELEM_TYPE_RUNNER;
set condition soundName FxElemDef::elemType == FX_ELEM_TYPE_SOUND; set condition soundName FxElemDef::elemType == FX_ELEM_TYPE_SOUND;
set string soundName;
set condition lightDef FxElemDef::elemType == FX_ELEM_TYPE_SPOT_LIGHT; set condition lightDef FxElemDef::elemType == FX_ELEM_TYPE_SPOT_LIGHT;
set condition material FxElemDef::elemType == FX_ELEM_TYPE_SPRITE_BILLBOARD set condition material FxElemDef::elemType == FX_ELEM_TYPE_SPRITE_BILLBOARD
|| FxElemDef::elemType == FX_ELEM_TYPE_SPRITE_ORIENTED || FxElemDef::elemType == FX_ELEM_TYPE_SPRITE_ORIENTED

36
src/ZoneCommon/Game/T6/T6_Assets.h
View File

@ -5174,15 +5174,17 @@ namespace T6
DevGraph devguiGraph; DevGraph devguiGraph;
}; };
typedef char ByteVec[3];
typedef __declspec(align(4)) unsigned __int16 UShortVec[3];
union XAnimDynamicFrames union XAnimDynamicFrames
{ {
char (*_1)[3]; ByteVec *_1;
unsigned __int16 (*_2)[3]; UShortVec *_2;
}; };
union XAnimDynamicIndices union XAnimDynamicIndicesTrans
{ {
char _1[1]; char _1[1];
unsigned __int16 _2[1]; unsigned __int16 _2[1];
@ -5194,7 +5196,7 @@ namespace T6
vec3_t mins; vec3_t mins;
vec3_t size; vec3_t size;
XAnimDynamicFrames frames; XAnimDynamicFrames frames;
XAnimDynamicIndices indices; XAnimDynamicIndicesTrans indices;
}; };
@ -5212,18 +5214,25 @@ namespace T6
XAnimPartTransData u; XAnimPartTransData u;
}; };
union XAnimDynamicIndicesDeltaQuat2
{
char _1[1];
unsigned __int16 _2[1];
};
typedef __declspec(align(4)) __int16 XQuat2[2];
struct __declspec(align(4)) XAnimDeltaPartQuatDataFrames2 struct __declspec(align(4)) XAnimDeltaPartQuatDataFrames2
{ {
__int16 (*frames)[2]; XQuat2 *frames;
XAnimDynamicIndices indices; XAnimDynamicIndicesDeltaQuat2 indices;
}; };
union XAnimDeltaPartQuatData2 union XAnimDeltaPartQuatData2
{ {
XAnimDeltaPartQuatDataFrames2 frames; XAnimDeltaPartQuatDataFrames2 frames;
__int16 frame0[2]; XQuat2 frame0;
}; };
@ -5233,18 +5242,25 @@ namespace T6
XAnimDeltaPartQuatData2 u; XAnimDeltaPartQuatData2 u;
}; };
union XAnimDynamicIndicesDeltaQuat
{
char _1[1];
unsigned __int16 _2[1];
};
typedef __declspec(align(4)) __int16 XQuat[4];
struct __declspec(align(4)) XAnimDeltaPartQuatDataFrames struct __declspec(align(4)) XAnimDeltaPartQuatDataFrames
{ {
__int16 (*frames)[4]; XQuat *frames;
XAnimDynamicIndices indices; XAnimDynamicIndicesDeltaQuat indices;
}; };
union XAnimDeltaPartQuatData union XAnimDeltaPartQuatData
{ {
XAnimDeltaPartQuatDataFrames frames; XAnimDeltaPartQuatDataFrames frames;
__int16 frame0[4]; XQuat frame0;
}; };