thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor and fix drawOnMinimap

Browse source
This commit is contained in:
JugadorXEI 2024-06-05 13:02:29 +02:00
parent eff25774a1
commit 10d46fb1db
1 changed files with 30 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

156
src/lua_hudlib.c
View file

@ -26,6 +26,7 @@
#include "w_wad.h" #include "w_wad.h"
#include "z_zone.h" #include "z_zone.h"
#include "hu_stuff.h" #include "hu_stuff.h"
#include "k_hud.h"
#include "lua_script.h" #include "lua_script.h"
#include "lua_libs.h" #include "lua_libs.h"
@ -575,6 +576,7 @@ static int libd_drawStretched(lua_State *L)
// KART: draw patch on minimap from x, y coordinates on the map // KART: draw patch on minimap from x, y coordinates on the map
// Sal: Let's please just merge the relevant info into the actual function, and have Lua call that... // Sal: Let's please just merge the relevant info into the actual function, and have Lua call that...
// JugadorXEI: hey, sure.
static int libd_drawOnMinimap(lua_State *L) static int libd_drawOnMinimap(lua_State *L)
{ {
fixed_t x, y, scale; // coordinates of the object fixed_t x, y, scale; // coordinates of the object
@ -585,22 +587,12 @@ static int libd_drawOnMinimap(lua_State *L)
// variables used to replicate k_kart's mmap drawer: // variables used to replicate k_kart's mmap drawer:
patch_t *AutomapPic; patch_t *AutomapPic;
INT32 mx, my;
INT32 splitflags, minimaptrans;
// base position of the minimap which also takes splits into account:
INT32 MM_X, MM_Y;
// variables used for actually drawing the icon: // variables used for actually drawing the icon:
fixed_t amnumxpos, amnumypos; position_t amnumpos;
INT32 amxpos, amypos; INT32 minimapflags;
fixed_t amxpos, amypos;
node_t *bsp = &nodes[numnodes-1]; INT32 mm_x, mm_y;
fixed_t maxx, minx, maxy, miny;
fixed_t mapwidth, mapheight;
fixed_t xoffset, yoffset;
fixed_t xscale, yscale, zoom;
fixed_t patchw, patchh; fixed_t patchw, patchh;
HUDONLY // only run this function in hud hooks HUDONLY // only run this function in hud hooks
@ -611,56 +603,7 @@ static int libd_drawOnMinimap(lua_State *L)
if (!lua_isnoneornil(L, 5)) if (!lua_isnoneornil(L, 5))
colormap = *((UINT8 **)luaL_checkudata(L, 5, META_COLORMAP)); colormap = *((UINT8 **)luaL_checkudata(L, 5, META_COLORMAP));
centered = lua_optboolean(L, 6); centered = lua_optboolean(L, 6);
// replicate exactly what source does for its minimap drawer; AKA hardcoded garbo.
// first, check what position the mmap is supposed to be in (pasted from k_kart.c):
MM_X = BASEVIDWIDTH - 50; // 270
MM_Y = (BASEVIDHEIGHT/2)-16; // 84
if (r_splitscreen)
{
MM_Y = (BASEVIDHEIGHT/2);
if (r_splitscreen > 1) // 3P : bottom right
{
MM_X = (3*BASEVIDWIDTH/4);
MM_Y = (3*BASEVIDHEIGHT/4);
if (r_splitscreen > 2) // 4P: centered
{
MM_X = (BASEVIDWIDTH/2);
MM_Y = (BASEVIDHEIGHT/2);
}
}
}
// splitscreen flags
splitflags = (r_splitscreen == 3 ? 0 : V_SNAPTORIGHT); // flags should only be 0 when it's centered (4p split)
{
const tic_t length = TICRATE/2;
if (!lt_exitticker)
return 0;
minimaptrans = 4;
if (lt_exitticker < length)
minimaptrans = (((INT32)lt_exitticker)*minimaptrans)/((INT32)length);
if (!minimaptrans)
return 0;
}
minimaptrans = ((10-minimaptrans)<<FF_TRANSSHIFT);
splitflags |= minimaptrans;
if (!(r_splitscreen == 2))
{
splitflags &= ~minimaptrans;
splitflags |= V_HUDTRANSHALF;
}
splitflags &= ~V_HUDTRANSHALF;
splitflags |= V_HUDTRANS;
// Draw the HUD only when playing in a level. // Draw the HUD only when playing in a level.
// hu_stuff needs this, unlike st_stuff. // hu_stuff needs this, unlike st_stuff.
if (gamestate != GS_LEVEL) if (gamestate != GS_LEVEL)
@ -668,79 +611,40 @@ static int libd_drawOnMinimap(lua_State *L)
if (R_GetViewNumber() != 0) if (R_GetViewNumber() != 0)
return 0; return 0;
AutomapPic = mapheaderinfo[gamemap-1]->minimapPic; AutomapPic = minimapinfo.minimap_pic;
if (!AutomapPic) if (!AutomapPic)
{ {
return 0; // no pic, just get outta here return 0; // no pic, just get outta here
} }
mx = MM_X - (AutomapPic->width/2); // Handle offsets and stuff.
my = MM_Y - (AutomapPic->height/2); mm_x = MINI_X;
mm_y = MINI_Y - SHORT(AutomapPic->topoffset);
// let offsets transfer to the heads, too!
if (encoremode) if (encoremode)
mx += SHORT(AutomapPic->leftoffset); {
mm_x += SHORT(AutomapPic->leftoffset);
}
else else
mx -= SHORT(AutomapPic->leftoffset); {
my -= SHORT(AutomapPic->topoffset); mm_x -= SHORT(AutomapPic->leftoffset);
}
// now that we have replicated this behavior, we can draw an icon from our supplied x, y coordinates by replicating k_kart.c's totally understandable uncommented code!!! // Minimap flags:
minimapflags = K_GetMinimapSplitFlags(false)|K_GetMinimapTransFlags(false);
// get map boundaries using nodes
maxx = maxy = INT32_MAX;
minx = miny = INT32_MIN;
minx = bsp->bbox[0][BOXLEFT];
maxx = bsp->bbox[0][BOXRIGHT];
miny = bsp->bbox[0][BOXBOTTOM];
maxy = bsp->bbox[0][BOXTOP];
if (bsp->bbox[1][BOXLEFT] < minx)
minx = bsp->bbox[1][BOXLEFT];
if (bsp->bbox[1][BOXRIGHT] > maxx)
maxx = bsp->bbox[1][BOXRIGHT];
if (bsp->bbox[1][BOXBOTTOM] < miny)
miny = bsp->bbox[1][BOXBOTTOM];
if (bsp->bbox[1][BOXTOP] > maxy)
maxy = bsp->bbox[1][BOXTOP];
// You might be wondering why these are being bitshift here
// it's because mapwidth and height would otherwise overflow for maps larger than half the size possible...
// map boundaries and sizes will ALWAYS be whole numbers thankfully
// later calculations take into consideration that these are actually not in terms of FRACUNIT though
minx >>= FRACBITS;
maxx >>= FRACBITS;
miny >>= FRACBITS;
maxy >>= FRACBITS;
// these are our final map boundaries:
mapwidth = maxx - minx;
mapheight = maxy - miny;
// These should always be small enough to be bitshift back right now
xoffset = (minx + mapwidth/2)<<FRACBITS;
yoffset = (miny + mapheight/2)<<FRACBITS;
xscale = FixedDiv(AutomapPic->width, mapwidth);
yscale = FixedDiv(AutomapPic->height, mapheight);
zoom = FixedMul(min(xscale, yscale), FRACUNIT-FRACUNIT/20);
amnumxpos = (FixedMul(x, zoom) - FixedMul(xoffset, zoom));
amnumypos = -(FixedMul(y, zoom) - FixedMul(yoffset, zoom));
if (encoremode)
amnumxpos = -amnumxpos;
// scale patch coords // scale patch coords
patchw = patch->width*scale /2; patchw = (SHORT(patch->width) / 2) * scale;
patchh = patch->height*scale /2; patchh = (SHORT(patch->height) / 2) * scale;
if (centered) if (centered)
patchw = patchh = 0; // patch is supposedly already centered, don't butt in. patchw = patchh = 0; // patch is supposedly already centered, don't butt in.
amxpos = amnumxpos + ((mx + AutomapPic->width/2)<<FRACBITS) - patchw; amnumpos = K_GetKartObjectPosToMinimapPos(x, y);
amypos = amnumypos + ((my + AutomapPic->height/2)<<FRACBITS) - patchh;
amxpos = amnumpos.x + (mm_x<<FRACBITS) - patchw;
amypos = amnumpos.y + (mm_y<<FRACBITS) - patchh;
// and NOW we can FINALLY DRAW OUR GOD DAMN PATCH :V // and NOW we can FINALLY DRAW OUR GOD DAMN PATCH :V
lua_getfield(L, LUA_REGISTRYINDEX, "HUD_DRAW_LIST"); lua_getfield(L, LUA_REGISTRYINDEX, "HUD_DRAW_LIST");
@ -748,9 +652,9 @@ static int libd_drawOnMinimap(lua_State *L)
lua_pop(L, 1); lua_pop(L, 1);
if (LUA_HUD_IsDrawListValid(list)) if (LUA_HUD_IsDrawListValid(list))
LUA_HUD_AddDrawScaled(list, amxpos, amypos, scale, patch, splitflags, colormap); LUA_HUD_AddDrawScaled(list, amxpos, amypos, scale, patch, minimapflags, colormap);
else else
V_DrawFixedPatch(amxpos, amypos, scale, splitflags, patch, colormap); V_DrawFixedPatch(amxpos, amypos, scale, minimapflags, patch, colormap);
return 0; return 0;
} }