mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 14:54:30 +01:00
Code Issues Releases Wiki Activity

Refactor PeepAnimationsObject::ReadAnimations into its own method

Browse Source
This commit is contained in:
Aaron van Geffen
2024-12-10 23:21:52 +01:00
parent 3c87ae6a92
commit d768811c5c
2 changed files with 46 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/openrct2/object/PeepAnimationsObject.cpp
View File

@@ -72,44 +72,7 @@ void PeepAnimationsObject::ReadJson(IReadObjectContext* context, json_t& root)
{
Guard::Assert(groupJson["animations"].is_object(), "PeepAnimationsObject::ReadJson expects animations to be an array");
PeepAnimations group{};
for (auto& [typeStr, typeEnum] : requiredAnimationMap)
{
if (!groupJson["animations"].contains(typeStr))
{
// Successive animation groups can copy the basic animations from the primary group
if (!_animationGroups.empty())
{
auto& referenceAnim = _animationGroups[0][typeEnum];
if (referenceAnim.imageTableOffset != 0)
{
LOG_VERBOSE("Copying animation '%s' from primary group", typeStr);
std::vector<uint8_t> sequence = referenceAnim.frame_offsets;
group[typeEnum] = {
.imageTableOffset = referenceAnim.imageTableOffset,
.frame_offsets = sequence,
};
continue;
}
}
// No primary animation bail us out -- error here!
LOG_ERROR("Required animation does not exist: %s", typeStr);
continue;
}
// The `.data()` here is a workaround for older versions of nlohmann-json.
// TODO: remove when we no longer support Ubuntu 22.04 (Jammy).
auto& animJson = animations[typeStr.data()];
// Store animation sequence in vector
auto sequence = animJson["sequence"].get<std::vector<uint8_t>>();
group[typeEnum] = {
.imageTableOffset = Json::GetNumber<uint16_t>(animJson["offset"]),
.frame_offsets = sequence,
};
}
PeepAnimations group = ReadAnimations(requiredAnimationMap, groupJson["animations"]);
// Is this animation group replacing a legacy group?
if (groupJson.contains("legacyPosition"))
@@ -140,6 +103,50 @@ void PeepAnimationsObject::ReadJson(IReadObjectContext* context, json_t& root)
}
}
PeepAnimations PeepAnimationsObject::ReadAnimations(const EnumMap<PeepAnimationType>& requiredAnimationMap, json_t& animations)
{
PeepAnimations group{};
for (auto& [typeStr, typeEnum] : requiredAnimationMap)
{
if (!animations.contains(typeStr))
{
// Successive animation groups can copy the basic animations from the primary group
if (!_animationGroups.empty())
{
auto& referenceAnim = _animationGroups[0][typeEnum];
if (referenceAnim.imageTableOffset != 0)
{
LOG_VERBOSE("Copying animation '%s' from primary group", typeStr);
std::vector<uint8_t> sequence = referenceAnim.frame_offsets;
group[typeEnum] = {
.imageTableOffset = referenceAnim.imageTableOffset,
.frame_offsets = sequence,
};
continue;
}
}
// No primary animation bail us out -- error here!
LOG_ERROR("Required animation does not exist: %s", typeStr);
continue;
}
// The `.data()` here is a workaround for older versions of nlohmann-json.
// TODO: remove when we no longer support Ubuntu 22.04 (Jammy).
auto& animJson = animations[typeStr.data()];
// Store animation sequence in vector
auto sequence = animJson["sequence"].get<std::vector<uint8_t>>();
group[typeEnum] = {
.imageTableOffset = Json::GetNumber<uint16_t>(animJson["offset"]),
.frame_offsets = sequence,
};
}
return group;
}
std::string PeepAnimationsObject::GetCostumeName() const
{
return GetStringTable().GetString(ObjectStringID::NAME);

1
src/openrct2/object/PeepAnimationsObject.h
View File

@@ -30,6 +30,7 @@ public:
static constexpr ObjectType kObjectType = ObjectType::PeepAnimations;
void ReadJson(IReadObjectContext* context, json_t& root) override;
OpenRCT2::PeepAnimations ReadAnimations(const EnumMap<PeepAnimationType>& requiredAnimationMap, json_t& animations);
void Load() override;
void Unload() override;