Max/PDModdingCommunity_PD-Loader
1
0
Fork 0
Code Issues 5 Pull Requests 1 Actions Packages Projects Releases 5 Wiki Activity

pause: cleanup, remove an unused hook

Browse Source
This commit is contained in:
somewhatlurker
2019-10-21 13:46:34 +11:00
parent f7076adcb8
commit 39d2f18c3f
6 changed files with 37 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source-code/source/plugins/TLAC/Components/ComponentsManager.cpp
-8
View File
@@ -151,14 +151,6 @@ namespace TLAC::Components
} }
} }
void ComponentsManager::UpdatePostDraw()
{
for (auto& component : components)
{
component->UpdatePostDraw();
}
}
void ComponentsManager::OnFocusGain() void ComponentsManager::OnFocusGain()
{ {
for (auto& component : components) for (auto& component : components)
source-code/source/plugins/TLAC/Components/ComponentsManager.h
-1
View File
@@ -29,7 +29,6 @@ namespace TLAC::Components
void UpdateInput(); void UpdateInput();
void UpdatePostInput(); void UpdatePostInput();
void UpdateDrawSprites(); void UpdateDrawSprites();
void UpdatePostDraw();
void OnFocusGain(); void OnFocusGain();
void OnFocusLost(); void OnFocusLost();
void Dispose(); void Dispose();
source-code/source/plugins/TLAC/Components/EmulatorComponent.h
-1
View File
@@ -18,7 +18,6 @@ namespace TLAC::Components
virtual void UpdateInput() {}; virtual void UpdateInput() {};
virtual void UpdatePostInput() {}; virtual void UpdatePostInput() {};
virtual void UpdateDrawSprites() {}; virtual void UpdateDrawSprites() {};
virtual void UpdatePostDraw() {};
virtual void OnFocusGain() {}; virtual void OnFocusGain() {};
virtual void OnFocusLost() {}; virtual void OnFocusLost() {};
source-code/source/plugins/TLAC/Components/Pause.cpp
+27 -21
View File
@@ -2,7 +2,6 @@
#include "../Constants.h" #include "../Constants.h"
#include "GameState.h" #include "GameState.h"
#include "Drawing.h" #include "Drawing.h"
#include "Input/InputState.h"
#include "GL/glut.h" #include "GL/glut.h"
#include "detours.h" #include "detours.h"
#include <windows.h> #include <windows.h>
@@ -17,12 +16,14 @@ namespace TLAC::Components
bool Pause::showUI = true; bool Pause::showUI = true;
unsigned int Pause::menuPos = 0; unsigned int Pause::menuPos = 0;
unsigned int Pause::mainMenuPos = 0; unsigned int Pause::mainMenuPos = 0;
unsigned int Pause::menuSet = menuset_main; unsigned int Pause::menuSet = MENUSET_MAIN;
std::chrono::time_point<std::chrono::high_resolution_clock> Pause::menuItemSelectTime; std::chrono::time_point<std::chrono::high_resolution_clock> Pause::menuItemSelectTime;
std::vector<uint8_t> Pause::origAetMovOp; std::vector<uint8_t> Pause::origAetMovOp;
std::vector<uint8_t> Pause::origFramespeedOp; std::vector<uint8_t> Pause::origFramespeedOp;
std::vector<bool> Pause::streamPlayStates; std::vector<bool> Pause::streamPlayStates;
bool(*divaGiveUpFunc)(void*) = (bool(*)(void* cls))GIVEUP_FUNC_ADDRESS; bool(*divaGiveUpFunc)(void*) = (bool(*)(void* cls))GIVEUP_FUNC_ADDRESS;
InputState* Pause::inputState;
PlayerData* Pause::playerData;
Pause::Pause() Pause::Pause()
{ {
@@ -37,13 +38,21 @@ namespace TLAC::Components
return "pause"; return "pause";
} }
void Pause::Initialize(ComponentsManager*) void Pause::saveOldPatchOps()
{ {
origAetMovOp.resize(8); origAetMovOp.resize(8);
memcpy(&origAetMovOp[0], aetMovPatchAddress, 8); memcpy(&origAetMovOp[0], aetMovPatchAddress, 8);
origFramespeedOp.resize(4); origFramespeedOp.resize(4);
memcpy(&origFramespeedOp[0], framespeedPatchAddress, 4); memcpy(&origFramespeedOp[0], framespeedPatchAddress, 4);
}
void Pause::Initialize(ComponentsManager*)
{
inputState = (InputState*)(*(uint64_t*)INPUT_STATE_PTR_ADDRESS);
playerData = (PlayerData*)PLAYER_DATA_ADDRESS;
saveOldPatchOps();
DetourTransactionBegin(); DetourTransactionBegin();
DetourUpdateThread(GetCurrentThread()); DetourUpdateThread(GetCurrentThread());
@@ -65,6 +74,7 @@ namespace TLAC::Components
{ {
((void(*)())DSC_PAUSE_FUNC_ADDRESS)(); ((void(*)())DSC_PAUSE_FUNC_ADDRESS)();
saveOldPatchOps();
InjectCode(aetMovPatchAddress, { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 }); InjectCode(aetMovPatchAddress, { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 });
InjectCode(framespeedPatchAddress, { 0x0f, 0x57, 0xc0, 0xc3 }); // XORPS XMM0,XMM0; RET InjectCode(framespeedPatchAddress, { 0x0f, 0x57, 0xc0, 0xc3 }); // XORPS XMM0,XMM0; RET
@@ -83,7 +93,7 @@ namespace TLAC::Components
} }
menuPos = 0; menuPos = 0;
menuSet = menuset_main; menuSet = MENUSET_MAIN;
showUI = true; showUI = true;
menuItemSelectTime = std::chrono::high_resolution_clock::now(); menuItemSelectTime = std::chrono::high_resolution_clock::now();
isPaused = true; isPaused = true;
@@ -96,8 +106,6 @@ namespace TLAC::Components
} }
else else
{ {
InputState* inputState = (InputState*)(*(uint64_t*)INPUT_STATE_PTR_ADDRESS);
if (inputState->Tapped.Buttons & JVS_SQUARE) if (inputState->Tapped.Buttons & JVS_SQUARE)
showUI = !showUI; showUI = !showUI;
@@ -118,9 +126,9 @@ namespace TLAC::Components
if (inputState->Tapped.Buttons & JVS_TRIANGLE) if (inputState->Tapped.Buttons & JVS_TRIANGLE)
{ {
if (menuSet != menuset_main) if (menuSet != MENUSET_MAIN)
{ {
menuSet = menuset_main; menuSet = MENUSET_MAIN;
menuPos = mainMenuPos; menuPos = mainMenuPos;
menuItemSelectTime = std::chrono::high_resolution_clock::now(); menuItemSelectTime = std::chrono::high_resolution_clock::now();
} }
@@ -128,7 +136,7 @@ namespace TLAC::Components
menuPos %= menuItems[menuSet].size(); menuPos %= menuItems[menuSet].size();
if (menuSet == menuset_main) if (menuSet == MENUSET_MAIN)
mainMenuPos = menuPos; mainMenuPos = menuPos;
// use released when unpausing from X so it doesn't trigger input // use released when unpausing from X so it doesn't trigger input
@@ -139,14 +147,13 @@ namespace TLAC::Components
if (inputState->Released.Buttons & JVS_CIRCLE) if (inputState->Released.Buttons & JVS_CIRCLE)
menuItems[menuSet][menuPos].second(); menuItems[menuSet][menuPos].second();
if (menuSet == menuset_sevol) if (menuSet == MENUSET_SEVOL)
{ {
PlayerData* playerdata = (PlayerData*)PLAYER_DATA_ADDRESS;
const char volformat[] = "%d"; const char volformat[] = "%d";
size_t size = snprintf(nullptr, 0, volformat, playerdata->act_vol) + 1; size_t size = snprintf(nullptr, 0, volformat, playerData->act_vol) + 1;
char* buf = new char[size]; char* buf = new char[size];
snprintf(buf, size, volformat, playerdata->act_vol); snprintf(buf, size, volformat, playerData->act_vol);
menuItems[menuset_sevol][1].first = buf; menuItems[MENUSET_SEVOL][1].first = buf;
delete[] buf; delete[] buf;
} }
} }
@@ -300,7 +307,7 @@ namespace TLAC::Components
dtParams.yCurrent = dtParams.yBegin; dtParams.yCurrent = dtParams.yBegin;
dtParams.colour = 0xffffffff; dtParams.colour = 0xffffffff;
drawTextW(&dtParams, (drawTextFlags)(DRAWTEXT_ENABLE_LAYOUT), L"L/R:Move　"); drawTextW(&dtParams, (drawTextFlags)(DRAWTEXT_ENABLE_LAYOUT), L"L/R:Move　");
if (menuSet != menuset_main) if (menuSet != MENUSET_MAIN)
{ {
dtParams.colour = 0xff40ff40; dtParams.colour = 0xff40ff40;
drawTextW(&dtParams, (drawTextFlags)(DRAWTEXT_ENABLE_LAYOUT), L"△"); drawTextW(&dtParams, (drawTextFlags)(DRAWTEXT_ENABLE_LAYOUT), L"△");
@@ -324,7 +331,7 @@ namespace TLAC::Components
bool Pause::isPauseKeyTapped() bool Pause::isPauseKeyTapped()
{ {
return ((InputState*)(*(uint64_t*)INPUT_STATE_PTR_ADDRESS))->Tapped.Buttons & JVS_START; return inputState->Tapped.Buttons & JVS_START;
} }
bool Pause::hookedGiveUpFunc(void* cls) bool Pause::hookedGiveUpFunc(void* cls)
@@ -348,11 +355,10 @@ namespace TLAC::Components
void Pause::setSEVolume(int amount) void Pause::setSEVolume(int amount)
{ {
PlayerData* playerdata = (PlayerData*)PLAYER_DATA_ADDRESS; playerData->act_vol += amount;
playerdata->act_vol += amount; if (playerData->act_vol < 0) playerData->act_vol = 0;
if (playerdata->act_vol < 0) playerdata->act_vol = 0; if (playerData->act_vol > 100) playerData->act_vol = 100;
if (playerdata->act_vol > 100) playerdata->act_vol = 100; playerData->act_slide_vol = playerData->act_vol;
playerdata->act_slide_vol = playerdata->act_vol;
} }
void Pause::InjectCode(void* address, const std::vector<uint8_t> data) void Pause::InjectCode(void* address, const std::vector<uint8_t> data)
source-code/source/plugins/TLAC/Components/Pause.h
+10 -4
View File
@@ -2,6 +2,7 @@
#include "../Constants.h" #include "../Constants.h"
#include "EmulatorComponent.h" #include "EmulatorComponent.h"
#include "PlayerData.h" #include "PlayerData.h"
#include "Input/InputState.h"
#include <string> #include <string>
#include <vector> #include <vector>
#include <chrono> #include <chrono>
@@ -31,6 +32,8 @@ namespace TLAC::Components
static bool isPaused; // tracks internal state static bool isPaused; // tracks internal state
static void saveOldPatchOps();
static std::vector<uint8_t> origAetMovOp; static std::vector<uint8_t> origAetMovOp;
static constexpr uint8_t* aetMovPatchAddress = (uint8_t*)0x1401703b3; static constexpr uint8_t* aetMovPatchAddress = (uint8_t*)0x1401703b3;
@@ -41,6 +44,9 @@ namespace TLAC::Components
static void setSEVolume(int amount); static void setSEVolume(int amount);
static PlayerData* playerData;
static InputState* inputState;
static const int menuX = 640; static const int menuX = 640;
static const int menuY = 360; static const int menuY = 360;
static const int menuItemHeight = 36; static const int menuItemHeight = 36;
@@ -55,15 +61,15 @@ namespace TLAC::Components
enum menusets enum menusets
{ {
menuset_main = 0, MENUSET_MAIN = 0,
menuset_sevol = 1, MENUSET_SEVOL = 1,
}; };
static void mainmenu() { menuSet = menuset_main; menuPos = mainMenuPos; menuItemSelectTime = std::chrono::high_resolution_clock::now(); }; static void mainmenu() { menuSet = MENUSET_MAIN; menuPos = mainMenuPos; menuItemSelectTime = std::chrono::high_resolution_clock::now(); };
static void unpause() { pause = false; }; static void unpause() { pause = false; };
static void giveup() { giveUp = true; }; static void giveup() { giveUp = true; };
static void sevolmenu() { menuSet = menuset_sevol; menuPos = 1; menuItemSelectTime = std::chrono::high_resolution_clock::now(); }; static void sevolmenu() { menuSet = MENUSET_SEVOL; menuPos = 1; menuItemSelectTime = std::chrono::high_resolution_clock::now(); };
static void sevolplus() { setSEVolume(10); }; static void sevolplus() { setSEVolume(10); };
static void sevolminus() { setSEVolume(-10); }; static void sevolminus() { setSEVolume(-10); };
source-code/source/plugins/TLAC/dllmain.cpp
-17
View File
@@ -20,7 +20,6 @@
void(__cdecl* divaEngineUpdate)() = (void(__cdecl*)())0x14018CC40; void(__cdecl* divaEngineUpdate)() = (void(__cdecl*)())0x14018CC40;
void(__cdecl* divaEngineDrawSprites)(void* addr, int idk) = (void(__cdecl*)(void* addr, int idk))ENGINE_DRAW_SPRITES_ADDRESS; void(__cdecl* divaEngineDrawSprites)(void* addr, int idk) = (void(__cdecl*)(void* addr, int idk))ENGINE_DRAW_SPRITES_ADDRESS;
void(__cdecl* divaEngineFinishDraw)() = (void(__cdecl*)())ENGINE_FINISH_DRAW_ADDRESS;
LRESULT CALLBACK MessageWindowProcessCallback(HWND, UINT, WPARAM, LPARAM); LRESULT CALLBACK MessageWindowProcessCallback(HWND, UINT, WPARAM, LPARAM);
DWORD WINAPI WindowMessageDispatcher(LPVOID); DWORD WINAPI WindowMessageDispatcher(LPVOID);
@@ -133,11 +132,6 @@ namespace TLAC
ComponentsManager.UpdateDrawSprites(); ComponentsManager.UpdateDrawSprites();
} }
void UpdatePostDraw()
{
ComponentsManager.UpdatePostDraw();
}
void InitializeExtraSettings() void InitializeExtraSettings()
{ {
const LPCTSTR RESOLUTION_CONFIG_FILE_NAME = _T(".\\config.ini"); const LPCTSTR RESOLUTION_CONFIG_FILE_NAME = _T(".\\config.ini");
@@ -361,12 +355,6 @@ void hookedEngineDrawSprites(void* addr, int idk)
TLAC::UpdateDrawSprites(); TLAC::UpdateDrawSprites();
} }
void hookedEngineFinishDraw()
{
TLAC::UpdatePostDraw();
divaEngineFinishDraw();
}
BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
{ {
HWND consoleHandle = GetConsoleWindow(); HWND consoleHandle = GetConsoleWindow();
@@ -393,11 +381,6 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReser
DetourAttach(&(PVOID&)divaEngineDrawSprites, hookedEngineDrawSprites); DetourAttach(&(PVOID&)divaEngineDrawSprites, hookedEngineDrawSprites);
DetourTransactionCommit(); DetourTransactionCommit();
DetourTransactionBegin();
DetourUpdateThread(GetCurrentThread());
DetourAttach(&(PVOID&)divaEngineFinishDraw, hookedEngineFinishDraw);
DetourTransactionCommit();
TLAC::InitializeExtraSettings(); TLAC::InitializeExtraSettings();
TLAC::framework::Module = hModule; TLAC::framework::Module = hModule;