Add vehicle gears to speedo meter (#1236)

scripts/gtav-classes.cmake

@@ -3,7 +3,7 @@ include(FetchContent)
 FetchContent_Declare(
     gtav_classes
     GIT_REPOSITORY https://github.com/Yimura/GTAV-Classes.git
-    GIT_TAG        cf7c1a71b413788371000b56d40c4e8b81c47a2c
+    GIT_TAG        4f76d41ff4c39c296606238cbfa9fd4bceee3a54
     GIT_PROGRESS TRUE
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""

src/backend/backend.cpp

@@ -77,7 +77,6 @@ namespace big
 			looped::vehicle_auto_drive();
 			looped::vehicle_boost_behavior();
 			looped::vehicle_god_mode();
-			looped::vehicle_speedo_meter();
 			looped::derail_train();
 			looped::drive_train();
 

src/backend/looped/looped.hpp

@@ -47,7 +47,6 @@ namespace big
 		static void vehicle_god_mode();
 		static void vehicle_ls_customs();
 		static void vehicle_rainbow_paint();
-		static void vehicle_speedo_meter();
 		static void vehicle_turn_signals();
 
 		static void weapons_ammo_special_type();

src/backend/looped/vehicle/speedo_meter.cpp

@@ -1,48 +1,70 @@
+#include "backend/bool_command.hpp"
 #include "backend/looped/looped.hpp"
+#include "backend/looped_command.hpp"
 #include "natives.hpp"
 #include "util/vehicle.hpp"
 
+
 namespace big
 {
-	void looped::vehicle_speedo_meter()
+	class speedo_meter : looped_command
 	{
-		if (!g.vehicle.speedo_meter.enabled || self::veh == 0 || HUD::IS_PAUSE_MENU_ACTIVE() || HUD::IS_WARNING_MESSAGE_ACTIVE() || CAM::IS_SCREEN_FADED_OUT() || CAM::IS_SCREEN_FADING_OUT() || CAM::IS_SCREEN_FADING_IN())
+		std::array<std::string_view, 3> m_speed_types = {"kmph", "miph", "mps"};
+
+		using looped_command::looped_command;
+
+		virtual void on_tick() override
+		{
+			if (!self::veh || !g_local_player->m_vehicle || HUD::IS_PAUSE_MENU_ACTIVE() || HUD::IS_WARNING_MESSAGE_ACTIVE() || CAM::IS_SCREEN_FADED_OUT() || CAM::IS_SCREEN_FADING_OUT() || CAM::IS_SCREEN_FADING_IN())
 			{
 				return;
 			}
 
-
-		char speed_type[16], speed[16];
-		int char_width = 3;
-
-		float veh_speed = vehicle::mps_to_speed(ENTITY::GET_ENTITY_SPEED(self::veh), g.vehicle.speed_unit);
-
-		switch (g.vehicle.speed_unit)
-		{
-		case SpeedUnit::KMPH:
-			strcpy(speed_type, "kmph");
-			char_width = 4;
-			break;
-		case SpeedUnit::MIPH: strcpy(speed_type, "mph"); break;
-		case SpeedUnit::MPS: strcpy(speed_type, "mps"); break;
-		}
-
-		sprintf(speed, "%*d", g.vehicle.speedo_meter.left_side ? 0 : char_width, (int)veh_speed);
-
 			HUD::SET_TEXT_FONT(2);
 			HUD::SET_TEXT_SCALE(.9f, .9f);
 			HUD::SET_TEXT_OUTLINE();
 			HUD::BEGIN_TEXT_COMMAND_DISPLAY_TEXT("STRING");
-		HUD::ADD_TEXT_COMPONENT_SUBSTRING_PLAYER_NAME(speed_type);
+			HUD::ADD_TEXT_COMPONENT_SUBSTRING_PLAYER_NAME(m_speed_types[(int)g.vehicle.speed_unit].data());
 			HUD::END_TEXT_COMMAND_DISPLAY_TEXT(g.vehicle.speedo_meter.x, g.vehicle.speedo_meter.y, 1);
 
+			const auto vehicle_speed = vehicle::mps_to_speed(g_local_player->m_vehicle->get_speed(), g.vehicle.speed_unit);
+			auto char_width{0};
+			if (!g.vehicle.speedo_meter.left_side)
+			{
+				char_width = g.vehicle.speed_unit == SpeedUnit::KMPH ? 4 : 3;
+			}
 			HUD::SET_TEXT_FONT(2);
 			HUD::SET_TEXT_SCALE(.9f, .9f);
 			HUD::SET_TEXT_OUTLINE();
 			HUD::BEGIN_TEXT_COMMAND_DISPLAY_TEXT("STRING");
-		HUD::ADD_TEXT_COMPONENT_SUBSTRING_PLAYER_NAME(speed);
+			HUD::ADD_TEXT_COMPONENT_SUBSTRING_PLAYER_NAME(std::format("{1:>{0}.0f}", char_width, vehicle_speed).c_str());
 			HUD::END_TEXT_COMMAND_DISPLAY_TEXT(g.vehicle.speedo_meter.x + (g.vehicle.speedo_meter.left_side ? 0 : .003f),
 			    g.vehicle.speedo_meter.y + .04f,
 			    1);
+
+			if (g.vehicle.speedo_meter.show_current_gear)
+			{
+				const auto& current_gear = g_local_player->m_vehicle->m_current_gear;
+				std::string gear_str     = std::to_string(current_gear);
+				if (!current_gear)
+					gear_str = "R";
+
+				HUD::SET_TEXT_FONT(2);
+				HUD::SET_TEXT_SCALE(.9f, .9f);
+				HUD::SET_TEXT_OUTLINE();
+				HUD::BEGIN_TEXT_COMMAND_DISPLAY_TEXT("STRING");
+				HUD::ADD_TEXT_COMPONENT_SUBSTRING_PLAYER_NAME(std::format("{1:>{0}}", char_width, gear_str).c_str());
+				HUD::END_TEXT_COMMAND_DISPLAY_TEXT(g.vehicle.speedo_meter.x + (g.vehicle.speedo_meter.left_side ? 0 : .003f),
+				    g.vehicle.speedo_meter.y + .08f,
+				    1);
 			}
+		}
+	};
+
+	speedo_meter
+	    g_speedo_meter("speedometer", "Enabled", "Enable/disable the speedo meter for vehicles.", g.vehicle.speedo_meter.enabled);
+	bool_command g_speedo_meter_gears("speedometergears", "Show current gear", "Adds the current gear the vehicle is in to the speedo meter.",
+	    g.vehicle.speedo_meter.show_current_gear);
+	bool_command g_speedo_meter_left_side("speedometerleftside", "Align to left", "Aligns the speedo meter text to the left instead of to the right.",
+	    g.vehicle.speedo_meter.left_side);
 }

src/core/globals.hpp

@@ -560,8 +560,9 @@ namespace big
 
 				bool enabled   = false;
 				bool left_side = false;
+				bool show_current_gear = true;
 
-				NLOHMANN_DEFINE_TYPE_INTRUSIVE(speedo_meter, x, y, enabled, left_side)
+				NLOHMANN_DEFINE_TYPE_INTRUSIVE(speedo_meter, x, y, enabled, left_side, show_current_gear)
 			} speedo_meter{};
 
 			struct fly

src/views/vehicle/view_vehicle.cpp

@@ -166,8 +166,7 @@ namespace big
 
 		components::sub_title("SPEEDO_METER"_T);
 		{
-			ImGui::Checkbox("ENABLED"_T.data(), &g.vehicle.speedo_meter.enabled);
+			components::command_checkbox<"speedometer">();
-
 			if (g.vehicle.speedo_meter.enabled)
 			{
 				ImGui::Text("POS_X_Y"_T.data());
@@ -180,9 +179,9 @@ namespace big
 					g.vehicle.speedo_meter.y = pos[1];
 				}
 
+				components::command_checkbox<"speedometerleftside">();
 				ImGui::SameLine();
-
+				components::command_checkbox<"speedometergears">();
-				ImGui::Checkbox("LEFT_SIDED"_T.data(), &g.vehicle.speedo_meter.left_side);
 			}
 		}