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

Reformat code with clang format

Browse Source
This commit is contained in:
Clang Format
2023-11-19 15:28:38 +01:00
committed by Jan
parent 22e17272fd
commit 6b4f5d94a8
1099 changed files with 16763 additions and 18076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachment.cpp
View File

@ -1,52 +1,51 @@
#include "AssetLoaderWeaponAttachment.h"
#include <cstring>
#include <iostream>
#include <cassert>
#include "Game/T6/ObjConstantsT6.h"
#include "Game/T6/T6.h"
#include "Game/T6/InfoString/EnumStrings.h"
#include "Game/T6/InfoString/InfoStringToStructConverter.h"
#include "Game/T6/InfoString/WeaponAttachmentFields.h"
#include "Game/T6/ObjConstantsT6.h"
#include "Game/T6/T6.h"
#include "InfoString/InfoString.h"
#include <cassert>
#include <cstring>
#include <iostream>
using namespace T6;
namespace T6
{
eAttachmentPoint attachmentPointByAttachmentTable[]
{
ATTACHMENT_POINT_NONE, // none
ATTACHMENT_POINT_TOP, // acog
ATTACHMENT_POINT_TRIGGER, // dualclip
ATTACHMENT_POINT_TOP, // dualoptic
ATTACHMENT_POINT_BOTTOM, // dw
ATTACHMENT_POINT_MUZZLE, // extbarrel
ATTACHMENT_POINT_TRIGGER, // extclip
ATTACHMENT_POINT_TRIGGER, // extramags
ATTACHMENT_POINT_GUNPERK, // fastads
ATTACHMENT_POINT_TOP, // fastreload
ATTACHMENT_POINT_TRIGGER, // fmj
ATTACHMENT_POINT_BOTTOM, // gl
ATTACHMENT_POINT_BOTTOM, // grip
ATTACHMENT_POINT_TOP, // holo
ATTACHMENT_POINT_BOTTOM, // ir
ATTACHMENT_POINT_BOTTOM, // is
ATTACHMENT_POINT_GUNPERK, // longbreath
ATTACHMENT_POINT_BOTTOM, // mk
ATTACHMENT_POINT_TOP, // mms
ATTACHMENT_POINT_TOP, // rangefinder
ATTACHMENT_POINT_TOP, // reflex
ATTACHMENT_POINT_MUZZLE, // rf
ATTACHMENT_POINT_BOTTOM, // sf
ATTACHMENT_POINT_MUZZLE, // silencer
ATTACHMENT_POINT_TRIGGER, // stackfire
ATTACHMENT_POINT_GUNPERK, // stalker
ATTACHMENT_POINT_GUNPERK, // steadyaim
ATTACHMENT_POINT_GUNPERK, // swayreduc
ATTACHMENT_POINT_TOP, // tacknife
ATTACHMENT_POINT_TOP, // vzoom
eAttachmentPoint attachmentPointByAttachmentTable[]{
ATTACHMENT_POINT_NONE, // none
ATTACHMENT_POINT_TOP, // acog
ATTACHMENT_POINT_TRIGGER, // dualclip
ATTACHMENT_POINT_TOP, // dualoptic
ATTACHMENT_POINT_BOTTOM, // dw
ATTACHMENT_POINT_MUZZLE, // extbarrel
ATTACHMENT_POINT_TRIGGER, // extclip
ATTACHMENT_POINT_TRIGGER, // extramags
ATTACHMENT_POINT_GUNPERK, // fastads
ATTACHMENT_POINT_TOP, // fastreload
ATTACHMENT_POINT_TRIGGER, // fmj
ATTACHMENT_POINT_BOTTOM, // gl
ATTACHMENT_POINT_BOTTOM, // grip
ATTACHMENT_POINT_TOP, // holo
ATTACHMENT_POINT_BOTTOM, // ir
ATTACHMENT_POINT_BOTTOM, // is
ATTACHMENT_POINT_GUNPERK, // longbreath
ATTACHMENT_POINT_BOTTOM, // mk
ATTACHMENT_POINT_TOP, // mms
ATTACHMENT_POINT_TOP, // rangefinder
ATTACHMENT_POINT_TOP, // reflex
ATTACHMENT_POINT_MUZZLE, // rf
ATTACHMENT_POINT_BOTTOM, // sf
ATTACHMENT_POINT_MUZZLE, // silencer
ATTACHMENT_POINT_TRIGGER, // stackfire
ATTACHMENT_POINT_GUNPERK, // stalker
ATTACHMENT_POINT_GUNPERK, // steadyaim
ATTACHMENT_POINT_GUNPERK, // swayreduc
ATTACHMENT_POINT_TOP, // tacknife
ATTACHMENT_POINT_TOP, // vzoom
};
static_assert(std::extent<decltype(attachmentPointByAttachmentTable)>::value == ATTACHMENT_TYPE_COUNT);
@ -74,29 +73,36 @@ namespace T6
}
public:
InfoStringToWeaponAttachmentConverter(const InfoString& infoString, WeaponAttachment* weaponAttachment, ZoneScriptStrings& zoneScriptStrings, MemoryManager* memory, IAssetLoadingManager* manager,
const cspField_t* fields, const size_t fieldCount)
InfoStringToWeaponAttachmentConverter(const InfoString& infoString,
WeaponAttachment* weaponAttachment,
ZoneScriptStrings& zoneScriptStrings,
MemoryManager* memory,
IAssetLoadingManager* manager,
const cspField_t* fields,
const size_t fieldCount)
: InfoStringToStructConverter(infoString, weaponAttachment, zoneScriptStrings, memory, manager, fields, fieldCount)
{
}
};
}
} // namespace T6
void AssetLoaderWeaponAttachment::CalculateAttachmentFields(WeaponAttachment* attachment)
{
// attachmentPoint
if(static_cast<unsigned>(attachment->attachmentType) < ATTACHMENT_TYPE_COUNT)
if (static_cast<unsigned>(attachment->attachmentType) < ATTACHMENT_TYPE_COUNT)
{
attachment->attachmentPoint = attachmentPointByAttachmentTable[attachment->attachmentType];
}
}
bool AssetLoaderWeaponAttachment::LoadFromInfoString(const InfoString& infoString, const std::string& assetName, MemoryManager* memory, IAssetLoadingManager* manager, Zone* zone)
bool AssetLoaderWeaponAttachment::LoadFromInfoString(
const InfoString& infoString, const std::string& assetName, MemoryManager* memory, IAssetLoadingManager* manager, Zone* zone)
{
auto* attachment = memory->Create<WeaponAttachment>();
memset(attachment, 0, sizeof(WeaponAttachment));
InfoStringToWeaponAttachmentConverter converter(infoString, attachment, zone->m_script_strings, memory, manager, attachment_fields, std::extent<decltype(attachment_fields)>::value);
InfoStringToWeaponAttachmentConverter converter(
infoString, attachment, zone->m_script_strings, memory, manager, attachment_fields, std::extent<decltype(attachment_fields)>::value);
if (!converter.Convert())
{
std::cout << "Failed to parse attachment: \"" << assetName << "\"" << std::endl;
@ -125,7 +131,8 @@ bool AssetLoaderWeaponAttachment::CanLoadFromGdt() const
return true;
}
bool AssetLoaderWeaponAttachment::LoadFromGdt(const std::string& assetName, IGdtQueryable* gdtQueryable, MemoryManager* memory, IAssetLoadingManager* manager, Zone* zone) const
bool AssetLoaderWeaponAttachment::LoadFromGdt(
const std::string& assetName, IGdtQueryable* gdtQueryable, MemoryManager* memory, IAssetLoadingManager* manager, Zone* zone) const
{
auto* gdtEntry = gdtQueryable->GetGdtEntryByGdfAndName(ObjConstants::GDF_FILENAME_WEAPON_ATTACHMENT, assetName);
if (gdtEntry == nullptr)
@ -146,7 +153,8 @@ bool AssetLoaderWeaponAttachment::CanLoadFromRaw() const
return true;
}
bool AssetLoaderWeaponAttachment::LoadFromRaw(const std::string& assetName, ISearchPath* searchPath, MemoryManager* memory, IAssetLoadingManager* manager, Zone* zone) const
bool AssetLoaderWeaponAttachment::LoadFromRaw(
const std::string& assetName, ISearchPath* searchPath, MemoryManager* memory, IAssetLoadingManager* manager, Zone* zone) const
{
const auto fileName = "attachment/" + assetName;
const auto file = searchPath->Open(fileName);