[nexuiz-commits] r7649 - in trunk/data: gfx/menu/wickedz qcsrc/menu

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-05 15:12:31 -0400 (Sat, 05 Sep 2009)
New Revision: 7649

Added:
   trunk/data/gfx/menu/wickedz/background_ingame_l2.tga
   trunk/data/gfx/menu/wickedz/background_ingame_l3.tga
   trunk/data/gfx/menu/wickedz/background_l2.tga
   trunk/data/gfx/menu/wickedz/background_l3.tga
   trunk/data/gfx/menu/wickedz/background_l4.tga
   trunk/data/gfx/menu/wickedz/background_l5.tga
Modified:
   trunk/data/gfx/menu/wickedz/background.tga
   trunk/data/gfx/menu/wickedz/background_ingame.tga
   trunk/data/gfx/menu/wickedz/skinvalues.txt
   trunk/data/qcsrc/menu/menu.qc
Log:
fix menu display at non-4:3 aspect ratio by drawing multiple background layers


Modified: trunk/data/gfx/menu/wickedz/background.tga
===================================================================
(Binary files differ)

Modified: trunk/data/gfx/menu/wickedz/background_ingame.tga
===================================================================
(Binary files differ)

Added: trunk/data/gfx/menu/wickedz/background_ingame_l2.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/wickedz/background_ingame_l2.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/wickedz/background_ingame_l3.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/wickedz/background_ingame_l3.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/wickedz/background_l2.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/wickedz/background_l2.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/wickedz/background_l3.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/wickedz/background_l3.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/wickedz/background_l4.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/wickedz/background_l4.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/gfx/menu/wickedz/background_l5.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/menu/wickedz/background_l5.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/gfx/menu/wickedz/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/wickedz/skinvalues.txt	2009-09-05 17:10:39 UTC (rev 7648)
+++ trunk/data/gfx/menu/wickedz/skinvalues.txt	2009-09-05 19:12:31 UTC (rev 7649)
@@ -64,8 +64,8 @@
 // general
 //   uses "background" images
 //   uses "background_ingame" images
-ALIGN_BACKGROUND                5
-ALIGN_BACKGROUND_INGAME         5
+ALIGN_BACKGROUND                37915
+ALIGN_BACKGROUND_INGAME         591
 ALPHA_BACKGROUND_INGAME         0.7
 ALPHA_DISABLED                  0.2
 ALPHA_BEHIND                    0.5

Modified: trunk/data/qcsrc/menu/menu.qc
===================================================================
--- trunk/data/qcsrc/menu/menu.qc	2009-09-05 17:10:39 UTC (rev 7648)
+++ trunk/data/qcsrc/menu/menu.qc	2009-09-05 19:12:31 UTC (rev 7649)
@@ -201,7 +201,7 @@
 	if(key == K_SHIFT) menuShiftState |= S_SHIFT;
 };
 
-void(string img, float a, float algn) drawBackground =
+void(string img, float a, float algn, float force1) drawBackground =
 {
 	vector sz;
 	vector isz;
@@ -250,6 +250,11 @@
 		}
 		if(i == 0)
 			draw_Picture(v, img, isz, '1 1 1', a);
+		else if(force1)
+			// force all secondary layers to use alpha 1. Prevents ugly issues
+			// with overlap. It's a flag because it cannot be used for the
+			// ingame background
+			draw_Picture(v, strcat(img, "_l", ftos(i+1)), isz, '1 1 1', 1);
 		else
 			draw_Picture(v, strcat(img, "_l", ftos(i+1)), isz, '1 1 1', a);
 	}
@@ -563,7 +568,7 @@
 	{
 		if(menuLogoAlpha > 0)
 		{
-			drawBackground(SKINGFX_BACKGROUND, bound(0, menuLogoAlpha, 1), SKINALIGN_BACKGROUND);
+			drawBackground(SKINGFX_BACKGROUND, bound(0, menuLogoAlpha, 1), SKINALIGN_BACKGROUND, TRUE);
 			if(menuAlpha <= 0 && SKINALPHA_CURSOR_INTRO > 0)
 			{
 				draw_alpha = SKINALPHA_CURSOR_INTRO * bound(0, menuLogoAlpha, 1);
@@ -575,7 +580,7 @@
 	else if(SKINALPHA_BACKGROUND_INGAME)
 	{
 		if(menuAlpha > 0)
-			drawBackground(SKINGFX_BACKGROUND_INGAME, menuAlpha * SKINALPHA_BACKGROUND_INGAME, SKINALIGN_BACKGROUND_INGAME);
+			drawBackground(SKINGFX_BACKGROUND_INGAME, menuAlpha * SKINALPHA_BACKGROUND_INGAME, SKINALIGN_BACKGROUND_INGAME, FALSE);
 	}
 
 	draw_reset();