mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Apply review suggestions

This commit is contained in:
Matt 2021-01-05 19:05:47 +02:00
parent 876b55727e
commit f77076def6
No known key found for this signature in database
GPG Key ID: 6D4C24A61C93E208
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/openrct2/world/Sprite.cpp
View File

@ -931,8 +931,8 @@ void EntityTweener::PopulateEntities(EntityListId id)
{
for (auto ent : EntityList(id))
{
_ents.push_back(&(*ent));
_prePos.emplace_back(ent->x, ent->y, ent->z);
Entities.push_back(&(*ent));
PrePos.emplace_back(ent->x, ent->y, ent->z);
}
}
@ -947,16 +947,16 @@ void EntityTweener::PreTick()
void EntityTweener::PostTick()
{
for (auto* ent : _ents)
for (auto* ent : Entities)
{
if (ent == nullptr)
{
// Sprite was removed, add a dummy position to keep the index aligned.
_postPos.emplace_back(0, 0, 0);
PostPos.emplace_back(0, 0, 0);
}
else
{
_postPos.emplace_back(ent->x, ent->y, ent->z);
PostPos.emplace_back(ent->x, ent->y, ent->z);
}
}
}
@ -969,22 +969,22 @@ void EntityTweener::RemoveEntity(SpriteBase* entity)
return;
}
auto it = std::find(_ents.begin(), _ents.end(), entity);
if (it != _ents.end())
auto it = std::find(Entities.begin(), Entities.end(), entity);
if (it != Entities.end())
*it = nullptr;
}
void EntityTweener::Tween(float alpha)
{
const float inv = (1.0f - alpha);
for (size_t i = 0; i < _ents.size(); ++i)
for (size_t i = 0; i < Entities.size(); ++i)
{
auto* ent = _ents[i];
auto* ent = Entities[i];
if (ent == nullptr)
continue;
auto& posA = _prePos[i];
auto& posB = _postPos[i];
auto& posA = PrePos[i];
auto& posB = PostPos[i];
if (posA == posB)
continue;
@ -1000,22 +1000,22 @@ void EntityTweener::Tween(float alpha)
void EntityTweener::Restore()
{
for (size_t i = 0; i < _ents.size(); ++i)
for (size_t i = 0; i < Entities.size(); ++i)
{
auto* ent = _ents[i];
auto* ent = Entities[i];
if (ent == nullptr)
continue;
sprite_set_coordinates(_postPos[i], ent);
sprite_set_coordinates(PostPos[i], ent);
ent->Invalidate();
}
}
void EntityTweener::Reset()
{
_ents.clear();
_prePos.clear();
_postPos.clear();
Entities.clear();
PrePos.clear();
PostPos.clear();
}
static EntityTweener tweener;

6
src/openrct2/world/Sprite.h
View File

@ -375,9 +375,9 @@ public:
class EntityTweener
{
std::vector<SpriteBase*> _ents;
std::vector<CoordsXYZ> _prePos;
std::vector<CoordsXYZ> _postPos;
std::vector<SpriteBase*> Entities;
std::vector<CoordsXYZ> PrePos;
std::vector<CoordsXYZ> PostPos;
private:
void PopulateEntities(EntityListId id);