From b60cce3e8fc9ea259e508a028cc0fd72a27ee85a Mon Sep 17 00:00:00 2001
From: Nunuhara Cabbage <nunuhara@haniwa.technology>
Date: Sun, 12 Jun 2022 14:44:08 -0700
Subject: [PATCH] parts: handle zero surface area at render time

Check for uninitialized or explicitly zeroed surface area at render
time. This fixes an issue where some construction process parts would
not be rendered (specifically, the button text on the Rance 01 title
screen).
---
 src/parts/parts.c  | 10 ----------
 src/parts/render.c |  9 ++++++---
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/parts/parts.c b/src/parts/parts.c
index 3df7242..64004bb 100644
--- a/src/parts/parts.c
+++ b/src/parts/parts.c
@@ -329,7 +329,6 @@ static bool parts_set_cg(struct parts *parts, struct cg *cg, int cg_no, int stat
 	struct parts_cg *parts_cg = parts_get_cg(parts, state);
 	gfx_delete_texture(&parts_cg->common.texture);
 	gfx_init_texture_with_cg(&parts_cg->common.texture, cg);
-	parts_cg->common.surface_area = (Rectangle) { 0, 0, cg->metrics.w, cg->metrics.h };;
 	parts_cg->no = cg_no;
 	parts_set_cg_dims(parts, cg);
 	parts_recalculate_pos(parts);
@@ -440,7 +439,6 @@ bool parts_set_number(struct parts *parts, int n, int state)
 	// copy chars to texture
 	gfx_delete_texture(&num->common.texture);
 	gfx_init_texture_rgba(&num->common.texture, w, h, (SDL_Color){0, 0, 0, 255});
-	num->common.surface_area = (Rectangle) { 0, 0, w, h };
 
 	int x = 0;
 	for (int i = nr_chars-1; i>= 0; i--) {
@@ -468,12 +466,6 @@ void parts_set_state(struct parts *parts, enum parts_state_type state)
 
 void parts_set_surface_area(struct parts_common *common, int x, int y, int w, int h)
 {
-	if (!w && !h) {
-		x = 0;
-		y = 0;
-		w = common->texture.w;
-		h = common->texture.h;
-	}
 	common->surface_area = (Rectangle) { x, y, w, h };
 }
 
@@ -651,7 +643,6 @@ bool PE_SetLoopCG_by_index(int parts_no, int cg_no, int nr_frames, int frame_tim
 	anim->elapsed = 0;
 	anim->current_frame = 0;
 	anim->common.texture = frames[0];
-	anim->common.surface_area = parts->rect;
 	return true;
 }
 
@@ -680,7 +671,6 @@ static bool set_gauge_cg(int parts_no, struct cg *cg, int state, bool vert)
 
 	gfx_init_texture_rgba(&g->common.texture, g->cg.w, g->cg.h, (SDL_Color){0,0,0,255});
 	gfx_copy_with_alpha_map(&g->common.texture, 0, 0, &g->cg, 0, 0, g->cg.w, g->cg.h);
-	g->common.surface_area = (Rectangle) { 0, 0, g->cg.w, g->cg.h };
 
 	parts->rect.w = g->cg.w;
 	parts->rect.h = g->cg.h;
diff --git a/src/parts/render.c b/src/parts/render.c
index 2907900..5af91e8 100644
--- a/src/parts/render.c
+++ b/src/parts/render.c
@@ -77,12 +77,15 @@ static void parts_render_cg(struct parts *parts, struct parts_common *common,
 		.data = &common->texture,
 	};
 
-	const Rectangle *r = &common->surface_area;
+	Rectangle r = common->surface_area;
+	if (!r.w && !r.h) {
+		r = (Rectangle) { 0, 0, common->texture.w, common->texture.h };
+	}
 
 	gfx_prepare_job(&job);
 	glUniform1f(parts_shader.alpha_mod, common->texture.alpha_mod / 255.0);
-	glUniform2f(parts_shader.bot_left, r->x, r->y);
-	glUniform2f(parts_shader.top_right, r->x + r->w, r->y + r->h);
+	glUniform2f(parts_shader.bot_left, r.x, r.y);
+	glUniform2f(parts_shader.top_right, r.x + r.w, r.y + r.h);
 	gfx_run_job(&job);
 }