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

Merge pull request #172 from Laupetin/feature/iw5-weapons

Browse Source 
feat: load iw5 attachments and weapons
This commit is contained in:
Jan
2024-04-21 20:07:45 +02:00
committed by GitHub
parent ec22d2a01f 6ca7d892f9
commit ff9cb67d84
18 changed files with 1994 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperWeapon.cpp
View File

@ -427,7 +427,7 @@ namespace IW5
std::stringstream ss;
bool first = true;
for (auto i = 0u; i < m_weapon->weapCompleteDef.numFXOverrides; i++)
for (auto i = 0u; i < m_weapon->weapCompleteDef.numFxOverrides; i++)
{
const auto& fxOverride = m_weapon->weapCompleteDef.fxOverrides[i];
@ -455,15 +455,15 @@ namespace IW5
if (fxOverride.fxType < FXTYPE_COUNT)
ss << fxOverrideTypeNames[fxOverride.fxType] << ' ';
if (fxOverride.overrideFX && fxOverride.overrideFX->name && fxOverride.overrideFX->name[0])
ss << fxOverride.overrideFX->name;
if (fxOverride.overrideFx && fxOverride.overrideFx->name && fxOverride.overrideFx->name[0])
ss << fxOverride.overrideFx->name;
else
ss << "none";
ss << ' ';
if (fxOverride.altmodeFX && fxOverride.altmodeFX->name && fxOverride.altmodeFX->name[0])
ss << fxOverride.altmodeFX->name;
if (fxOverride.altmodeFx && fxOverride.altmodeFx->name && fxOverride.altmodeFx->name[0])
ss << fxOverride.altmodeFx->name;
else
ss << "none";
}
@ -688,6 +688,8 @@ bool AssetDumperWeapon::ShouldDump(XAssetInfo<WeaponCompleteDef>* asset)
void AssetDumperWeapon::DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponCompleteDef>* asset)
{
// TODO: only dump infostring fields when non-default
// Only dump raw when no gdt available
if (context.m_gdt)
{

6
src/ObjWriting/Game/IW5/Weapon/JsonWeaponAttachmentWriter.cpp
View File

@ -68,9 +68,9 @@ namespace
jAttachment.weaponType = attachment.weaponType;
jAttachment.weapClass = attachment.weapClass;
CONVERT_XMODEL_ARRAY(worldModels, 16u)
CONVERT_XMODEL_ARRAY(viewModels, 16u)
CONVERT_XMODEL_ARRAY(reticleViewModels, 8u)
CONVERT_XMODEL_ARRAY(worldModels, ATTACHMENT_WORLD_MODEL_COUNT)
CONVERT_XMODEL_ARRAY(viewModels, ATTACHMENT_VIEW_MODEL_COUNT)
CONVERT_XMODEL_ARRAY(reticleViewModels, ATTACHMENT_RETICLE_VIEW_MODEL_COUNT)
CONVERT_ATTRIBUTE(JsonAttAmmoGeneral, ammoGeneral)
CONVERT_ATTRIBUTE(JsonAttSight, sight)