Add AA bitmap support for standard gr.drawImage

Since that function already has full support for UV scaling it makes
sense to unify the behavior in one function instead of having a separate
monochrome function that does weird things.

Also deprecates that function since all its use cases are now covered by
drawImage.

Author: asarium

code/graphics/2d.cpp

@@ -1919,122 +1919,6 @@ void gr_bitmap_uv(int _x, int _y, int _w, int _h, float _u0, float _v0, float _u
 	g3_render_primitives_textured(&material_params, verts, 4, PRIM_TYPE_TRIFAN, true);
 }
 
-// NEW new bitmap functions -Bobboau
-// void gr_bitmap_list(bitmap_2d_list* list, int n_bm, int resize_mode)
-// {
-// 	for (int i = 0; i < n_bm; i++) {
-// 		bitmap_2d_list *l = &list[i];
-// 
-// 		bm_get_info(gr_screen.current_bitmap, &l->w, &l->h, NULL, NULL, NULL);
-// 
-// 		if ( resize_mode != GR_RESIZE_NONE && (gr_screen.custom_size || (gr_screen.rendering_to_texture != -1)) ) {
-// 			gr_resize_screen_pos(&l->x, &l->y, &l->w, &l->h, resize_mode);
-// 		}
-// 	}
-// 
-// 	g3_draw_2d_poly_bitmap_list(list, n_bm, TMAP_FLAG_INTERFACE);
-// }
-
-// _->NEW<-_ NEW new bitmap functions -Bobboau
-//takes a list of rectangles that have assosiated rectangles in a texture
-void gr_bitmap_list(bitmap_rect_list* list, int n_bm, int resize_mode)
-{
-	GR_DEBUG_SCOPE("2D Bitmap list");
-
-	// adapted from g3_draw_2d_poly_bitmap_list
-
-	for ( int i = 0; i < n_bm; i++ ) {
-		bitmap_2d_list *l = &list[i].screen_rect;
-
-		// if no valid hight or width values were given get some from the bitmap
-		if ( (l->w <= 0) || (l->h <= 0) ) {
-			bm_get_info(gr_screen.current_bitmap, &l->w, &l->h, NULL, NULL, NULL);
-		}
-
-		if ( resize_mode != GR_RESIZE_NONE && (gr_screen.custom_size || (gr_screen.rendering_to_texture != -1)) ) {
-			gr_resize_screen_pos(&l->x, &l->y, &l->w, &l->h, resize_mode);
-		}
-	}
-
-	vertex* vert_list = new vertex[6 * n_bm];
-	float sw = 0.1f;
-
-	for ( int i = 0; i < n_bm; i++ ) {
-		// stuff coords	
-
-		bitmap_2d_list* b = &list[i].screen_rect;
-		texture_rect_list* t = &list[i].texture_rect;
-		//tri one
-		vertex *V = &vert_list[i * 6];
-		V->screen.xyw.x = (float)b->x;
-		V->screen.xyw.y = (float)b->y;
-		V->screen.xyw.w = sw;
-		V->texture_position.u = (float)t->u0;
-		V->texture_position.v = (float)t->v0;
-		V->flags = PF_PROJECTED;
-		V->codes = 0;
-
-		V++;
-		V->screen.xyw.x = (float)(b->x + b->w);
-		V->screen.xyw.y = (float)b->y;
-		V->screen.xyw.w = sw;
-		V->texture_position.u = (float)t->u1;
-		V->texture_position.v = (float)t->v0;
-		V->flags = PF_PROJECTED;
-		V->codes = 0;
-
-		V++;
-		V->screen.xyw.x = (float)(b->x + b->w);
-		V->screen.xyw.y = (float)(b->y + b->h);
-		V->screen.xyw.w = sw;
-		V->texture_position.u = (float)t->u1;
-		V->texture_position.v = (float)t->v1;
-		V->flags = PF_PROJECTED;
-		V->codes = 0;
-
-		//tri two
-		V++;
-		V->screen.xyw.x = (float)b->x;
-		V->screen.xyw.y = (float)b->y;
-		V->screen.xyw.w = sw;
-		V->texture_position.u = (float)t->u0;
-		V->texture_position.v = (float)t->v0;
-		V->flags = PF_PROJECTED;
-		V->codes = 0;
-
-		V++;
-		V->screen.xyw.x = (float)(b->x + b->w);
-		V->screen.xyw.y = (float)(b->y + b->h);
-		V->screen.xyw.w = sw;
-		V->texture_position.u = (float)t->u1;
-		V->texture_position.v = (float)t->v1;
-		V->flags = PF_PROJECTED;
-		V->codes = 0;
-
-		V++;
-		V->screen.xyw.x = (float)b->x;
-		V->screen.xyw.y = (float)(b->y + b->h);
-		V->screen.xyw.w = sw;
-		V->texture_position.u = (float)t->u0;
-		V->texture_position.v = (float)t->v1;
-		V->flags = PF_PROJECTED;
-		V->codes = 0;
-	}
-
-	material mat_params;
-	material_set_interface(
-		&mat_params,
-		gr_screen.current_bitmap,
-		gr_screen.current_alphablend_mode == GR_ALPHABLEND_FILTER ? true : false,
-		gr_screen.current_alpha
-	);
-	g3_render_primitives_textured(&mat_params, vert_list, 6 * n_bm, PRIM_TYPE_TRIS, true);
-
-	delete[] vert_list;
-}
-
-
-
 /**
 * Given endpoints, and thickness, calculate coords of the endpoint
 * Adapted from gr_pline_helper()

code/graphics/2d.h

@@ -1268,7 +1268,6 @@ void gr_set_shader(shader *shade);
 // new bitmap functions
 void gr_bitmap(int x, int y, int resize_mode = GR_RESIZE_FULL);
 void gr_bitmap_uv(int _x, int _y, int _w, int _h, float _u0, float _v0, float _u1, float _v1, int resize_mode = GR_RESIZE_FULL);
-void gr_bitmap_list(bitmap_rect_list* list, int n_bm, int resize_mode);
 
 // special function for drawing polylines. this function is specifically intended for
 // polylines where each section is no more than 90 degrees away from a previous section.

code/graphics/render.cpp

@@ -1,18 +1,19 @@
 
 #include "graphics/render.h"
+
 #include "graphics/material.h"
 #include "graphics/matrix.h"
-#include "graphics/software/font_internal.h"
+#include "graphics/paths/PathRenderer.h"
 #include "graphics/software/FSFont.h"
 #include "graphics/software/NVGFont.h"
 #include "graphics/software/VFNTFont.h"
-#include "graphics/paths/PathRenderer.h"
-
-#include "mod_table/mod_table.h"
+#include "graphics/software/font_internal.h"
 #include "localization/localize.h"
-#include "matrix.h"
+#include "mod_table/mod_table.h"
+#include "render/3d.h"
 
-static void gr_flash_internal(int r, int g, int b, int a, bool alpha_flash) {
+static void gr_flash_internal(int r, int g, int b, int a, bool alpha_flash)
+{
 	CLAMP(r, 0, 255);
 	CLAMP(g, 0, 255);
 	CLAMP(b, 0, 255);
@@ -1148,14 +1149,130 @@ void gr_render_primitives_immediate(material* material_info,
 }
 
 void gr_render_primitives_2d_immediate(material* material_info,
-									   primitive_type prim_type,
-									   vertex_layout* layout,
-									   int n_verts,
-									   void* data,
-									   size_t size) {
+	primitive_type prim_type,
+	vertex_layout* layout,
+	int n_verts,
+	void* data,
+	size_t size)
+{
 	gr_set_2d_matrix();
 
 	gr_render_primitives_immediate(material_info, prim_type, layout, n_verts, data, size);
 
 	gr_end_2d_matrix();
 }
+
+// _->NEW<-_ NEW new bitmap functions -Bobboau
+// takes a list of rectangles that have assosiated rectangles in a texture
+static void draw_bitmap_list(bitmap_rect_list* list, int n_bm, int resize_mode, material* render_mat)
+{
+	GR_DEBUG_SCOPE("2D Bitmap list");
+
+	// adapted from g3_draw_2d_poly_bitmap_list
+
+	for (int i = 0; i < n_bm; i++) {
+		bitmap_2d_list* l = &list[i].screen_rect;
+
+		// if no valid hight or width values were given get some from the bitmap
+		if ((l->w <= 0) || (l->h <= 0)) {
+			bm_get_info(gr_screen.current_bitmap, &l->w, &l->h, nullptr, nullptr, nullptr);
+		}
+
+		if (resize_mode != GR_RESIZE_NONE && (gr_screen.custom_size || (gr_screen.rendering_to_texture != -1))) {
+			gr_resize_screen_pos(&l->x, &l->y, &l->w, &l->h, resize_mode);
+		}
+	}
+
+	auto vert_list = new vertex[6 * n_bm];
+	float sw = 0.1f;
+
+	for (int i = 0; i < n_bm; i++) {
+		// stuff coords
+
+		bitmap_2d_list* b = &list[i].screen_rect;
+		texture_rect_list* t = &list[i].texture_rect;
+		// tri one
+		vertex* V = &vert_list[i * 6];
+		V->screen.xyw.x = (float)b->x;
+		V->screen.xyw.y = (float)b->y;
+		V->screen.xyw.w = sw;
+		V->texture_position.u = (float)t->u0;
+		V->texture_position.v = (float)t->v0;
+		V->flags = PF_PROJECTED;
+		V->codes = 0;
+
+		V++;
+		V->screen.xyw.x = (float)(b->x + b->w);
+		V->screen.xyw.y = (float)b->y;
+		V->screen.xyw.w = sw;
+		V->texture_position.u = (float)t->u1;
+		V->texture_position.v = (float)t->v0;
+		V->flags = PF_PROJECTED;
+		V->codes = 0;
+
+		V++;
+		V->screen.xyw.x = (float)(b->x + b->w);
+		V->screen.xyw.y = (float)(b->y + b->h);
+		V->screen.xyw.w = sw;
+		V->texture_position.u = (float)t->u1;
+		V->texture_position.v = (float)t->v1;
+		V->flags = PF_PROJECTED;
+		V->codes = 0;
+
+		// tri two
+		V++;
+		V->screen.xyw.x = (float)b->x;
+		V->screen.xyw.y = (float)b->y;
+		V->screen.xyw.w = sw;
+		V->texture_position.u = (float)t->u0;
+		V->texture_position.v = (float)t->v0;
+		V->flags = PF_PROJECTED;
+		V->codes = 0;
+
+		V++;
+		V->screen.xyw.x = (float)(b->x + b->w);
+		V->screen.xyw.y = (float)(b->y + b->h);
+		V->screen.xyw.w = sw;
+		V->texture_position.u = (float)t->u1;
+		V->texture_position.v = (float)t->v1;
+		V->flags = PF_PROJECTED;
+		V->codes = 0;
+
+		V++;
+		V->screen.xyw.x = (float)b->x;
+		V->screen.xyw.y = (float)(b->y + b->h);
+		V->screen.xyw.w = sw;
+		V->texture_position.u = (float)t->u0;
+		V->texture_position.v = (float)t->v1;
+		V->flags = PF_PROJECTED;
+		V->codes = 0;
+	}
+
+	g3_render_primitives_textured(render_mat, vert_list, 6 * n_bm, PRIM_TYPE_TRIS, true);
+
+	delete[] vert_list;
+}
+
+void gr_bitmap_list(bitmap_rect_list* list, int n_bm, int resize_mode)
+{
+	material mat_params;
+	material_set_interface(&mat_params,
+		gr_screen.current_bitmap,
+		gr_screen.current_alphablend_mode == GR_ALPHABLEND_FILTER,
+		gr_screen.current_alpha);
+
+	draw_bitmap_list(list, n_bm, resize_mode, &mat_params);
+}
+
+void gr_aabitmap_list(bitmap_rect_list* list, int n_bm, int resize_mode)
+{
+	material render_mat;
+	render_mat.set_blend_mode(ALPHA_BLEND_ALPHA_BLEND_ALPHA);
+	render_mat.set_depth_mode(ZBUFFER_TYPE_NONE);
+	render_mat.set_texture_map(TM_BASE_TYPE, gr_screen.current_bitmap);
+	render_mat.set_color(gr_screen.current_color);
+	render_mat.set_cull_mode(false);
+	render_mat.set_texture_type(material::TEX_TYPE_AABITMAP);
+
+	draw_bitmap_list(list, n_bm, resize_mode, &render_mat);
+}

code/graphics/render.h

@@ -226,3 +226,7 @@ void gr_render_primitives_immediate(material* material_info, primitive_type prim
  * @param size The size of the data
  */
 void gr_render_primitives_2d_immediate(material* material_info, primitive_type prim_type, vertex_layout* layout, int n_verts, void* data, size_t size);
