FF7: Fix 3D model drawn over UI on BATTLE mode if lighting enabled

�Fixes #131
julianxhokaxhiu · Oct 30, 2022 · 0ed8263 · 0ed8263
1 parent d15c03d
commit 0ed8263
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 3 deletions.
diff --git a/src/ff7/battle/menu.cpp b/src/ff7/battle/menu.cpp
@@ -32,8 +32,14 @@ namespace ff7::battle
     void battle_menu_enter()
     {
         *ff7_externals.g_do_render_menu = 0;
-        if(!enable_lighting)
-            newRenderer.clearDepthBuffer();
+        battle_depth_clear();
+    }
+
+    void battle_depth_clear()
+    {
+        if(gl_defer_battle_depth_clear()) return;
+
+        newRenderer.clearDepthBuffer();
     }
 
     void update_battle_menu()

diff --git a/src/ff7/battle/menu.h b/src/ff7/battle/menu.h
@@ -30,4 +30,5 @@ namespace ff7::battle
     void display_cait_sith_slots_handler();
     void display_battle_arena_menu_handler();
     void delay_battle_target_pointer_animation_type();
+    void battle_depth_clear();
 }
diff --git a/src/gl.h b/src/gl.h
@@ -34,6 +34,7 @@ enum DrawCallType
 	DCT_BLIT,
 	DCT_DRAW,
 	DCT_DRAW_MOVIE,
+	DCT_BATTLE_DEPTH_CLEAR,
 	DCT_ZOOM
 };
 
@@ -118,6 +119,7 @@ uint32_t gl_defer_sorted_draw(uint32_t primitivetype, uint32_t vertextype, struc
 uint32_t gl_defer_blit_framebuffer(struct texture_set *texture_set, struct tex_header *tex_header);
 uint32_t gl_defer_clear_buffer(uint32_t clear_color, uint32_t clear_depth, struct game_obj *game_object);
 uint32_t gl_defer_yuv_frame(uint32_t buffer_index);
+uint32_t gl_defer_battle_depth_clear();
 uint32_t gl_defer_zoom();
 void gl_draw_deferred(draw_field_shadow_callback shadow_callback);
 struct boundingbox calculateSceneAabb();

diff --git a/src/gl/deferred.cpp b/src/gl/deferred.cpp
@@ -27,6 +27,7 @@
 #include "../log.h"
 #include "../common.h"
 #include "../video/movies.h"
+#include "../ff7/battle/menu.h"
 
 #include "ff7/widescreen.h"
 
@@ -273,7 +274,41 @@ uint32_t gl_defer_zoom()
 
 	num_deferred++;
 
-	if (trace_all) ffnx_trace("gl_defer_yuv_frame: return true\n");
+	if (trace_all) ffnx_trace("gl_defer_zoom: return true\n");
+
+	return true;
+}
+
+uint32_t gl_defer_battle_depth_clear()
+{
+	if (ff8 || !enable_lighting)
+	{
+		return false;
+	}
+
+	if (trace_all) ffnx_trace("gl_defer_battle_depth_clear");
+
+	if (!deferred_draws) deferred_draws = (deferred_draw*)driver_calloc(sizeof(*deferred_draws), DEFERRED_MAX);
+
+	// global disable
+	if (nodefer) {
+		if (trace_all) ffnx_trace("gl_defer_battle_depth_clear: nodefer true\n");
+		return false;
+	}
+
+	if (num_deferred + 1 > DEFERRED_MAX)
+	{
+		if (trace_all) ffnx_trace("gl_defer_battle_depth_clear: deferred draw queue overflow - num_deferred: %u - count: 1 - DEFERRED_MAX: %u\n", num_deferred, DEFERRED_MAX);
+		return false;
+	}
+
+	uint32_t defer = num_deferred;
+
+	deferred_draws[defer].draw_call_type = DCT_BATTLE_DEPTH_CLEAR;
+
+	num_deferred++;
+
+	if (trace_all) ffnx_trace("gl_defer_battle_depth_clear: return true\n");
 
 	return true;
 }
@@ -477,6 +512,11 @@ void gl_draw_deferred(draw_field_shadow_callback shadow_callback)
 			ff7_field_draw_gray_quads_sub_644E90();
 			continue;
 		}
+		else if(deferred_draws[i].draw_call_type == DCT_BATTLE_DEPTH_CLEAR)
+		{
+			ff7::battle::battle_depth_clear();
+			continue;
+		}
 
 		if (deferred_draws[i].vertices == nullptr)
 		{