r4629 - in trunk/data: . qcsrc/client

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sat Oct 4 16:38:24 EDT 2008


Author: div0
Date: 2008-10-04 16:38:24 -0400 (Sat, 04 Oct 2008)
New Revision: 4629

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/client/teamradar.qc
Log:
cl_teamradar_position


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2008-10-04 20:30:37 UTC (rev 4628)
+++ trunk/data/defaultNexuiz.cfg	2008-10-04 20:38:24 UTC (rev 4629)
@@ -1147,6 +1147,7 @@
 seta cl_teamradar_background_alpha 0.75 // set to -1 to disable
 seta cl_teamradar_scale 4096
 seta cl_teamradar_rotation 0 // rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north
-seta cl_teamradar_size 128
+seta cl_teamradar_size "128 128"
+seta cl_teamradar_position "0 0" // 1 1 would be lower right corner, 0.5 0.5 the center (ARGH) :P
 seta cl_teamradar_zoommode 0 // zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out
 alias cl_teamradar_rotate "toggle cl_teamradar_rotation 0 1 2 3 4"

Modified: trunk/data/qcsrc/client/teamradar.qc
===================================================================
--- trunk/data/qcsrc/client/teamradar.qc	2008-10-04 20:30:37 UTC (rev 4628)
+++ trunk/data/qcsrc/client/teamradar.qc	2008-10-04 20:38:24 UTC (rev 4629)
@@ -116,7 +116,8 @@
 float cl_teamradar_scale;
 float cl_teamradar_background_alpha;
 float cl_teamradar_rotation;
-float cl_teamradar_size;
+vector cl_teamradar_size;
+vector cl_teamradar_position;
 float cl_teamradar_zoommode;
 
 void teamradar_loadcvars()
@@ -124,14 +125,18 @@
 	cl_teamradar_scale = cvar("cl_teamradar_scale");
 	cl_teamradar_background_alpha = cvar("cl_teamradar_background_alpha");
 	cl_teamradar_rotation = cvar("cl_teamradar_rotation");
-	cl_teamradar_size = cvar("cl_teamradar_size");
+	cl_teamradar_size = stov(cvar_string("cl_teamradar_size"));
+	cl_teamradar_position = stov(cvar_string("cl_teamradar_position"));
 	cl_teamradar_zoommode = cvar("cl_teamradar_zoommode");
 
+	// others default to 0
 	if(!cl_teamradar_scale) cl_teamradar_scale = 4096;
 	if(!cl_teamradar_background_alpha) cl_teamradar_background_alpha = 0.75;
-	if(!cl_teamradar_rotation) cl_teamradar_rotation = 0;
-	if(!cl_teamradar_size) cl_teamradar_size = 128;
-	if(!cl_teamradar_zoommode) cl_teamradar_zoommode = 0;
+	if(!cl_teamradar_size_x) cl_teamradar_size_x = 128;
+	if(!cl_teamradar_size_y) cl_teamradar_size_y = cl_teamradar_size_x;
+
+	cl_teamradar_size_z = 0;
+	cl_teamradar_position_z = 0;
 }
 
 void() teamradar_view =
@@ -172,8 +177,10 @@
 	}
 
 	scale2d = vlen_maxnorm2d(mi_picmax - mi_picmin);
-	teamradar_size2d = '1 1 0' * cl_teamradar_size;
-	teamradar_origin2d = 0.5 * teamradar_size2d;
+	teamradar_size2d = cl_teamradar_size;
+	teamradar_origin2d =
+		  '1 0 0' * (0.5 * teamradar_size2d_x + cl_teamradar_position_x * (vid_conwidth - teamradar_size2d_x))
+		+ '0 1 0' * (0.5 * teamradar_size2d_y + cl_teamradar_position_y * (vid_conheight - teamradar_size2d_y));
 
 	// pixels per world qu to match the teamradar_size2d_x range in the longest dimension
 	if(cl_teamradar_rotation == 0)




More information about the nexuiz-commits mailing list