+
+void gr_bitmap_list(bitmap_rect_list* list, int n_bm, int resize_mode);
+
+void gr_aabitmap_list(bitmap_rect_list* list, int n_bm, int resize_mode);

code/scripting/api/libs/graphics.cpp

@@ -1304,10 +1304,11 @@ ADE_FUNC(loadTexture, l_Graphics, "string Filename, [boolean LoadIfAnimation, bo
 ADE_FUNC(drawImage,
 	l_Graphics,
 	"string|texture fileNameOrTexture, [number X1=0, number Y1=0, number X2, number Y2, number UVX1 = 0.0, number UVY1 "
-	"= 0.0, number UVX2=1.0, number UVY2=1.0, number alpha=1.0]",
+	"= 0.0, number UVX2=1.0, number UVY2=1.0, number alpha=1.0, boolean aaImage = false]",
 	"Draws an image file or texture. Any image extension passed will be ignored."
 	"The UV variables specify the UV value for each corner of the image. "
-	"In UV coordinates, (0,0) is the top left of the image; (1,1) is the lower right.",
+	"In UV coordinates, (0,0) is the top left of the image; (1,1) is the lower right. If aaImage is true, image needs "
+	"to be monochrome and will be drawn tinted with the currently active color.",
 	"boolean",
 	"Whether image was drawn")
 {
@@ -1324,11 +1325,12 @@ ADE_FUNC(drawImage,
 	float uv_x2=1.0f;
 	float uv_y2=1.0f;
 	float alpha=1.0f;
+	bool aabitmap = false;
 
 	if(lua_isstring(L, 1))
 	{
 		const char* s = nullptr;
-		if(!ade_get_args(L, "s|iiiifffff", &s,&x1,&y1,&x2,&y2,&uv_x1,&uv_y1,&uv_x2,&uv_y2,&alpha))
+		if (!ade_get_args(L, "s|iiiifffffb", &s, &x1, &y1, &x2, &y2, &uv_x1, &uv_y1, &uv_x2, &uv_y2, &alpha, &aabitmap))
 			return ade_set_error(L, "b", false);
 
 		idx = Script_system.LoadBm(s);
@@ -1339,8 +1341,19 @@ ADE_FUNC(drawImage,
 	else
 	{
 		texture_h* th = nullptr;
-		if (!ade_get_args(L, "o|iiiifffff", l_Texture.GetPtr(&th), &x1, &y1, &x2, &y2, &uv_x1, &uv_y1, &uv_x2, &uv_y2,
-		                  &alpha))
+		if (!ade_get_args(L,
+				"o|iiiifffffb",
+				l_Texture.GetPtr(&th),
+				&x1,
+				&y1,
+				&x2,
+				&y2,
+				&uv_x1,
+				&uv_y1,
+				&uv_x2,
+				&uv_y2,
+				&alpha,
+				&aabitmap))
 			return ade_set_error(L, "b", false);
 
 		if (!th->isValid()) {
@@ -1365,17 +1378,24 @@ ADE_FUNC(drawImage,
 
 	gr_set_bitmap(idx, lua_Opacity_type, GR_BITBLT_MODE_NORMAL, alpha);
 	bitmap_rect_list brl = bitmap_rect_list(x1, y1, w, h, uv_x1, uv_y1, uv_x2, uv_y2);
-	gr_bitmap_list(&brl, 1, GR_RESIZE_NONE);
+
+	if (aabitmap) {
+		gr_aabitmap_list(&brl, 1, GR_RESIZE_NONE);
+	} else {
+		gr_bitmap_list(&brl, 1, GR_RESIZE_NONE);
+	}
 
 	return ADE_RETURN_TRUE;
 }
 
-ADE_FUNC(drawMonochromeImage,
+ADE_FUNC_DEPRECATED(drawMonochromeImage,
 	l_Graphics,
 	"string|texture fileNameOrTexture, number X1, number Y1, [number X2, number Y2, number alpha=1.0]",
 	"Draws a monochrome image from a texture or file using the current color",
 	"boolean",
-	"Whether image was drawn")
+	"Whether image was drawn",
+	gameversion::version(20, 1),
+	"gr.drawImage now has support for drawing monochrome images with full UV scaling support")
 {
 	if(!Gr_inited)
 		return ade_set_error(L, "b", false);