mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge branch 'dialogue-optimization' into 'master'
Dialogue: cache common patches instead of doing name lookup every frame See merge request KartKrew/Kart!2221
This commit is contained in:
commit
fb75485c9c
2 changed files with 28 additions and 8 deletions
|
|
@ -143,6 +143,23 @@ void Dialogue::Typewriter::CompleteText(void)
|
|||
|
||||
void Dialogue::Init(void)
|
||||
{
|
||||
if (!active)
|
||||
{
|
||||
auto cache = [](const char* name)
|
||||
{
|
||||
return std::pair {std::string_view {name}, srb2::Draw::cache_patch(name)};
|
||||
};
|
||||
patchCache = {
|
||||
cache("TUTDIAGA"),
|
||||
cache("TUTDIAGB"),
|
||||
cache("TUTDIAGC"),
|
||||
cache("TUTDIAGD"),
|
||||
cache("TUTDIAGF"),
|
||||
cache("TUTDIAGE"),
|
||||
cache("TUTDIAG2"),
|
||||
};
|
||||
}
|
||||
|
||||
active = true;
|
||||
}
|
||||
|
||||
|
|
@ -349,17 +366,17 @@ void Dialogue::Draw(void)
|
|||
|
||||
drawer
|
||||
.flags(speakerbgflags|V_VFLIP|V_FLIP)
|
||||
.patch("TUTDIAGA");
|
||||
.patch(patchCache["TUTDIAGA"]);
|
||||
|
||||
drawer
|
||||
.flags(V_VFLIP|V_FLIP)
|
||||
.patch("TUTDIAGB");
|
||||
.patch(patchCache["TUTDIAGB"]);
|
||||
|
||||
if (portrait != nullptr)
|
||||
{
|
||||
drawer
|
||||
.flags(V_VFLIP|V_FLIP)
|
||||
.patch("TUTDIAGC");
|
||||
.patch(patchCache["TUTDIAGC"]);
|
||||
|
||||
drawer
|
||||
.xy(-10-32, -41-32)
|
||||
|
|
@ -426,7 +443,7 @@ void Dialogue::Draw(void)
|
|||
drawer
|
||||
.xy(speakernameedge, -36)
|
||||
.flags(V_VFLIP|V_FLIP)
|
||||
.patch("TUTDIAGD");
|
||||
.patch(patchCache["TUTDIAGD"]);
|
||||
|
||||
drawer
|
||||
.xy(speakernameedge, -36-3-11)
|
||||
|
|
@ -437,7 +454,7 @@ void Dialogue::Draw(void)
|
|||
drawer
|
||||
.xy(speakernameedge + 5, -36)
|
||||
.flags(V_VFLIP|V_FLIP)
|
||||
.patch("TUTDIAGF");
|
||||
.patch(patchCache["TUTDIAGF"]);
|
||||
}
|
||||
|
||||
while (speakernameedge > -142) // the left-most edge
|
||||
|
|
@ -447,13 +464,13 @@ void Dialogue::Draw(void)
|
|||
drawer
|
||||
.xy(speakernameedge, -36)
|
||||
.flags(V_VFLIP|V_FLIP)
|
||||
.patch("TUTDIAGD");
|
||||
.patch(patchCache["TUTDIAGD"]);
|
||||
}
|
||||
|
||||
drawer
|
||||
.xy(speakernameedge - arrowstep, -36)
|
||||
.flags(V_VFLIP|V_FLIP)
|
||||
.patch("TUTDIAGE");
|
||||
.patch(patchCache["TUTDIAGE"]);
|
||||
|
||||
drawer
|
||||
.xy(10 - BASEVIDWIDTH, -3-32)
|
||||
|
|
@ -466,7 +483,7 @@ void Dialogue::Draw(void)
|
|||
{
|
||||
drawer
|
||||
.xy(-14, -7-5)
|
||||
.patch("TUTDIAG2");
|
||||
.patch(patchCache["TUTDIAG2"]);
|
||||
}
|
||||
|
||||
auto bt_translate_press = [this]() -> std::optional<bool>
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
#include <unordered_map>
|
||||
|
||||
#include "doomdef.h"
|
||||
#include "doomtype.h"
|
||||
|
|
@ -89,6 +90,8 @@ private:
|
|||
patch_t *portrait;
|
||||
UINT8 *portraitColormap;
|
||||
|
||||
std::unordered_map<std::string_view, patch_t*> patchCache;
|
||||
|
||||
bool active;
|
||||
fixed_t slide;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue