ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

refactor!: globals (#717)

Browse Source 
* refactor(globals): use macro's for to_json/from_json
* refactor(globals): switch from global pointer to global instance
This commit is contained in:
Yimura
2022-12-18 23:15:52 +01:00
committed by GitHub
parent 4041370763
commit f6c00f113d
147 changed files with 1280 additions and 1902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/views/esp/view_esp.cpp
View File

@ -22,7 +22,7 @@ namespace big
!plyr->get_ped() ||
!plyr->get_ped()->m_navigation)
return;
if (g->esp.hide_self && plyr->is_valid() && plyr->id() == g_player_service->get_self()->id())
if (g.esp.hide_self && plyr->is_valid() && plyr->id() == g_player_service->get_self()->id())
return;
auto& player_pos = *plyr->get_ped()->m_navigation->get_position();
@ -30,9 +30,9 @@ namespace big
float screen_x, screen_y;
const float distance = math::calculate_distance_from_game_cam(player_pos);
const float multplr = distance > g->esp.global_render_distance[1] ? -1.f : 6.17757f / distance;
const float multplr = distance > g.esp.global_render_distance[1] ? -1.f : 6.17757f / distance;
if (multplr == -1.f || g->esp.global_render_distance[0] > distance) return;
if (multplr == -1.f || g.esp.global_render_distance[0] > distance) return;
uint32_t ped_damage_bits = plyr->get_ped()->m_damage_bits;
@ -43,34 +43,34 @@ namespace big
std::string name_str;
ImVec2 name_pos = { esp_x - (62.5f * multplr), esp_y - (175.f * multplr) - 20.f };
ImU32 esp_color = g->esp.default_color;
ImU32 esp_color = g.esp.default_color;
if (plyr->is_friend())
{
esp_color = g->esp.friend_color;
esp_color = g.esp.friend_color;
}
else if (g->esp.change_esp_color_from_dist) {
if (distance <= g->esp.distance_threshold[0])
esp_color = g->esp.enemy_color;
else if (distance >= g->esp.distance_threshold[0] && distance < g->esp.distance_threshold[1])
esp_color = g->esp.enemy_near_color;
else if (g.esp.change_esp_color_from_dist) {
if (distance <= g.esp.distance_threshold[0])
esp_color = g.esp.enemy_color;
else if (distance >= g.esp.distance_threshold[0] && distance < g.esp.distance_threshold[1])
esp_color = g.esp.enemy_near_color;
}
const auto armor_perc = plyr->get_ped()->m_armor / 50.f;
const auto health_perc = plyr->get_ped()->m_health / (plyr->get_ped()->m_maxhealth + 0.001f);
if (distance < g->esp.tracer_render_distance[1] && distance > g->esp.tracer_render_distance[0] && g->esp.tracer)
draw_list->AddLine({ (float)*g_pointers->m_resolution_x * g->esp.tracer_draw_position[0], (float)*g_pointers->m_resolution_y * g->esp.tracer_draw_position[1] }, { esp_x, esp_y }, esp_color);
if (distance < g.esp.tracer_render_distance[1] && distance > g.esp.tracer_render_distance[0] && g.esp.tracer)
draw_list->AddLine({ (float)*g_pointers->m_resolution_x * g.esp.tracer_draw_position[0], (float)*g_pointers->m_resolution_y * g.esp.tracer_draw_position[1] }, { esp_x, esp_y }, esp_color);
if (distance < g->esp.box_render_distance[1] && distance > g->esp.box_render_distance[0] && g->esp.box)
if (distance < g.esp.box_render_distance[1] && distance > g.esp.box_render_distance[0] && g.esp.box)
draw_list->AddRect({ esp_x - (62.5f * multplr), esp_y - (175.f * multplr) }, { esp_x - (62.5f * multplr) + (125.f * multplr), esp_y - (175.f * multplr) + (350.f * multplr) }, esp_color);
if (g->esp.name)
if (g.esp.name)
name_str = plyr->get_name();
if (g->esp.distance)
if (g.esp.distance)
{
if (g->esp.name)
if (g.esp.name)
name_str += " | ";
name_str += std::to_string((int)distance);
name_str += "m";
@ -78,7 +78,7 @@ namespace big
draw_list->AddText(name_pos, esp_color, name_str.c_str());
if (g->esp.god) {
if (g.esp.god) {
std::string mode_str = "";
if (ped_damage_bits & (uint32_t)eEntityProofs::GOD)
@ -105,8 +105,8 @@ namespace big
if (!(ped_damage_bits & (uint32_t)eEntityProofs::GOD))
{
if (g->esp.health) {
if (g->esp.scale_health_from_dist) {
if (g.esp.health) {
if (g.esp.scale_health_from_dist) {
draw_list->AddLine({ esp_x - (62.5f * multplr), esp_y + (175.f * multplr) + 5.f }, { esp_x - (62.5f * multplr) + (125.f * multplr), esp_y + (175.f * multplr) + 5.f }, health_perc == 0.f ? death_bg : health_perc < 0.25f ? health_red_bg : health_perc < 0.65f ? health_yellow_bg : health_green_bg, 4);
draw_list->AddLine({ esp_x - (62.5f * multplr), esp_y + (175.f * multplr) + 5.f }, { esp_x - (62.5f * multplr) + (125.f * multplr) * health_perc, esp_y + (175.f * multplr) + 5.f }, health_perc < 0.25f ? health_red : health_perc < 0.65f ? health_yellow : health_green, 4);
}
@ -115,10 +115,10 @@ namespace big
draw_list->AddLine({ esp_x - (62.5f * multplr), esp_y + (175.f * multplr) + 5.f }, { esp_x - (62.5f * multplr) + (100.f * health_perc), esp_y + (175.f * multplr) + 5.f }, health_perc < 0.25f ? health_red : health_perc < 0.65f ? health_yellow : health_green, 4);
}
}
if (g->esp.armor && plyr->get_ped()->m_armor > 0) {
if (g.esp.armor && plyr->get_ped()->m_armor > 0) {
float offset = 5.f;
offset = g->esp.health ? 10.f : 5.f;
if (g->esp.scale_armor_from_dist) {
offset = g.esp.health ? 10.f : 5.f;
if (g.esp.scale_armor_from_dist) {
draw_list->AddLine({ esp_x - (62.5f * multplr), esp_y + (175.f * multplr) + offset }, { esp_x - (62.5f * multplr) + (125.f * multplr), esp_y + (175.f * multplr) + offset }, armor_blue_bg, 4);
draw_list->AddLine({ esp_x - (62.5f * multplr), esp_y + (175.f * multplr) + offset }, { esp_x - (62.5f * multplr) + (125.f * multplr) * armor_perc, esp_y + (175.f * multplr) + offset }, armor_blue, 4);
}
@ -132,7 +132,7 @@ namespace big
}
void esp::draw() {
if (!g->esp.enabled) return;
if (!g.esp.enabled) return;
if (const auto draw_list = ImGui::GetBackgroundDrawList(); draw_list)
{