add getbgm button, move all culling patches to one checkbox, expand fov and zoom slider range

Author: Lapig

PigPSO2Cam/PSO2CameraTool.cpp

@@ -7,7 +7,8 @@
 #include "Asm.h"
 #include "imgui/settings_form.h"
 
-using namespace Asm;
+
+
 
 bool m_bCreated = false;
 bool wndproc_found = false;
@@ -65,6 +66,8 @@ uintptr_t getCameraNearCullAddy()
 }
 HRESULT __stdcall hkEndScene(LPDIRECT3DDEVICE9 Device)
 {
+	using namespace Asm;
+
 	if (Device == nullptr)
 		return oEndScene(Device);
 	if (!m_bCreated)
@@ -78,6 +81,7 @@ HRESULT __stdcall hkEndScene(LPDIRECT3DDEVICE9 Device)
 
 		game_hwnd = d3dcp.hFocusWindow;
 
+
 		DWORD farCullScan = AobScan(cameraFarCullAob);
 		if (farCullScan)
 			cameraFarCullJna = farCullScan;
@@ -90,7 +94,6 @@ HRESULT __stdcall hkEndScene(LPDIRECT3DDEVICE9 Device)
 		if (nearCullScan)
 			cameraNearCullAddy = nearCullScan;
 
-		//menu_init(d3dhwnd, Device);
 	}
 	if (!wndproc_found) {
 		HWND wnd = FindWindowA("Phantasy Star Online 2", NULL);
@@ -102,7 +105,7 @@ HRESULT __stdcall hkEndScene(LPDIRECT3DDEVICE9 Device)
 		}
 	}
 
-	if ((GetAsyncKeyState(0x2D) & 1)) { //insert
+	if ((GetAsyncKeyState(VK_INSERT) & 1)) { 
 		MENU_DISPLAYING = !MENU_DISPLAYING;
 	}
 	if (MENU_DISPLAYING )
@@ -148,7 +151,6 @@ bool CreateDeviceD3D(HWND hWnd)
 	g_d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD;
 	g_d3dpp.BackBufferFormat = D3DFMT_UNKNOWN;
 	g_d3dpp.hDeviceWindow = tmpWnd;
-	//g_d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_ONE;           // Present with vsync
 	g_d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;   // Present without vsync, maximum unthrottled framerate
 	if (g_pD3D->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hWnd, D3DCREATE_HARDWARE_VERTEXPROCESSING, &g_d3dpp, &g_pd3dDevice) < 0)
 		return false;
@@ -180,23 +182,6 @@ DWORD WINAPI HookThread()
 	return 0;
 }
 
