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

pause: add slider input filtering

Browse Source
This commit is contained in:
somewhatlurker
2019-10-23 07:32:19 +11:00
parent e6ad288288
commit 586db86f43
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source-code/source/plugins/TLAC/Components/Pause.cpp
+10 -7
View File
@@ -24,8 +24,9 @@ namespace TLAC::Components
uint8_t* Pause::framespeedPatchAddress = (uint8_t*)0x140192D50; uint8_t* Pause::framespeedPatchAddress = (uint8_t*)0x140192D50;
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; PlayerData* Pause::playerData;
InputState* Pause::inputState;
TouchSliderState* Pause::sliderState;
JvsButtons Pause::filteredButtons; JvsButtons Pause::filteredButtons;
std::vector<Pause::menuSet> Pause::menu = { std::vector<Pause::menuSet> Pause::menu = {
{ {
@@ -73,6 +74,7 @@ namespace TLAC::Components
{ {
inputState = (InputState*)(*(uint64_t*)INPUT_STATE_PTR_ADDRESS); inputState = (InputState*)(*(uint64_t*)INPUT_STATE_PTR_ADDRESS);
playerData = (PlayerData*)PLAYER_DATA_ADDRESS; playerData = (PlayerData*)PLAYER_DATA_ADDRESS;
sliderState = (TouchSliderState*)SLIDER_CTRL_TASK_ADDRESS;
saveOldPatchOps(); saveOldPatchOps();
@@ -101,7 +103,7 @@ namespace TLAC::Components
InjectCode(framespeedPatchAddress, { 0x0f, 0x57, 0xc0, 0xc3 }); // XORPS XMM0,XMM0; RET InjectCode(framespeedPatchAddress, { 0x0f, 0x57, 0xc0, 0xc3 }); // XORPS XMM0,XMM0; RET
uint64_t audioMixerAddr = *(uint64_t*)(AUDIO_MAIN_CLASS_ADDRESS + 0x70); uint64_t audioMixerAddr = *(uint64_t*)(AUDIO_MAIN_CLASS_ADDRESS + 0x70);
uint64_t audioStreamsAddress = *(uint64_t*)(audioMixerAddr + 0x18);; uint64_t audioStreamsAddress = *(uint64_t*)(audioMixerAddr + 0x18);
int nAudioStreams = *(uint64_t*)(audioMixerAddr + 0x20); int nAudioStreams = *(uint64_t*)(audioMixerAddr + 0x20);
for (int i = 0; i < nAudioStreams; i++) for (int i = 0; i < nAudioStreams; i++)
{ {
@@ -180,6 +182,11 @@ namespace TLAC::Components
} }
} }
} }
// no slider while paused
// this is simpler than buttons because slider doesn't trigger on press, it triggers on movement
// (therefore per-button blocking isn't needed)
sliderState->ResetSensors();
} }
else else
{ {
@@ -222,14 +229,12 @@ namespace TLAC::Components
} }
} }
// swallow filtered button inputs // swallow filtered button inputs
inputState->Tapped.Buttons = (JvsButtons)(inputState->Tapped.Buttons & ~filteredButtons); inputState->Tapped.Buttons = (JvsButtons)(inputState->Tapped.Buttons & ~filteredButtons);
inputState->DoubleTapped.Buttons = (JvsButtons)(inputState->DoubleTapped.Buttons & ~filteredButtons); inputState->DoubleTapped.Buttons = (JvsButtons)(inputState->DoubleTapped.Buttons & ~filteredButtons);
inputState->Down.Buttons = (JvsButtons)(inputState->Down.Buttons & ~filteredButtons); inputState->Down.Buttons = (JvsButtons)(inputState->Down.Buttons & ~filteredButtons);
inputState->Released.Buttons = (JvsButtons)(inputState->Released.Buttons & ~filteredButtons); inputState->Released.Buttons = (JvsButtons)(inputState->Released.Buttons & ~filteredButtons);
inputState->IntervalTapped.Buttons = (JvsButtons)(inputState->IntervalTapped.Buttons & ~filteredButtons); inputState->IntervalTapped.Buttons = (JvsButtons)(inputState->IntervalTapped.Buttons & ~filteredButtons);
// todo: slider
} }
void Pause::UpdateDraw2D() void Pause::UpdateDraw2D()
@@ -297,8 +302,6 @@ namespace TLAC::Components
for (int i = 0; i < menu[curMenuSet].items.size(); i++) for (int i = 0; i < menu[curMenuSet].items.size(); i++)
{ {
menuItem &item = menu[curMenuSet].items[i];
if (i == curMenuPos) if (i == curMenuPos)
{ {
uint8_t alpha = (cosf(getMenuAnimPos() * 6.283185f) * 0.15 + 0.85) * 255; uint8_t alpha = (cosf(getMenuAnimPos() * 6.283185f) * 0.15 + 0.85) * 255;
@@ -310,7 +313,7 @@ namespace TLAC::Components
} }
dtParams.currentLoc = dtParams.originLoc; dtParams.currentLoc = dtParams.originLoc;
drawText(&dtParams, (drawTextFlags)(DRAWTEXT_ALIGN_CENTRE), item.name); drawText(&dtParams, (drawTextFlags)(DRAWTEXT_ALIGN_CENTRE), menu[curMenuSet].items[i].name);
dtParams.originLoc.y += menuItemHeight; dtParams.originLoc.y += menuItemHeight;
} }
source-code/source/plugins/TLAC/Components/Pause.h
+2
View File
@@ -3,6 +3,7 @@
#include "EmulatorComponent.h" #include "EmulatorComponent.h"
#include "PlayerData.h" #include "PlayerData.h"
#include "Input/InputState.h" #include "Input/InputState.h"
#include "Input/TouchSliderState.h"
#include <string> #include <string>
#include <vector> #include <vector>
#include <chrono> #include <chrono>
@@ -46,6 +47,7 @@ namespace TLAC::Components
static PlayerData* playerData; static PlayerData* playerData;
static InputState* inputState; static InputState* inputState;
static TouchSliderState* sliderState;
static const JvsButtons allButtons = (JvsButtons)(JVS_START | JVS_TRIANGLE | JVS_SQUARE | JVS_CROSS | JVS_CIRCLE | JVS_L | JVS_R); // deliberately only has control panel buttons static const JvsButtons allButtons = (JvsButtons)(JVS_START | JVS_TRIANGLE | JVS_SQUARE | JVS_CROSS | JVS_CIRCLE | JVS_L | JVS_R); // deliberately only has control panel buttons
static JvsButtons filteredButtons; static JvsButtons filteredButtons;