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

32
src/views/vehicle/view_spawn_vehicle.cpp
View File

@ -11,24 +11,24 @@ namespace big
{
ImGui::SetWindowSize({ 0.f, (float)*g_pointers->m_resolution_y }, ImGuiCond_Always);
if (ImGui::Checkbox("Preview", &g->spawn_vehicle.preview_vehicle))
if (ImGui::Checkbox("Preview", &g.spawn_vehicle.preview_vehicle))
{
if (!g->spawn_vehicle.preview_vehicle)
if (!g.spawn_vehicle.preview_vehicle)
{
g_model_preview_service->stop_preview();
}
}
ImGui::SameLine();
ImGui::Checkbox("Spawn In", &g->spawn_vehicle.spawn_inside);
ImGui::Checkbox("Spawn In", &g.spawn_vehicle.spawn_inside);
ImGui::SameLine();
ImGui::Checkbox("Spawn Maxed", &g->spawn_vehicle.spawn_maxed);
ImGui::Checkbox("Spawn Maxed", &g.spawn_vehicle.spawn_maxed);
static char plate_buf[9] = { 0 };
strncpy(plate_buf, g->spawn_vehicle.plate.c_str(), 9);
strncpy(plate_buf, g.spawn_vehicle.plate.c_str(), 9);
ImGui::SetNextItemWidth(300.f);
components::input_text_with_hint("Plate", "Plate Number", plate_buf, sizeof(plate_buf), ImGuiInputTextFlags_None, [] {
g->spawn_vehicle.plate = plate_buf;
g.spawn_vehicle.plate = plate_buf;
});
@ -83,7 +83,7 @@ namespace big
components::selectable(std::format("Current Vehicle [{}]", item.m_display_name), false, [] {
if (self::veh)
{
Vector3 spawn_location = vehicle::get_spawn_location(g->spawn_vehicle.spawn_inside);
Vector3 spawn_location = vehicle::get_spawn_location(g.spawn_vehicle.spawn_inside);
float spawn_heading = ENTITY::GET_ENTITY_HEADING(self::ped);
auto owned_mods = vehicle::get_owned_mods_from_vehicle(self::veh);
@ -96,14 +96,14 @@ namespace big
}
else
{
if (g->spawn_vehicle.spawn_maxed)
if (g.spawn_vehicle.spawn_maxed)
{
vehicle::max_vehicle(veh);
}
vehicle::set_plate(veh, plate_buf);
if (g->spawn_vehicle.spawn_inside)
if (g.spawn_vehicle.spawn_inside)
{
vehicle::teleport_into_vehicle(veh);
}
@ -113,7 +113,7 @@ namespace big
g_model_preview_service->stop_preview();
});
if (!g->spawn_vehicle.preview_vehicle || (g->spawn_vehicle.preview_vehicle && !ImGui::IsAnyItemHovered()))
if (!g.spawn_vehicle.preview_vehicle || (g.spawn_vehicle.preview_vehicle && !ImGui::IsAnyItemHovered()))
{
g_model_preview_service->stop_preview();
}
@ -122,7 +122,7 @@ namespace big
g_fiber_pool->queue_job([] {
g_model_preview_service->show_vehicle(
vehicle::get_owned_mods_from_vehicle(self::veh),
g->spawn_vehicle.spawn_maxed
g.spawn_vehicle.spawn_maxed
);
});
}
@ -155,7 +155,7 @@ namespace big
ImGui::PushID(vehicle.m_hash);
components::selectable(vehicle.m_display_name, false, [&vehicle]
{
const auto spawn_location = vehicle::get_spawn_location(g->spawn_vehicle.spawn_inside);
const auto spawn_location = vehicle::get_spawn_location(g.spawn_vehicle.spawn_inside);
const auto spawn_heading = ENTITY::GET_ENTITY_HEADING(self::ped);
const auto veh = vehicle::spawn(vehicle.m_hash, spawn_location, spawn_heading);
@ -166,14 +166,14 @@ namespace big
}
else
{
if (g->spawn_vehicle.spawn_maxed)
if (g.spawn_vehicle.spawn_maxed)
{
vehicle::max_vehicle(veh);
}
vehicle::set_plate(veh, plate_buf);
if (g->spawn_vehicle.spawn_inside)
if (g.spawn_vehicle.spawn_inside)
{
vehicle::teleport_into_vehicle(veh);
}
@ -183,13 +183,13 @@ namespace big
});
ImGui::PopID();
if (!g->spawn_vehicle.preview_vehicle || (g->spawn_vehicle.preview_vehicle && !ImGui::IsAnyItemHovered()))
if (!g.spawn_vehicle.preview_vehicle || (g.spawn_vehicle.preview_vehicle && !ImGui::IsAnyItemHovered()))
{
g_model_preview_service->stop_preview();
}
else if (ImGui::IsItemHovered())
{
g_model_preview_service->show_vehicle(vehicle.m_hash, g->spawn_vehicle.spawn_maxed);
g_model_preview_service->show_vehicle(vehicle.m_hash, g.spawn_vehicle.spawn_maxed);
}
}
}