r_showlocs 3 to always show location on screen

timbergeron · Oct 23, 2024 · fe5d2cb · fe5d2cb
1 parent efd65fc
commit fe5d2cb
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 8 deletions.
diff --git a/Quake/gl_rmain.c b/Quake/gl_rmain.c
@@ -109,7 +109,8 @@ cvar_t	r_oldskyleaf = {"r_oldskyleaf", "0", CVAR_NONE};
 cvar_t	r_drawworld = {"r_drawworld", "1", CVAR_NONE};
 cvar_t	r_showtris = {"r_showtris", "0", CVAR_NONE};
 cvar_t	r_showbboxes = {"r_showbboxes", "0", CVAR_NONE};
-cvar_t	r_showlocs = {"r_showlocs", "0", CVAR_NONE}; // woods #locext
+cvar_t	r_showlocs = {"r_showlocs", "0", CVAR_ARCHIVE}; // woods #locext
+cvar_t	r_showlocs_y = {"r_showlocs_y", "30", CVAR_ARCHIVE }; // woods #locext
 cvar_t	r_lerpmodels = {"r_lerpmodels", "1", CVAR_ARCHIVE};
 cvar_t	r_lerpmove = {"r_lerpmove", "1", CVAR_ARCHIVE};
 cvar_t	r_nolerp_list = {"r_nolerp_list", "progs/flame.mdl,progs/flame2.mdl,progs/braztall.mdl,progs/brazshrt.mdl,progs/longtrch.mdl,progs/flame_pyre.mdl,progs/v_saw.mdl,progs/v_xfist.mdl,progs/h2stuff/newfire.mdl", CVAR_ARCHIVE};

diff --git a/Quake/gl_rmisc.c b/Quake/gl_rmisc.c
@@ -41,6 +41,7 @@ extern cvar_t r_drawworld;
 extern cvar_t r_showtris;
 extern cvar_t r_showbboxes;
 extern cvar_t r_showlocs; // woods #locext
+extern cvar_t r_showlocs_y; // woods #locext
 extern cvar_t r_lerpmodels;
 extern cvar_t r_lerpmove;
 extern cvar_t r_nolerp_list;
@@ -342,6 +343,7 @@ void R_Init (void)
 	Cvar_RegisterVariable (&r_showtris);
 	Cvar_RegisterVariable (&r_showbboxes);
 	Cvar_RegisterVariable (&r_showlocs); // woods #locext
+	Cvar_RegisterVariable (&r_showlocs_y); // woods #locext
 	Cvar_RegisterVariable (&gl_farclip);
 	Cvar_RegisterVariable (&gl_fullbrights);
 	Cvar_RegisterVariable (&gl_overbright);

diff --git a/Quake/location.c b/Quake/location.c
@@ -305,6 +305,7 @@ void R_EmitWireBox(vec3_t mins, vec3_t maxs, uint32_t color); // woods #locext
 void R_EmitWirePoint(vec3_t origin, uint32_t color); // woods #locext
 void R_EmitPin(vec3_t origin, float radius, uint32_t color, int segments); // woods #locext
 extern cvar_t r_showlocs; // woods #locext
+extern cvar_t r_showlocs_y; // woods #locext
 char loc_str[64]; // woods #locext
 
 
@@ -316,7 +317,7 @@ After the loop, it highlights the nearest location (bestloc) in red.
 */
 void LOC_ShowLocs (void)
 {
-    if (r_showlocs.value != 2)
+    if (r_showlocs.value < 2)
         return;
 
     location_t* loc;
@@ -334,6 +335,57 @@ void LOC_ShowLocs (void)
 
     nqDefaultBoxColor = (nqDefaultBoxColor & 0xFFFFFF00) | ((uint8_t)(alpha * 255.0f));
 
+    VectorCopy(cl.entities[cl.viewentity].origin, player_origin);
+
+    if (r_showlocs.value >= 3)
+    {
+        // Locate the nearest location and only print text
+        for (loc = locations; loc; loc = loc->next_loc)
+        {
+            if (!nqloc) // QuakeWorld location (point)
+            {
+                vec3_t scaled_mins;
+                VectorCopy(loc->mins, scaled_mins);
+
+                // Adjust the scale of the input coordinates to match stored locations
+                for (int i = 0; i < 3; i++)
+                {
+                    scaled_mins[i] /= 8.0f;
+                }
+
+                // Calculate squared distance from player position to location point
+                VectorSubtract(player_origin, scaled_mins, diff);
+                dist = diff[0] * diff[0] + diff[1] * diff[1] + diff[2] * diff[2];
+            }
+            else // NetQuake location (axial box)
+            {
+                // Calculate Manhattan distance from player to nearest face of the box
+                dist = fabs(loc->mins[0] - player_origin[0]) + fabs(loc->maxs[0] - player_origin[0]) +
+                    fabs(loc->mins[1] - player_origin[1]) + fabs(loc->maxs[1] - player_origin[1]) +
+                    fabs(loc->mins[2] - player_origin[2]) + fabs(loc->maxs[2] - player_origin[2]) - loc->sum;
+            }
+
+            // Track the nearest location
+            if (!bestloc || dist < bestdist)
+            {
+                bestdist = dist;
+                bestloc = loc;
+            }
+        }
+
+        // Print the name of the nearest location
+        if (bestloc)
+        {
+            strncpy(loc_str, bestloc->name, sizeof(loc_str));
+        }
+        else
+        {
+            strncpy(loc_str, "no locs", sizeof(loc_str));
+        }
+
+        return; // Skip drawing
+    }
+
     glDisable(GL_DEPTH_TEST);
     glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
     GL_PolygonOffset(OFFSET_SHOWTRIS);
@@ -342,8 +394,6 @@ void LOC_ShowLocs (void)
     glEnable(GL_BLEND); // johnfitz -- for alpha
     glDisable(GL_ALPHA_TEST); // johnfitz -- for alpha
 
-    VectorCopy(cl.entities[cl.viewentity].origin, player_origin);
-
     for (loc = locations; loc; loc = loc->next_loc)
     {
         if (!nqloc) // QuakeWorld: Nearest point location
@@ -1113,20 +1163,25 @@ void TP_DrawLocsWithWirePoints (void) // woods #locext
 
 void TP_DrawClosestLocText (void) // woods #locext
 {
-    if (!r_showlocs.value || cl.maxclients > 1 || !sv.active || cls.signon < SIGNONS)
+    if (!r_showlocs.value || cls.signon < SIGNONS)
         return;
 
     GL_SetCanvas(CANVAS_CROSSHAIR2); // Set the canvas where the string will be drawn
 
     char str[64]; // woods added padding
 
     int x = 0; // X position of the string
-    int y = 30;  // Y position of the string
-    if (r_showlocs.value == 2)
+    int y = r_showlocs_y.value; // Y position of the string
+    if (r_showlocs.value >= 2)
         sprintf(str, "%s", loc_str); // Copy the name of the location to a string)
     else
         sprintf(str, "%s", closest_loc_str); // Copy the name of the location to a string)
-    Draw_String(x - (strlen(str)*4), y, str); // Draw the string, centering it horizontally
+
+    int string_width = strlen(str) * 8; // each character is 8 pixels wide
+
+    Draw_FillPlayer(x - (string_width / 2) - 2, y - 1, string_width + 4, 11, CL_PLColours_Parse("0x000000"), r_showlocs.value - 3);
+
+    Draw_String(x - (string_width / 2), y, str);
 }
 
 void TP_LocFiles_Init (void) // woods #locext