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

Nametags improvements (#392)

Browse source 
The nametag's scale is now controlled by its depth, matching the player's size
The nametag's color now uses the same function used by chat to retrieve the player color
The nametag will fade away if it gets too close to the camera
This commit is contained in:
Cooliokid956 2024-10-31 04:02:48 -05:00 • committed by GitHub
parent 4915bad1e7
commit d02b85bb5e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/pc/nametags.c
View file

@ -10,8 +10,9 @@
#include "pc/lua/utils/smlua_misc_utils.h" #include "pc/lua/utils/smlua_misc_utils.h"
#include "pc/lua/smlua_hooks.h" #include "pc/lua/smlua_hooks.h"
#define NAMETAG_MAX_SCALE 0.32f #define CLAMP(_val, _min, _max) MAX(MIN((_val), _max), _min)
#define NAMETAG_DIST 7000.0f
#define FADE_SCALE 4.f
struct StateExtras { struct StateExtras {
Vec3f prevPos; Vec3f prevPos;
@ -81,17 +82,12 @@ void nametags_render(void) {
Vec3f pos; Vec3f pos;
Vec3f out; Vec3f out;
vec3f_copy(pos, m->marioObj->header.gfx.pos); vec3f_copy(pos, m->marioBodyState->headPos);
pos[1] = m->pos[1] + 210; pos[1] = m->pos[1] + 180;
if (djui_hud_world_pos_to_screen_pos(pos, out) && if (djui_hud_world_pos_to_screen_pos(pos, out) &&
(i != 0 || (i == 0 && m->action != ACT_FIRST_PERSON))) { (i != 0 || (i == 0 && m->action != ACT_FIRST_PERSON))) {
f32 scale = NAMETAG_MAX_SCALE; f32 scale = -400 / out[2] * djui_hud_get_fov_coeff();
f32 dist = vec3f_dist(gLakituState.pos, m->pos);
if (i != 0 && dist > 1000) {
scale = 0.5f + dist / NAMETAG_DIST;
scale = clampf(1 - scale, 0, NAMETAG_MAX_SCALE);
}
char name[MAX_CONFIG_STRING]; char name[MAX_CONFIG_STRING];
char* hookedString = NULL; char* hookedString = NULL;
@ -102,14 +98,12 @@ void nametags_render(void) {
snprintf(name, MAX_CONFIG_STRING, "%s", np->name); snprintf(name, MAX_CONFIG_STRING, "%s", np->name);
name_without_hex(name); name_without_hex(name);
} }
Color color = { u8* color = network_get_player_text_color(m->playerIndex);
np->overridePalette.parts[CAP][0],
np->overridePalette.parts[CAP][1],
np->overridePalette.parts[CAP][2]
};
f32 measure = djui_hud_measure_text(name) * scale * 0.5f;
u8 alpha = i == 0 ? 255 : MIN(np->fadeOpacity << 3, 255); f32 measure = djui_hud_measure_text(name) * scale * 0.5f;
out[1] -= 16 * scale;
u8 alpha = (i == 0 ? 255 : MIN(np->fadeOpacity << 3, 255)) * CLAMP(FADE_SCALE - scale, 0.f, 1.f);
struct StateExtras* e = &sStateExtras[i]; struct StateExtras* e = &sStateExtras[i];
if (!e->inited) { if (!e->inited) {
@ -117,15 +111,18 @@ void nametags_render(void) {
e->prevScale = scale; e->prevScale = scale;
e->inited = true; e->inited = true;
} }
djui_hud_print_outlined_text_interpolated(name, e->prevPos[0] - measure, e->prevPos[1], e->prevScale, out[0] - measure, out[1], scale, color[0], color[1], color[2], alpha, 0.25); djui_hud_print_outlined_text_interpolated(name,
e->prevPos[0] - measure, e->prevPos[1], e->prevScale,
out[0] - measure, out[1], scale,
color[0], color[1], color[2], alpha, 0.25);
if (i != 0 && gNametagsSettings.showHealth) { if (i != 0 && gNametagsSettings.showHealth) {
djui_hud_set_color(255, 255, 255, alpha); djui_hud_set_color(255, 255, 255, alpha);
f32 healthScale = 90 * scale; f32 healthScale = 90 * scale;
f32 prevHealthScale = 90 * e->prevScale; f32 prevHealthScale = 90 * e->prevScale;
hud_render_power_meter_interpolated(m->health, hud_render_power_meter_interpolated(m->health,
e->prevPos[0] - (prevHealthScale * 0.5f), e->prevPos[1] - 23, prevHealthScale, prevHealthScale, e->prevPos[0] - (prevHealthScale * 0.5f), e->prevPos[1] - 72 * scale, prevHealthScale, prevHealthScale,
out[0] - (healthScale * 0.5f), out[1] - 23, healthScale, healthScale out[0] - ( healthScale * 0.5f), out[1] - 72 * scale, healthScale, healthScale
); );
} }