From 247578a3867eba476466bfb1b25f4c9e0a1433ba Mon Sep 17 00:00:00 2001 From: William JCM Date: Mon, 18 Oct 2021 14:53:35 +0200 Subject: [PATCH] Mass: add getDecals() and getAccessories(). --- src/Mass/Mass.cpp | 137 ++++++++++++++++++---------------------------- src/Mass/Mass.h | 3 + 2 files changed, 56 insertions(+), 84 deletions(-) diff --git a/src/Mass/Mass.cpp b/src/Mass/Mass.cpp index 8143e35..86aa2d3 100644 --- a/src/Mass/Mass.cpp +++ b/src/Mass/Mass.cpp @@ -606,26 +606,7 @@ void Mass::getArmourParts() { _demo = true; } - for(UnsignedInt j = 0; j < decals_array->items.size(); j++) { - auto decal_prop = decals_array->at(j); - auto& decal = part.decals[j]; - - decal.id = decal_prop->at("ID_3_694C0B35404D8A3168AEC89026BC8CF9")->value; - auto colour_prop = decal_prop->at("Color_8_1B0B9D2B43DA6AAB9FA549B374D3E606"); - decal.colour = Color4{colour_prop->r, colour_prop->g, colour_prop->b, colour_prop->a}; - auto pos_prop = decal_prop->at("Position_41_022C8FE84E1AAFE587261E88F2C72250"); - decal.position = Vector3{pos_prop->x, pos_prop->y, pos_prop->z}; - auto u_prop = decal_prop->at("UAxis_37_EBEB715F45491AECACCC07A1AE4646D1"); - decal.uAxis = Vector3{u_prop->x, u_prop->y, u_prop->z}; - auto v_prop = decal_prop->at("VAxis_39_C31EB2664EE202CAECFBBB84100B5E35"); - decal.vAxis = Vector3{v_prop->x, v_prop->y, v_prop->z}; - auto offset_prop = decal_prop->at("Offset_29_B02BBBB74FC60F5EDBEBAB8020738020"); - decal.offset = Vector2{offset_prop->x, offset_prop->y}; - decal.scale = decal_prop->at("Scale_32_959D1C2747AFD8D62808468235CBBA40")->value; - decal.rotation = decal_prop->at("Rotation_27_12D7C314493D203D5C2326A03C5F910F")->value; - decal.flip = decal_prop->at("Flip_35_CECCFB184CCD9412BD93FE9A8B656BE1")->value; - decal.wrap = decal_prop->at("Wrap_43_A7C68CDF4A92AF2ECDA53F953EE7CA62")->value; - } + getDecals(part.decals, decals_array); if(!_demo) { auto accs_array = part_prop->at("Accessories_52_D902DD4241FA0050C2529596255153F3"); @@ -639,27 +620,7 @@ void Mass::getArmourParts() { return; } - for(UnsignedInt j = 0; j < accs_array->items.size(); j++) { - auto acc_prop = accs_array->at(j); - auto& accessory = part.accessories[j]; - - accessory.attachIndex = acc_prop->at("AttachIndex_2_4AFCF6024E4BA7426C6B9F80B8179D20")->value; - accessory.id = acc_prop->at("ID_4_5757B32647BAE263266259B8A7DFFFC1")->value; - auto acc_styles = acc_prop->at("Styles_7_91DEB0F24E24D13FC9472882C11D0DFD"); - for(UnsignedInt k = 0; k < acc_styles->items.size(); k++) { - accessory.styles[k] = acc_styles->at(k)->value; - } - auto rel_pos_prop = acc_prop->at("RelativePosition_14_BE8FB2A94074F34B3EDA6683B227D3A1"); - accessory.relativePosition = Vector3{rel_pos_prop->x, rel_pos_prop->y, rel_pos_prop->z}; - auto rel_pos_offset_prop = acc_prop->at("RelativePositionOffset_15_98FD0CE74E44BBAFC2D46FB4CA4E0ED6"); - accessory.relativePositionOffset = Vector3{rel_pos_offset_prop->x, rel_pos_offset_prop->y, rel_pos_offset_prop->z}; - auto rel_rot_prop = acc_prop->at("RelativeRotation_20_C78C73274E6E78E7878F8C98ECA342C0"); - accessory.relativeRotation = Vector3{rel_rot_prop->x, rel_rot_prop->y, rel_rot_prop->z}; - auto rel_rot_offset_prop = acc_prop->at("RelativeRotationOffset_21_E07FA0EC46728B7BA763C6861249ABAA"); - accessory.relativeRotationOffset = Vector3{rel_rot_offset_prop->x, rel_rot_offset_prop->y, rel_rot_offset_prop->z}; - auto local_scale_prop = acc_prop->at("LocalScale_24_DC2D93A742A41A46E7E61D988F15ED53"); - accessory.localScale = Vector3{local_scale_prop->x, local_scale_prop->y, local_scale_prop->z}; - } + getAccessories(part.accessories, accs_array); } } } @@ -962,6 +923,53 @@ auto Mass::setCustomStyle(const CustomStyle& style, UnsignedLong index, ArrayPro return _mass->saveToFile(); } +void Mass::getDecals(Containers::ArrayView decals, ArrayProperty* decal_array) { + for(UnsignedInt i = 0; i < decal_array->items.size(); i++) { + auto decal_prop = decal_array->at(i); + auto& decal = decals[i]; + + decal.id = decal_prop->at("ID_3_694C0B35404D8A3168AEC89026BC8CF9")->value; + auto colour_prop = decal_prop->at("Color_8_1B0B9D2B43DA6AAB9FA549B374D3E606"); + decal.colour = Color4{colour_prop->r, colour_prop->g, colour_prop->b, colour_prop->a}; + auto pos_prop = decal_prop->at("Position_41_022C8FE84E1AAFE587261E88F2C72250"); + decal.position = Vector3{pos_prop->x, pos_prop->y, pos_prop->z}; + auto u_prop = decal_prop->at("UAxis_37_EBEB715F45491AECACCC07A1AE4646D1"); + decal.uAxis = Vector3{u_prop->x, u_prop->y, u_prop->z}; + auto v_prop = decal_prop->at("VAxis_39_C31EB2664EE202CAECFBBB84100B5E35"); + decal.vAxis = Vector3{v_prop->x, v_prop->y, v_prop->z}; + auto offset_prop = decal_prop->at("Offset_29_B02BBBB74FC60F5EDBEBAB8020738020"); + decal.offset = Vector2{offset_prop->x, offset_prop->y}; + decal.scale = decal_prop->at("Scale_32_959D1C2747AFD8D62808468235CBBA40")->value; + decal.rotation = decal_prop->at("Rotation_27_12D7C314493D203D5C2326A03C5F910F")->value; + decal.flip = decal_prop->at("Flip_35_CECCFB184CCD9412BD93FE9A8B656BE1")->value; + decal.wrap = decal_prop->at("Wrap_43_A7C68CDF4A92AF2ECDA53F953EE7CA62")->value; + } +} + +void Mass::getAccessories(Containers::ArrayView accessories, ArrayProperty* accessory_array) { + for(UnsignedInt i = 0; i < accessory_array->items.size(); i++) { + auto acc_prop = accessory_array->at(i); + auto& accessory = accessories[i]; + + accessory.attachIndex = acc_prop->at("AttachIndex_2_4AFCF6024E4BA7426C6B9F80B8179D20")->value; + accessory.id = acc_prop->at("ID_4_5757B32647BAE263266259B8A7DFFFC1")->value; + auto acc_styles = acc_prop->at("Styles_7_91DEB0F24E24D13FC9472882C11D0DFD"); + for(UnsignedInt j = 0; j < acc_styles->items.size(); j++) { + accessory.styles[j] = acc_styles->at(j)->value; + } + auto rel_pos_prop = acc_prop->at("RelativePosition_14_BE8FB2A94074F34B3EDA6683B227D3A1"); + accessory.relativePosition = Vector3{rel_pos_prop->x, rel_pos_prop->y, rel_pos_prop->z}; + auto rel_pos_offset_prop = acc_prop->at("RelativePositionOffset_15_98FD0CE74E44BBAFC2D46FB4CA4E0ED6"); + accessory.relativePositionOffset = Vector3{rel_pos_offset_prop->x, rel_pos_offset_prop->y, rel_pos_offset_prop->z}; + auto rel_rot_prop = acc_prop->at("RelativeRotation_20_C78C73274E6E78E7878F8C98ECA342C0"); + accessory.relativeRotation = Vector3{rel_rot_prop->x, rel_rot_prop->y, rel_rot_prop->z}; + auto rel_rot_offset_prop = acc_prop->at("RelativeRotationOffset_21_E07FA0EC46728B7BA763C6861249ABAA"); + accessory.relativeRotationOffset = Vector3{rel_rot_offset_prop->x, rel_rot_offset_prop->y, rel_rot_offset_prop->z}; + auto local_scale_prop = acc_prop->at("LocalScale_24_DC2D93A742A41A46E7E61D988F15ED53"); + accessory.localScale = Vector3{local_scale_prop->x, local_scale_prop->y, local_scale_prop->z}; + } +} + void Mass::getWeaponType(const char* prop_name, Containers::ArrayView weapon_array) { auto unit_data = _mass->at("UnitData"); if(!unit_data) { @@ -1002,31 +1010,12 @@ void Mass::getWeaponType(const char* prop_name, Containers::ArrayView we } auto part_decals = part_prop->at("Decals_13_8B81112B453D7230C0CDE982185E14F1"); - if(part_decals->items.size() != 8) { + if(part_decals->items.size() != part.decals.size()) { _demo = true; part.demoDecals = part_decals->items.size(); } - for(UnsignedInt k = 0; k < part_decals->items.size(); k++) { - auto decal_prop = part_decals->at(k); - auto& decal = part.decals[k]; - - decal.id = decal_prop->at("ID_3_694C0B35404D8A3168AEC89026BC8CF9")->value; - auto colour_prop = decal_prop->at("Color_8_1B0B9D2B43DA6AAB9FA549B374D3E606"); - decal.colour = Color4{colour_prop->r, colour_prop->g, colour_prop->b, colour_prop->a}; - auto pos_prop = decal_prop->at("Position_41_022C8FE84E1AAFE587261E88F2C72250"); - decal.position = Vector3{pos_prop->x, pos_prop->y, pos_prop->z}; - auto u_prop = decal_prop->at("UAxis_37_EBEB715F45491AECACCC07A1AE4646D1"); - decal.uAxis = Vector3{u_prop->x, u_prop->y, u_prop->z}; - auto v_prop = decal_prop->at("VAxis_39_C31EB2664EE202CAECFBBB84100B5E35"); - decal.vAxis = Vector3{v_prop->x, v_prop->y, v_prop->z}; - auto offset_prop = decal_prop->at("Offset_29_B02BBBB74FC60F5EDBEBAB8020738020"); - decal.offset = Vector2{offset_prop->x, offset_prop->y}; - decal.scale = decal_prop->at("Scale_32_959D1C2747AFD8D62808468235CBBA40")->value; - decal.rotation = decal_prop->at("Rotation_27_12D7C314493D203D5C2326A03C5F910F")->value; - decal.flip = decal_prop->at("Flip_35_CECCFB184CCD9412BD93FE9A8B656BE1")->value; - decal.wrap = decal_prop->at("Wrap_43_A7C68CDF4A92AF2ECDA53F953EE7CA62")->value; - } + getDecals(part.decals, part_decals); if(!_demo) { auto part_accs = part_prop->at("Accessories_21_3878DE8B4ED0EA0DB725E98BCDC20E0C"); @@ -1035,32 +1024,12 @@ void Mass::getWeaponType(const char* prop_name, Containers::ArrayView we continue; } - if(part_accs->items.size() != 8) { + if(part_accs->items.size() != part.accessories.size()) { _state = State::Invalid; return; } - for(UnsignedInt k = 0; k < part_accs->items.size(); k++) { - auto acc_prop = part_accs->at(k); - auto& accessory = part.accessories[k]; - - accessory.attachIndex = acc_prop->at("AttachIndex_2_4AFCF6024E4BA7426C6B9F80B8179D20")->value; - accessory.id = acc_prop->at("ID_4_5757B32647BAE263266259B8A7DFFFC1")->value; - auto acc_styles = acc_prop->at("Styles_7_91DEB0F24E24D13FC9472882C11D0DFD"); - for(UnsignedInt l = 0; l < acc_styles->items.size(); l++) { - accessory.styles[l] = acc_styles->at(l)->value; - } - auto rel_pos_prop = acc_prop->at("RelativePosition_14_BE8FB2A94074F34B3EDA6683B227D3A1"); - accessory.relativePosition = Vector3{rel_pos_prop->x, rel_pos_prop->y, rel_pos_prop->z}; - auto rel_pos_offset_prop = acc_prop->at("RelativePositionOffset_15_98FD0CE74E44BBAFC2D46FB4CA4E0ED6"); - accessory.relativePositionOffset = Vector3{rel_pos_offset_prop->x, rel_pos_offset_prop->y, rel_pos_offset_prop->z}; - auto rel_rot_prop = acc_prop->at("RelativeRotation_20_C78C73274E6E78E7878F8C98ECA342C0"); - accessory.relativeRotation = Vector3{rel_rot_prop->x, rel_rot_prop->y, rel_rot_prop->z}; - auto rel_rot_offset_prop = acc_prop->at("RelativeRotationOffset_21_E07FA0EC46728B7BA763C6861249ABAA"); - accessory.relativeRotationOffset = Vector3{rel_rot_offset_prop->x, rel_rot_offset_prop->y, rel_rot_offset_prop->z}; - auto local_scale_prop = acc_prop->at("LocalScale_24_DC2D93A742A41A46E7E61D988F15ED53"); - accessory.localScale = Vector3{local_scale_prop->x, local_scale_prop->y, local_scale_prop->z}; - } + getAccessories(part.accessories, part_accs); } } } diff --git a/src/Mass/Mass.h b/src/Mass/Mass.h index 2c24195..022c6c9 100644 --- a/src/Mass/Mass.h +++ b/src/Mass/Mass.h @@ -202,6 +202,9 @@ class Mass { void getCustomStyles(Containers::ArrayView styles, ArrayProperty* style_array); auto setCustomStyle(const CustomStyle& style, UnsignedLong index, ArrayProperty* style_array) -> bool; + void getDecals(Containers::ArrayView decals, ArrayProperty* decal_array); + void getAccessories(Containers::ArrayView accessories, ArrayProperty* accessory_array); + void getWeaponType(const char* prop_name, Containers::ArrayView weapon_array); Containers::Optional _mass;