Add slider to change crosshair size

flyinghead · Nov 16, 2023 · 89b19dc · 89b19dc
1 parent 402e8bc
commit 89b19dc
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 10 deletions.
diff --git a/core/cfg/option.cpp b/core/cfg/option.cpp
@@ -93,6 +93,7 @@ std::array<Option<int>, 4> CrosshairColor {
 	Option<int>("rend.CrossHairColor3"),
 	Option<int>("rend.CrossHairColor4"),
 };
+Option<int> CrosshairSize("rend.CrosshairSize", 40);
 Option<int> SkipFrame("ta.skip");
 Option<int> MaxThreads("pvr.MaxThreads", 3);
 Option<int> AutoSkipFrame("pvr.AutoSkipFrame", 0);

diff --git a/core/cfg/option.h b/core/cfg/option.h
@@ -456,6 +456,7 @@ extern Option<bool> PerStripSorting;
 extern Option<bool> DelayFrameSwapping;	// Delay swapping frame until FB_R_SOF matches FB_W_SOF
 extern Option<bool> WidescreenGameHacks;
 extern std::array<Option<int>, 4> CrosshairColor;
+extern Option<int> CrosshairSize;
 extern Option<int> SkipFrame;
 extern Option<int> MaxThreads;
 extern Option<int> AutoSkipFrame;		// 0: none, 1: some, 2: more

diff --git a/core/rend/dx11/dx11_overlay.cpp b/core/rend/dx11/dx11_overlay.cpp
@@ -176,7 +176,7 @@ void DX11Overlay::draw(u32 width, u32 height, bool vmu, bool crosshair)
 			float halfHeight = lightgun_crosshair_size / 2.f * config::RenderResolution / 480.f;
 			x /= config::ScreenStretching / 100.f;
 #else
-			float halfWidth = XHAIR_WIDTH * settings.display.uiScale / 2.f;
+			float halfWidth = config::CrosshairSize * settings.display.uiScale / 2.f;
 			float halfHeight = halfWidth;
 #endif
 			D3D11_VIEWPORT vp{};

diff --git a/core/rend/dx9/d3d_overlay.cpp b/core/rend/dx9/d3d_overlay.cpp
@@ -118,7 +118,7 @@ void D3DOverlay::draw(u32 width, u32 height, bool vmu, bool crosshair)
 				continue;
 
 			auto [x, y] = getCrosshairPosition(i);
-			float halfWidth = XHAIR_WIDTH * settings.display.uiScale / 2.f;
+			float halfWidth = config::CrosshairSize * settings.display.uiScale / 2.f;
 			RECT rect { (long) (x - halfWidth), (long) (y - halfWidth), (long) (x + halfWidth), (long) (y + halfWidth) };
 			D3DCOLOR color = (config::CrosshairColor[i] & 0xFF00FF00)
 					| ((config::CrosshairColor[i] >> 16) & 0xFF)

diff --git a/core/rend/gles/opengl_driver.cpp b/core/rend/gles/opengl_driver.cpp
@@ -144,9 +144,9 @@ void OpenGLDriver::displayCrosshairs()
 
 		ImVec2 pos;
 		std::tie(pos.x, pos.y) = getCrosshairPosition(i);
-		pos.x -= (XHAIR_WIDTH * settings.display.uiScale) / 2.f;
-		pos.y += (XHAIR_WIDTH * settings.display.uiScale) / 2.f;
-		ImVec2 pos_b(pos.x + XHAIR_WIDTH * settings.display.uiScale, pos.y - XHAIR_HEIGHT * settings.display.uiScale);
+		pos.x -= (config::CrosshairSize * settings.display.uiScale) / 2.f;
+		pos.y += (config::CrosshairSize * settings.display.uiScale) / 2.f;
+		ImVec2 pos_b(pos.x + config::CrosshairSize * settings.display.uiScale, pos.y - config::CrosshairSize * settings.display.uiScale);
 
 		ImGui::GetWindowDrawList()->AddImage(crosshairTexId, pos, pos_b, ImVec2(0, 1), ImVec2(1, 0), config::CrosshairColor[i]);
 	}

diff --git a/core/rend/gui.cpp b/core/rend/gui.cpp
@@ -1700,6 +1700,7 @@ static void gui_display_settings()
 			ImGui::Spacing();
 			header("Dreamcast Devices");
 		    {
+				bool is_there_any_xhair = false;
 				for (int bus = 0; bus < MAPLE_PORTS; bus++)
 				{
 					ImGui::Text("Device %c", bus + 'A');
@@ -1790,10 +1791,15 @@ static void gui_display_settings()
 								config::CrosshairColor[bus] = 0;
 							}
 						}
+						is_there_any_xhair |= enabled;
 						ImGui::PopID();
 					}
 					ImGui::PopItemWidth();
 				}
+				{
+					DisabledScope scope(!is_there_any_xhair);
+					OptionSlider("Crosshair Size", config::CrosshairSize, 10, 100);
+				}
 				OptionCheckbox("Per Game VMU A1", config::PerGameVmu, "When enabled, each game has its own VMU on port 1 of controller A.");
 		    }
 

diff --git a/core/rend/osd.h b/core/rend/osd.h
@@ -48,9 +48,6 @@ void push_vmu_screen(int bus_id, int bus_port, u8* buffer);
 const u32 *getCrosshairTextureData();
 std::pair<float, float> getCrosshairPosition(int playerNum);
 
-constexpr int XHAIR_WIDTH = 40;
-constexpr int XHAIR_HEIGHT = 40;
-
 static inline bool crosshairsNeeded()
 {
 	if (config::CrosshairColor[0] == 0 && config::CrosshairColor[1] == 0

diff --git a/core/rend/vulkan/overlay.cpp b/core/rend/vulkan/overlay.cpp
@@ -214,8 +214,8 @@ void VulkanOverlay::Draw(vk::CommandBuffer commandBuffer, vk::Extent2D viewport,
 			float h = lightgun_crosshair_size * scaling;
 			x /= config::ScreenStretching / 100.f;
 #else
-			float w = XHAIR_WIDTH * scaling;
-			float h = XHAIR_HEIGHT * scaling;
+			float w = config::CrosshairSize * scaling;
+			float h = config::CrosshairSize * scaling;
 #endif
 			x -= w / 2;
 			y -= h / 2;