CVS: bzflag/src/bzflag ControlPanel.cxx,1.10.2.10,1.10.2.11

[Tim R. <tim...@us...>]

Update of /cvsroot/bzflag/bzflag/src/bzflag
In directory usw-pr-cvs1:/tmp/cvs-serv21149/src/bzflag

Modified Files:
      Tag: v1_7
	ControlPanel.cxx 
Log Message:
radar/msg window scaling

Index: ControlPanel.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/Attic/ControlPanel.cxx,v
retrieving revision 1.10.2.10
retrieving revision 1.10.2.11
diff -u -r1.10.2.10 -r1.10.2.11
--- ControlPanel.cxx	12 Nov 2002 11:34:11 -0000	1.10.2.10
+++ ControlPanel.cxx	17 Nov 2002 08:41:25 -0000	1.10.2.11
@@ -73,22 +73,23 @@
 	  background[3] = (float) atof(resources->getValue( "opacity" ));
 
   const float iWidth = 256.0f;
-  const float iHeight = 64.0f;
+  const float iHeight = 192.0f;
+  const float iSize = iHeight / 4.0f;
   const float dx = 1.0f / iWidth;
   const float dy = 1.0f / iHeight;
   float iSpace;
   if (background[3] == 1.0f)
     iSpace = 0.0f;
   else
-    iSpace = 5.0f;
+    iSpace = 4.0f;
   radarAreaUV[0] = dx * iSpace;
   radarAreaUV[1] = dy * iSpace;
-  radarAreaUV[2] = dx * (iHeight - (iSpace * 2.0f));
-  radarAreaUV[3] = dy * (iHeight - (iSpace * 2.0f));
-  messageAreaUV[0] = dx * iHeight;
+  radarAreaUV[2] = dx * (iSize - (iSpace * 2.0f));
+  radarAreaUV[3] = dy * (iSize - (iSpace * 2.0f));
+  messageAreaUV[0] = dx * iSize;
   messageAreaUV[1] = dy * iSpace;
-  messageAreaUV[2] = dx * (iWidth - iHeight - iSpace);
-  messageAreaUV[3] = dy * (iHeight - (iSpace * 2.0f));
+  messageAreaUV[2] = dx * (iWidth - iSize - iSpace);
+  messageAreaUV[3] = dy * (iSize - (iSpace * 2.0f));
 
   // other initialization
   width = 1;
@@ -257,7 +258,7 @@
 {
   // get important metrics
   float w = (float)window.getWidth();
-  const float h = (float)window.getHeight() / 3;
+  const float h = (float)window.getHeight();
 
   // compute areas in pixels x,y,w,h
   // leave off 1 pixel for the border