[Quake2world-dev] r408 - in quake2world/branches/menu/src: . menu

[mattn at jdolan.dyndns.org]

Author: mattn
Date: 2009-04-20 17:33:35 +0000 (Mon, 20 Apr 2009)
New Revision: 408

Modified:
   quake2world/branches/menu/src/menu/m_render.c
   quake2world/branches/menu/src/r_draw.c
   quake2world/branches/menu/src/r_image.c
   quake2world/branches/menu/src/renderer.h
Log:
* simplified R_DrawFill

Modified: quake2world/branches/menu/src/menu/m_render.c
===================================================================
--- quake2world/branches/menu/src/menu/m_render.c	2009-04-20 17:29:24 UTC (rev 407)
+++ quake2world/branches/menu/src/menu/m_render.c	2009-04-20 17:33:35 UTC (rev 408)
@@ -30,7 +30,7 @@
  */
 void MN_DrawFill (int x, int y, int w, int h, int align, const vec4_t color)
 {
-	/*R_DrawFill(x, y, w, h, color);*/
+	R_DrawFill(x, y, w, h, color);
 }
 
 /**

Modified: quake2world/branches/menu/src/r_draw.c
===================================================================
--- quake2world/branches/menu/src/r_draw.c	2009-04-20 17:29:24 UTC (rev 407)
+++ quake2world/branches/menu/src/r_draw.c	2009-04-20 17:33:35 UTC (rev 408)
@@ -417,7 +417,7 @@
 /**
  * @brief Fills a box of pixels with a single color
  */
-void R_DrawFill (int x, int y, int w, int h, int align, const vec4_t color)
+void R_DrawFill (int x, int y, int w, int h, const vec4_t color)
 {
 	const float nx = x * r_state.rx;
 	const float ny = y * r_state.ry;
@@ -427,36 +427,14 @@
 	glColor4fv(color);
 
 	glDisable(GL_TEXTURE_2D);
-	glBegin(GL_QUADS);
 
-	switch (align) {
-	case ALIGN_CL:
-		glVertex2f(nx, ny);
-		glVertex2f(nx + nh, ny);
-		glVertex2f(nx + nh, ny - nw);
-		glVertex2f(nx, ny - nw);
-		break;
-	case ALIGN_CC:
-		glVertex2f(nx, ny);
-		glVertex2f(nx + nh, ny - nh);
-		glVertex2f(nx + nh, ny - nw - nh);
-		glVertex2f(nx, ny - nw);
-		break;
-	case ALIGN_UC:
-		glVertex2f(nx, ny);
-		glVertex2f(nx + nw, ny);
-		glVertex2f(nx + nw - nh, ny + nh);
-		glVertex2f(nx - nh, ny + nh);
-		break;
-	default:
-		glVertex2f(nx, ny);
-		glVertex2f(nx + nw, ny);
-		glVertex2f(nx + nw, ny + nh);
-		glVertex2f(nx, ny + nh);
-		break;
-	}
-
+	glBegin(GL_QUADS);
+	glVertex2f(nx, ny);
+	glVertex2f(nx + nw, ny);
+	glVertex2f(nx + nw, ny + nh);
+	glVertex2f(nx, ny + nh);
 	glEnd();
-	glColor4ubv(color_white);
+
 	glEnable(GL_TEXTURE_2D);
+	glColor4ubv(color_white);
 }

Modified: quake2world/branches/menu/src/r_image.c
===================================================================
--- quake2world/branches/menu/src/r_image.c	2009-04-20 17:29:24 UTC (rev 407)
+++ quake2world/branches/menu/src/r_image.c	2009-04-20 17:33:35 UTC (rev 408)
@@ -736,7 +736,6 @@
 	R_BindArray(GL_VERTEX_ARRAY, GL_SHORT, image_verts);
 	R_BindArray(GL_TEXTURE_COORD_ARRAY, GL_FLOAT, image_texcoords);
 
-
 	R_BindTexture(image->texnum);
 
 	if (blend)

Modified: quake2world/branches/menu/src/renderer.h
===================================================================
--- quake2world/branches/menu/src/renderer.h	2009-04-20 17:29:24 UTC (rev 407)
+++ quake2world/branches/menu/src/renderer.h	2009-04-20 17:33:35 UTC (rev 408)
@@ -370,7 +370,7 @@
 void R_DrawFillAlpha(int x, int y, int w, int h, int c, float a);
 void R_DrawFillAlphas(void);
 void R_DrawRect(int x, int y, int w, int h, const vec4_t color, float lineWidth, int pattern);
-void R_DrawFill(int x, int y, int w, int h, int align, const vec4_t color);
+void R_DrawFill(int x, int y, int w, int h, const vec4_t color);
 
 // r_entity.c
 void R_AddEntity(const entity_t *e);