-BOOL CALLBACK find_game_hwnd(HWND hwnd, LPARAM game_pid) {
-	DWORD hwnd_pid = NULL;
-	GetWindowThreadProcessId(hwnd, &hwnd_pid);
-	if (hwnd_pid != game_pid)
-		return TRUE;
-	game_hwnd = hwnd;
-	return FALSE;
-}
-void ShowDebugConsole()
-{
-	AllocConsole();
-	AttachConsole(GetCurrentProcessId());
-
-	char charConsoleName[128];
-	sprintf_s(charConsoleName, "PSO2DEBUG | PID: %08X (%d)", GetCurrentProcessId(), GetCurrentProcessId());
-	SetConsoleTitleA(charConsoleName);
-}
 int Initialize() {
 	/*while (hmRendDx9Base == NULL)
 	{

PigPSO2Cam/imgui/settings_form.cpp

@@ -20,11 +20,6 @@ void luaPrint(std::string s) {
 
 	runLuaAsync(dist.c_str());
 }
-/*
-void resetParam() {
-	const char *a1 = "ResetParam()";
-	runLuaAsync(a1);
-}*/
 
 bool runLuaAsync(std::string a1) {
 	if (initLuaHook()) {
@@ -47,11 +42,9 @@ bool initLuaHook() {
 		return true;
 	HMODULE pso2h = GetModuleHandleA("pso2h.dll");
 	if (!pso2h) {
-//		Log("Failed to load pso2h.dll");
 		return false;
 	}
 	_executeLua = (pso2hDoLua)GetProcAddress(pso2h, MAKEINTRESOURCEA(8));	//pso2hDoLua ordinal 
-	
 
 	if (_executeLua) {
 		return true;
@@ -66,11 +59,9 @@ void menu_init(void *game_hwnd, LPDIRECT3DDEVICE9 Device)
 	ImGui_ImplWin32_Init(game_hwnd);
 	ImGui_ImplDX9_Init(Device);
 	ImGuiIO &io = ImGui::GetIO();
-//	io.WantCaptureKeyboard = true;
 	io.WantCaptureMouse = true;
 	io.Fonts->AddFontDefault();
 	io.IniFilename = NULL;
-	//io.DisplaySize = ImVec2(vp.Height, vp.Width);
 	hwnd = game_hwnd;
 	ImGuiStyle& style = ImGui::GetStyle();
 	style.Alpha = 1.0;

PigPSO2Cam/imgui/settings_form.h

@@ -10,7 +10,6 @@
 
 #include "../PSO2CameraTool.hpp"
 
-
 typedef HRESULT(__stdcall* pso2hDoLua)(const char* a1);
 static pso2hDoLua _executeLua = 0;
 
@@ -76,13 +75,13 @@ static void draw_menu(bool* status)
 	ImGui::GetIO().MouseDrawCursor = true;
 
 	ImGui::SetNextWindowPos(ImVec2(ImGui::GetWindowSize().x / 2, ImGui::GetWindowSize().y / 2), ImGuiCond_Appearing);
-	ImGui::SetNextWindowSize(ImVec2(480.0f, 245.f), ImGuiCond_Appearing);
+	ImGui::SetNextWindowSize(ImVec2(480.0f, 200.f), ImGuiCond_Appearing);
 
 	ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoScrollbar;
 
 	ImGui::Begin("PIG PSO2", status, window_flags);
 
-
+	
 	switch (currTab) {
 	case 0:
 	{
@@ -93,10 +92,10 @@ static void draw_menu(bool* status)
 
 			ImGui::Text(("Zoom "));
 			ImGui::SameLine(50.0, ImGui::GetStyle().ItemSpacing.y);
-			ImGui::SliderInt(("##zoomslider"), &Camera::cameraBase.Offset.Dist, 6, 14);
+			ImGui::SliderInt(("##zoomslider"), &Camera::cameraBase.Offset.Dist, 6, 25);
 			ImGui::Text(("Fovy "));
 			ImGui::SameLine(50.0, ImGui::GetStyle().ItemSpacing.y);
-			ImGui::SliderInt(("##fovslider"), &Camera::cameraBase.Fovy, 40, 58);
+			ImGui::SliderInt(("##fovslider"), &Camera::cameraBase.Fovy, 40, 90);
 
 			ImGui::NextColumn();
 			if (ImGui::Button("Set Zoom", ImVec2(ImGui::GetContentRegionAvail().x, 0))) {
@@ -111,11 +110,7 @@ static void draw_menu(bool* status)
 			ImGui::Separator();
 
 			ImGui::Columns(2);
-			ImGui::Text("Disable Terrain Far Culling ");
-			ImGui::Spacing();//meme alignment
-			ImGui::Text("Disable Object Far Culling ");
-			ImGui::Spacing();
-			ImGui::Text("Disable Object Near Culling ");
+			ImGui::Text("Culling Patches");
 			ImGui::Spacing();
 			ImGui::Spacing();
 
@@ -124,7 +119,7 @@ static void draw_menu(bool* status)
 			ImGui::InputText("##BGM", bgmbuf, sizeof(bgmbuf));
 
 			ImGui::NextColumn();
-			if (ImGui::Checkbox("##farcullcheck", &farCullDisabled))
+			if (ImGui::Checkbox("##cullcheck", &farCullDisabled))
 			{
 				BYTE b = 0x76; //original conditional jmp byte
 				if (farCullDisabled)
@@ -133,39 +128,37 @@ static void draw_menu(bool* status)
 				uintptr_t tFarCull = getTerrainFarCullAddy();
 				if (tFarCull)
 					*(BYTE*)(tFarCull) = b;
-			}
-			
-			if (ImGui::Checkbox("##farcullcheckobjects", &farCullObjectsDisabled))
-			{
-				uintptr_t tFarCull = getObjectFarCullAddy();
-				if (tFarCull)
+
+				//if (ImGui::Checkbox("##farcullcheckobjects", &farCullObjectsDisabled))
+
+				uintptr_t tFarCullObj = getObjectFarCullAddy();
+				if (tFarCullObj)
 				{
-					BYTE b = 0x0F; 
-					if (farCullObjectsDisabled) 
+					BYTE c = 0x0F;
+					if (farCullDisabled)
 					{
-						b = 0xE9;	
+						c = 0xE9;
 
-						*(BYTE*)(tFarCull) = 0x90;
-						*(BYTE*)(tFarCull+1) = b;
+						*(BYTE*)(tFarCullObj) = 0x90;
+						*(BYTE*)(tFarCullObj + 1) = c;
 					}
 					else
 					{
-						*(BYTE*)(tFarCull) = b;
-						*(BYTE*)(tFarCull + 1) = 0x84;
+						*(BYTE*)(tFarCullObj) = b;
+						*(BYTE*)(tFarCullObj + 1) = 0x84;
 					}
 				}
-			}
 
-			if (ImGui::Checkbox("##nearcullcheck", &nearCullDisabled))
-			{
+				//if (ImGui::Checkbox("##nearcullcheck", &nearCullDisabled))
+
 				uintptr_t tNearCull = getCameraNearCullAddy();
 				if (tNearCull) {
-					
+
 					if (oNearCullBytes == 0x0)
 						oNearCullBytes = *(DWORD*)(tNearCull);
 
 					//meme
-					if (nearCullDisabled)
+					if (farCullDisabled)
 						*(DWORD*)(tNearCull) = (DWORD)(0x90909090);
 					else
 						*(DWORD*)(tNearCull) = (DWORD)(oNearCullBytes);
@@ -176,6 +169,11 @@ static void draw_menu(bool* status)
 				std::string s("Skit.Sound.BGM.Play('"+std::string(bgmbuf)+"')");
 				runLuaAsync(s);
 			}
+			ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 5);
+			if (ImGui::Button("Get BGM", ImVec2(ImGui::GetContentRegionAvail().x, 0))) {
+				std::string s("Window.ShowError(Skit.Sound.BGM.Get('" + std::string(bgmbuf) + "'))");
+				runLuaAsync(s);
+			}
 			ImGui::EndColumns();
 
 
@@ -187,7 +185,7 @@ static void draw_menu(bool* status)
 
 	std::string pig("pig");
 	ImVec2 txt = ImGui::CalcTextSize(pig.c_str());
-	ImGui::SetCursorPosY(ImGui::GetWindowSize().y * .90f);
+	ImGui::SetCursorPosY(ImGui::GetWindowSize().y * .87f);
 	//ImGui::SetCursorPosY(ImGui::GetContentRegionAvail().y * 0.94f);
 	ImGui::Separator();