DrawDistance: add quicksort hack to fix sunny beach water

This probably isn't a true fix for the water, think the water/reflection textures either have bad center coord setup, or maybe there's issues with the matrix used for calculating each models screen position (which then gets used for sorting by QuickSort)
Maybe similar to the znear projection matrix issue that FixZBufferPrecision worked around (likely, seeing as this issue only happens on PC, similar to the ZBuffer issue)

I didn't see anything broken by just skipping quicksort on this stage though, so we'll just do that for now

Author: emoose

OutRun2006Tweaks.lods.ini

@@ -28,6 +28,11 @@
 # Hill on the road, DD222
 0x1 = 0x1F
 
+# BEACH
+[Stage 15]
+# Black patch above water
+SkipQuickSort = True
+
 # LAS VEGAS
 [Stage 18]
 # Building geo above winding section
@@ -60,6 +65,11 @@
 # Bad polygon when entering from bunki
 0x1 = 0x6
 
+# BEACH (T)
+[Stage 61]
+# Black patch above water
+SkipQuickSort = True
+
 # BEACH (BR)
 [Stage 65]
 # Bad polygon when entering from bunki

src/game.hpp

@@ -1209,7 +1209,7 @@ typedef struct TDrawBuffer
 {
 	int NumBuffers_0;
 	int MaxBuffers_4;
-	int unk_8[1];
+	int field_8;
 	int MaxBuffers_C;
 	DrawEntry** BufferPtrs_10;
 	DrawEntry* Buffer_14;

src/game_addrs.hpp

@@ -100,6 +100,9 @@ namespace Game
 	inline fn_1arg_int GetMaxCsLen = nullptr;
 	inline fn_1arg_char GetStageUniqueName = nullptr;
 
+	inline void(*QuickSort)(void*, int, int) = nullptr;
+	inline void(*DrawStoredModel_Internal)(DrawBuffer*) = nullptr;
+
 	inline fn_stdcall_1arg_int Sumo_CheckRacerUnlocked = nullptr;
 
 	inline const char* SumoNet_OnlineUserName = nullptr;
@@ -266,6 +269,9 @@ namespace Game
 		GetMaxCsLen = Module::fn_ptr<fn_1arg_int>(0x3D470);
 		GetStageUniqueName = Module::fn_ptr<fn_1arg_char>(0x4BE80);
 
+		QuickSort = Module::fn_ptr(0x499E0, QuickSort);
+		DrawStoredModel_Internal = Module::fn_ptr(0x5890, DrawStoredModel_Internal);
+
 		Sumo_CheckRacerUnlocked = Module::fn_ptr<fn_stdcall_1arg_int>(0xE8410);
 
 		SumoNet_OnlineUserName = Module::exe_ptr<const char>(0x430C20);

src/hooks_drawdistance.cpp

@@ -9,6 +9,8 @@
 
 std::array<std::vector<uint16_t>, 256> ObjectNodes;
 std::array<std::array<std::bitset<16384>, 256>, 128> ObjectExclusionsPerStage;
+std::bitset<128> SkipQuickSortHackStages;
+
 int NumObjects = 0;
 int CsLengthNum = 0;
 
@@ -267,9 +269,18 @@ bool DrawDist_ReadExclusions()
 			spdlog::error("DrawDist_ReadExclusions - INI contains invalid stage section \"{}\", skipping...", section);
 			continue;
 		}
+		SkipQuickSortHackStages[stageNum] = false;
 
 		for (auto& key : ini.Keys(section))
 		{
+			if (key == "SkipQuickSort")
+			{
+				bool skip = false;
+				if (ini.Get<bool>(section, key, skip))
+					SkipQuickSortHackStages[stageNum] = true;
+				continue;
+			}
+
 			int objectId = -1;
 			try
 			{
@@ -329,6 +340,45 @@ bool DrawDist_ReadExclusions()
 	return true;
 }
 
+class SkipQuickSortHack : public Hook
+{
+	inline static SafetyHookInline DrawStoredModel_Execute_hook = {};
+	static void DrawStoredModel_Execute_dest()
+	{
+		if (!SkipQuickSortHackStages[*Game::stg_stage_num])
+			Game::QuickSort(Game::s_AftDrawBuffer->BufferPtrs_10, 0, Game::s_AftDrawBuffer->NumBuffers_0 - 1);
+
+		Game::DrawStoredModel_Internal(Game::s_AftDrawBuffer);
+		Game::s_AftDrawBuffer->NumBuffers_0 = 0;
+		Game::s_AftDrawBuffer->field_8 = 0;
+	}
+
+public:
+	std::string_view description() override
+	{
+		return "SkipQuickSort";
+	}
+
+	bool validate() override
+	{
+		return true;
+	}
+
+	bool apply() override
+	{
+		constexpr int DrawStoredModel_Execute_Addr = 0x5830;
+
+		// This func has some weird securom protection bytes inside, we'll nop the beginning so safetyhook doesn't get confused
+		Memory::VP::Nop(Module::exe_ptr(DrawStoredModel_Execute_Addr), 5);
+		DrawStoredModel_Execute_hook = safetyhook::create_inline(Module::exe_ptr(DrawStoredModel_Execute_Addr), DrawStoredModel_Execute_dest);
+
+		return true;
+	}
+
+	static SkipQuickSortHack instance;
+};
+SkipQuickSortHack SkipQuickSortHack::instance;
+
 class DrawDistanceIncrease : public Hook
 {
 	// Stage drawing/culling is based on the player cars position in the stage
@@ -429,7 +479,7 @@ class DrawDistanceIncrease : public Hook
 
 						// DEBUG: check exclusions here before adding to *cur
 						// (if we're at csOffset = 0 exclusions are ignored, since this is what vanilla game would display)
-						if (csOffset == 0 || !objectExclusions[ObjectNum][*sectionCollList])
+						if ((csOffset == 0 && Settings::DrawDistanceIncrease > 0) || !objectExclusions[ObjectNum][*sectionCollList])
 						{
 							*cur = *sectionCollList;
 							cur++;

src/plugin.hpp

@@ -32,6 +32,16 @@ namespace Module
 	template <typename T>
 	inline T fn_ptr(uintptr_t offset) { if (ExeHandle) return (T)(((uintptr_t)ExeHandle) + offset); else return nullptr; }
 
+	// Deduce the type by providing it as an argument, no need for ugly decltype stuff
+	template <typename T>
+	inline T fn_ptr(uintptr_t offset, T& var)
+	{
+		if (ExeHandle)
+			return reinterpret_cast<T>(((uintptr_t)ExeHandle) + offset);
+		else
+			return nullptr;
+	}
+
 	void init();
 }