Update Nametags with updated version (#368)

Ported interpolation
This commit is contained in:
Agent X 2023-04-28 19:54:33 -04:00 committed by GitHub
parent 093bddfedd
commit c042ffca02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,14 +2,14 @@
-- incompatible: nametags -- incompatible: nametags
-- description: Nametags\nBy \\#ec7731\\Agent X\\#dcdcdc\\\n\nThis mod adds nametags to sm64ex-coop, this helps to easily identify other players without the player list, nametags can toggled on and off with \\#ffff00\\/nametag-distance 7000\\#dcdcdc\\ and \\#ffff00\\/nametag-distance 0\\#dcdcdc\\ respectively. -- description: Nametags\nBy \\#ec7731\\Agent X\\#dcdcdc\\\n\nThis mod adds nametags to sm64ex-coop, this helps to easily identify other players without the player list, nametags can toggled on and off with \\#ffff00\\/nametag-distance 7000\\#dcdcdc\\ and \\#ffff00\\/nametag-distance 0\\#dcdcdc\\ respectively.
MAX_SCALE = 0.32 local MAX_SCALE = 0.32
gGlobalSyncTable.dist = 7000 gGlobalSyncTable.dist = 7000
gGlobalSyncTable.health = true
showSelfTag = false local showHealth = true
local showSelfTag = false
gStateExtras = {} local gStateExtras = {}
for i = 0, (MAX_PLAYERS - 1) do for i = 0, (MAX_PLAYERS - 1) do
gStateExtras[i] = {} gStateExtras[i] = {}
local e = gStateExtras[i] local e = gStateExtras[i]
@ -20,26 +20,38 @@ for i = 0, (MAX_PLAYERS - 1) do
e.prevScale = 1 e.prevScale = 1
end end
for k, v in pairs(gActiveMods) do -- localize functions to improve performance
local name = v.name:lower() local djui_chat_message_create = djui_chat_message_create
if v.enabled and (name:find("hide") or name:find("hns") or name:find("hunt")) then local djui_hud_measure_text = djui_hud_measure_text
local djui_hud_print_text_interpolated = djui_hud_print_text_interpolated
local djui_hud_set_color = djui_hud_set_color
local djui_hud_set_font = djui_hud_set_font
local djui_hud_set_resolution = djui_hud_set_resolution
local djui_hud_world_pos_to_screen_pos = djui_hud_world_pos_to_screen_pos
local vec3f_dist = vec3f_dist
local network_player_connected_count = network_player_connected_count
local network_player_palette_to_color = network_player_palette_to_color
local network_is_server = network_is_server
local is_player_active = is_player_active
local clampf = clampf
local hud_render_power_meter_interpolated = hud_render_power_meter_interpolated
local is_game_paused = is_game_paused
local obj_get_first_with_behavior_id = obj_get_first_with_behavior_id
for i in pairs(gActiveMods) do
local name = gActiveMods[i].name:lower()
if gActiveMods[i].enabled and (name:find("hide") or name:find("hns") or name:find("hunt")) then
gGlobalSyncTable.dist = 0 gGlobalSyncTable.dist = 0
end end
end end
function on_or_off(value) local function on_or_off(value)
if value then return "\\#00ff00\\ON" end if value then return "\\#00ff00\\ON" end
return "\\#ff0000\\OFF" return "\\#ff0000\\OFF"
end end
function clamp(x, a, b)
if x < a then return a end
if x > b then return b end
return x
end
--- @param m MarioState --- @param m MarioState
function active_player(m) local function active_player(m)
local np = gNetworkPlayers[m.playerIndex] local np = gNetworkPlayers[m.playerIndex]
if m.playerIndex == 0 then if m.playerIndex == 0 then
return 1 return 1
@ -62,34 +74,34 @@ function active_player(m)
return is_player_active(m) return is_player_active(m)
end end
function if_then_else(cond, if_true, if_false) local function if_then_else(cond, if_true, if_false)
if cond then return if_true end if cond then return if_true end
return if_false return if_false
end end
function djui_hud_set_adjusted_color(r, g, b, a) local function djui_hud_set_adjusted_color(r, g, b, a)
local multiplier = 1 local multiplier = 1
if is_game_paused() then multiplier = 0.5 end if is_game_paused() then multiplier = 0.5 end
djui_hud_set_color(r * multiplier, g * multiplier, b * multiplier, a) djui_hud_set_color(r * multiplier, g * multiplier, b * multiplier, a)
end end
function djui_hud_print_outlined_text(text, prevx, prevy, prevscale, x, y, scale, r, g, b, a, outlineDarkness) local function djui_hud_print_outlined_text_interpolated(text, prevX, prevY, prevScale, x, y, scale, r, g, b, a, outlineDarkness)
djui_hud_set_resolution(RESOLUTION_N64) local offset = 1 * (scale * 2)
local prevOffset = 1 * (prevScale * 2)
-- render outline -- render outline
djui_hud_set_adjusted_color(r * outlineDarkness, g * outlineDarkness, b * outlineDarkness, a) djui_hud_set_adjusted_color(r * outlineDarkness, g * outlineDarkness, b * outlineDarkness, a)
local offset = (1*(scale*2)) djui_hud_print_text_interpolated(text, prevX - prevOffset, prevY, prevScale, x - offset, y, scale)
local prevoffset = (1*(prevscale*2)) djui_hud_print_text_interpolated(text, prevX + prevOffset, prevY, prevScale, x + offset, y, scale)
djui_hud_print_text_interpolated(text, prevx - prevoffset, prevy, prevscale, x - offset, y, scale) djui_hud_print_text_interpolated(text, prevX, prevY - prevOffset, prevScale, x, y - offset, scale)
djui_hud_print_text_interpolated(text, prevx + prevoffset, prevy, prevscale, x + offset, y, scale) djui_hud_print_text_interpolated(text, prevX, prevY + prevOffset, prevScale, x, y + offset, scale)
djui_hud_print_text_interpolated(text, prevx, prevy - prevoffset, prevscale, x, y - offset, scale)
djui_hud_print_text_interpolated(text, prevx, prevy + prevoffset, prevscale, x, y + offset, scale)
-- render text -- render text
djui_hud_set_adjusted_color(r, g, b, 255) djui_hud_set_adjusted_color(r, g, b, 255)
djui_hud_print_text_interpolated(text, prevx, prevy, prevscale, x, y, scale) djui_hud_print_text_interpolated(text, prevX, prevY, prevScale, x, y, scale)
djui_hud_set_color(255, 255, 255, 255) djui_hud_set_color(255, 255, 255, 255)
end end
function name_without_hex(name) local function name_without_hex(name)
local s = '' local s = ''
local inSlash = false local inSlash = false
for i = 1, #name do for i = 1, #name do
@ -103,24 +115,25 @@ function name_without_hex(name)
return s return s
end end
function on_hud_render() local function on_hud_render()
if gGlobalSyncTable.dist == 0 or not gNetworkPlayers[0].currAreaSyncValid or obj_get_first_with_behavior_id(id_bhvActSelector) ~= nil then return end if gGlobalSyncTable.dist == 0 or (not showSelfTag and network_player_connected_count() == 1) or not gNetworkPlayers[0].currAreaSyncValid or obj_get_first_with_behavior_id(id_bhvActSelector) ~= nil then return end
djui_hud_set_resolution(RESOLUTION_N64) djui_hud_set_resolution(RESOLUTION_N64)
djui_hud_set_font(FONT_NORMAL) djui_hud_set_font(FONT_NORMAL)
for i = if_then_else(showSelfTag, 0, 1), (MAX_PLAYERS - 1) do for i = if_then_else(showSelfTag, 0, 1), (MAX_PLAYERS - 1) do
local m = gMarioStates[i] local m = gMarioStates[i]
if active_player(m) ~= 0 and m.action ~= ACT_IN_CANNON and (m.playerIndex ~= 0 or (m.playerIndex == 0 and m.action ~= ACT_FIRST_PERSON)) then if m.marioBodyState.updateTorsoTime == gMarioStates[0].marioBodyState.updateTorsoTime and active_player(m) ~= 0 and m.action ~= ACT_IN_CANNON and (m.playerIndex ~= 0 or (m.playerIndex == 0 and m.action ~= ACT_FIRST_PERSON)) then
local out = { x = 0, y = 0, z = 0 } local out = { x = 0, y = 0, z = 0 }
local pos = { x = m.marioObj.header.gfx.pos.x, y = m.pos.y + 210, z = m.marioObj.header.gfx.pos.z } local pos = { x = m.marioObj.header.gfx.pos.x, y = m.pos.y + 210, z = m.marioObj.header.gfx.pos.z }
djui_hud_world_pos_to_screen_pos(pos, out) djui_hud_world_pos_to_screen_pos(pos, out)
local scale = MAX_SCALE local scale = MAX_SCALE
if m.playerIndex ~= 0 and vec3f_dist(gMarioStates[0].pos, m.pos) > 1000 then local dist = vec3f_dist(gMarioStates[0].pos, m.pos)
if m.playerIndex ~= 0 and dist > 1000 then
scale = 0.5 scale = 0.5
scale = scale + vec3f_dist(gMarioStates[0].pos, m.pos) / gGlobalSyncTable.dist scale = scale + dist / gGlobalSyncTable.dist
scale = clamp(1 - scale, 0, MAX_SCALE) scale = clampf(1 - scale, 0, MAX_SCALE)
end end
local name = name_without_hex(gNetworkPlayers[i].name) local name = name_without_hex(gNetworkPlayers[i].name)
local color = { r = 162, g = 202, b = 234 } local color = { r = 162, g = 202, b = 234 }
@ -130,9 +143,9 @@ function on_hud_render()
local e = gStateExtras[i] local e = gStateExtras[i]
djui_hud_print_outlined_text(name, e.prevPos.x - measure, e.prevPos.y, e.prevScale, out.x - measure, out.y, scale, color.r, color.g, color.b, alpha, 0.25) djui_hud_print_outlined_text_interpolated(name, e.prevPos.x - measure, e.prevPos.y, e.prevScale, out.x - measure, out.y, scale, color.r, color.g, color.b, alpha, 0.25)
if m.playerIndex ~= 0 and gGlobalSyncTable.health then if m.playerIndex ~= 0 and showHealth then
djui_hud_set_adjusted_color(255, 255, 255, alpha) djui_hud_set_adjusted_color(255, 255, 255, alpha)
local healthScale = 75 * scale local healthScale = 75 * scale
local prevHealthScale = 75 * e.prevScale local prevHealthScale = 75 * e.prevScale
@ -149,7 +162,7 @@ function on_hud_render()
end end
end end
function on_nametag_distance_command(msg) local function on_nametag_distance_command(msg)
local dist = tonumber(msg) local dist = tonumber(msg)
if dist ~= nil then if dist ~= nil then
djui_chat_message_create("Set nametag distance to " .. msg) djui_chat_message_create("Set nametag distance to " .. msg)
@ -159,13 +172,13 @@ function on_nametag_distance_command(msg)
return false return false
end end
function on_show_health_command() local function on_show_health_command()
gGlobalSyncTable.health = not gGlobalSyncTable.health showHealth = not showHealth
djui_chat_message_create("Show health status: " .. on_or_off(gGlobalSyncTable.health)) djui_chat_message_create("Show health status: " .. on_or_off(showHealth))
return true return true
end end
function on_show_tag_command() local function on_show_tag_command()
showSelfTag = not showSelfTag showSelfTag = not showSelfTag
djui_chat_message_create("Show my tag status: " .. on_or_off(showSelfTag)) djui_chat_message_create("Show my tag status: " .. on_or_off(showSelfTag))
return true return true
@ -175,7 +188,7 @@ hook_event(HOOK_ON_HUD_RENDER, on_hud_render)
if network_is_server() then if network_is_server() then
hook_chat_command("nametag-distance", "[number] set the distance at which nametags disappear, default is 7000, 0 turns nametags off", on_nametag_distance_command) hook_chat_command("nametag-distance", "[number] set the distance at which nametags disappear, default is 7000, 0 turns nametags off", on_nametag_distance_command)
hook_chat_command("show-health", "to toggle showing health above the nametag, default is \\#00ff00\\ON", on_show_health_command)
end end
hook_chat_command("show-health", "to toggle showing health above the nametag, default is \\#00ff00\\ON", on_show_health_command)
hook_chat_command("show-tag", "to toggle your own nametag on or off, default is \\#ff0000\\OFF", on_show_tag_command) hook_chat_command("show-tag", "to toggle your own nametag on or off, default is \\#ff0000\\OFF", on_show_tag_command)