DrawDist: update lods, move DrawBuffer to game.h

Author: emoose

OutRun2006Tweaks.lods.ini

@@ -11,10 +11,18 @@
 # See-through mountains in distance from bunki
 0x1 = 0x1, 0xD, 0x22
 
-# LAS VEGAS 
-#[Stage 18] 
-# Wall texture under tunnel (TODO: needs more testing, might need to set a dist limit on this map)
-# 0x1 = 0x1F
+# SNOW MOUNTAIN
+[Stage 4]
+# Piece of floating mountain geometry when entering the stage
+0x1 = 0x8
+# Random piece of floating geometry above the lift cables, didn't get a close look
+0x6 = 0x1E
+
+# LAS VEGAS
+[Stage 18]
+# Building geo above winding section
+0x1 = 0x1F
+0x3 = 0x1, 0x3, 0x10, 0x11, 0x1F, 0x21, 0x4E, 0x50
 
 # GRAND CANYON
 [Stage 20]
@@ -23,6 +31,10 @@
 0x1 = 0x2, 0x1A, 0x20, 0x22
 0x2 = 0x9
 
+# MAYA
+[Stage 25]
+0x1 = 0x34
+
 # NEW YORK
 [Stage 26]
 # Bushes when entering from bunki

src/game.hpp

@@ -591,7 +591,7 @@ typedef struct tagSPRARGS2
 } SPRARGS2;
 static_assert(sizeof(SPRARGS2) == 0xB8);
 
-struct tagEvWorkRobot
+typedef struct tagEvWorkRobot
 {
 	uint32_t workId_0;
 	uint32_t dword4;
@@ -611,8 +611,26 @@ struct tagEvWorkRobot
 	char byte85;
 	uint8_t unk_86[2];
 	uint8_t unk_88[8];
-};
-static_assert(sizeof(tagEvWorkRobot) == 0x90);
+} EvWorkRobot;
+static_assert(sizeof(EvWorkRobot) == 0x90);
+
+typedef struct TDrawEntry
+{
+	uint8_t todo[0x3C];
+} DrawEntry;
+static_assert(sizeof(DrawEntry) == 0x3C);
+
+typedef struct TDrawBuffer
+{
+	int NumBuffers_0;
+	int MaxBuffers_4;
+	int unk_8[1];
+	int MaxBuffers_C;
+	DrawEntry** BufferPtrs_10;
+	DrawEntry* Buffer_14;
+	void* UnkBuffer_18;
+} DrawBuffer;
+static_assert(sizeof(DrawBuffer) == 0x1C);
 
 inline void WaitForDebugger()
 {

src/game_addrs.hpp

@@ -3,6 +3,7 @@
 #include "plugin.hpp"
 #include <d3d9.h>
 #include <dinput.h>
+#include "game.hpp"
 
 typedef void(__stdcall* D3DXVec4Transform_fn)(D3DXVECTOR4*, D3DXVECTOR4*, D3DMATRIX*);
 
@@ -54,6 +55,9 @@ namespace Game
 
 	inline D3DXVECTOR2* screen_scale = nullptr;
 
+	inline DrawBuffer* s_ImmDrawBuffer = nullptr;
+	inline DrawBuffer* s_AftDrawBuffer = nullptr;
+
 	// ini cfg
 	inline D3DXVECTOR2* screen_resolution = nullptr;
 	inline int* D3DFogEnabled = nullptr;
@@ -160,6 +164,9 @@ namespace Game
 
 		screen_scale = Module::exe_ptr<D3DXVECTOR2>(0x340C94);
 
+		s_ImmDrawBuffer = Module::exe_ptr<DrawBuffer>(0x00464EF8);
+		s_AftDrawBuffer = Module::exe_ptr<DrawBuffer>(0x004612D8);
+
 		screen_resolution = Module::exe_ptr<D3DXVECTOR2>(0x340C8C);
 
 		D3DFogEnabled = Module::exe_ptr<int>(0x340C88);

src/hooks_drawdistance.cpp

@@ -484,47 +484,32 @@ class DrawDistanceIncrease : public Hook
 };
 DrawDistanceIncrease DrawDistanceIncrease::instance;
 
-// TODO: move this to game.h, should probably remove the resize function
-struct TDrawBuffer
-{
-	int NumBuffers_0;
-	int MaxBuffers_4;
-	int unk_8[1];
-	int MaxBuffers_C;
-	struct TDrawEntry** BufferPtrs_10;
-	struct TDrawEntry* Buffer_14;
-	void* UnkBuffer_18;
-
-	void resize(int new_size)
-	{
-		int bufferPtrsSize_Imm = new_size * 4;
-		int buffersSize_Imm = new_size * 0x3C;
-		int unkbuffersSize_Imm = new_size * 0x40;
-
-		MaxBuffers_4 = new_size;
-		MaxBuffers_C = new_size;
-
-		BufferPtrs_10 = (TDrawEntry**)malloc(bufferPtrsSize_Imm);
-		Buffer_14 = (TDrawEntry*)malloc(buffersSize_Imm);
-		UnkBuffer_18 = malloc(unkbuffersSize_Imm);
-	}
-};
-
 class DrawBufferExtension : public Hook
 {
 	inline static SafetyHookInline drawbufferinit_hook = {};
 	static void drawbufferinit_dest()
 	{
 		drawbufferinit_hook.call();
 
-		TDrawBuffer* s_ImmDrawBuffer = Module::exe_ptr<TDrawBuffer>(0x00464EF8);
-		TDrawBuffer* s_AftDrawBuffer = Module::exe_ptr<TDrawBuffer>(0x004612D8);
+		auto resize_buffer = [](DrawBuffer* buffer, int max_size)
+		{
+			int bufferPtrsSize_Imm = max_size * sizeof(DrawEntry*);
+			int buffersSize_Imm = max_size * sizeof(DrawEntry);
+			int unkbuffersSize_Imm = max_size * 0x40; // todo: what 0x40 byte struct is this?
+
+			buffer->MaxBuffers_4 = max_size;
+			buffer->MaxBuffers_C = max_size;
+
+			buffer->BufferPtrs_10 = (DrawEntry**)malloc(bufferPtrsSize_Imm);
+			buffer->Buffer_14 = (DrawEntry*)malloc(buffersSize_Imm);
+			buffer->UnkBuffer_18 = malloc(unkbuffersSize_Imm);
+		};
 
 		constexpr int s_ImmDrawBufferSizeVanilla = 0x100;
 		constexpr int s_AftDrawBufferSizeVanilla = 0x600;
 
-		s_ImmDrawBuffer->resize(s_ImmDrawBufferSizeVanilla * 0x10);
-		s_AftDrawBuffer->resize(s_AftDrawBufferSizeVanilla * 2);
+		resize_buffer(Game::s_ImmDrawBuffer, s_ImmDrawBufferSizeVanilla * 0x10);
+		resize_buffer(Game::s_AftDrawBuffer, s_AftDrawBufferSizeVanilla * 2);
 	}
 
 public: