From ae200e4e40f2635090ee92a4a2ba9e0c01a9f521 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Fri, 18 Nov 2022 11:23:32 +0900 Subject: [PATCH] [renderer] Compensate for scale in cross-hair placement I was wondering where it had gone (south east, actually). --- libs/video/renderer/gl/gl_draw.c | 5 +++-- libs/video/renderer/glsl/glsl_draw.c | 5 +++-- libs/video/renderer/vulkan/vulkan_draw.c | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libs/video/renderer/gl/gl_draw.c b/libs/video/renderer/gl/gl_draw.c index bd7d3b38d..f46e9fc0d 100644 --- a/libs/video/renderer/gl/gl_draw.c +++ b/libs/video/renderer/gl/gl_draw.c @@ -711,8 +711,9 @@ gl_Draw_Crosshair (void) if ((unsigned) ch >= sizeof (crosshair_func) / sizeof (crosshair_func[0])) return; - x = vid.width / 2 + cl_crossx; - y = vid.height / 2 + cl_crossy; + int s = 2 * gl_2d_scale; + x = vid.width / s + cl_crossx; + y = vid.height / s + cl_crossy; crosshair_func[ch] (x, y); } diff --git a/libs/video/renderer/glsl/glsl_draw.c b/libs/video/renderer/glsl/glsl_draw.c index ab4067746..6e3938c8c 100644 --- a/libs/video/renderer/glsl/glsl_draw.c +++ b/libs/video/renderer/glsl/glsl_draw.c @@ -614,9 +614,10 @@ void glsl_Draw_Crosshair (void) { int x, y; + int s = 2 * glsl_2d_scale; - x = vid.width / 2 + cl_crossx; - y = vid.height / 2 + cl_crossy; + x = vid.width / s + cl_crossx; + y = vid.height / s + cl_crossy; glsl_Draw_CrosshairAt (crosshair, x, y); } diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c index 1973d8a4b..ff343fb99 100644 --- a/libs/video/renderer/vulkan/vulkan_draw.c +++ b/libs/video/renderer/vulkan/vulkan_draw.c @@ -852,9 +852,10 @@ void Vulkan_Draw_Crosshair (vulkan_ctx_t *ctx) { int x, y; + int s = 2 * ctx->twod_scale; - x = vid.width / 2 + cl_crossx; - y = vid.height / 2 + cl_crossy; + x = vid.width / s + cl_crossx; + y = vid.height / s + cl_crossy; Vulkan_Draw_CrosshairAt (crosshair, x, y, ctx); }