Archive/Play-
0
0
Fork 0
mirror of https://github.com/jpd002/Play-.git synced 2025-04-28 13:47:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renamed GunListener to ScreenPositionListener

Browse source
This commit is contained in:
LapisRegia 2024-02-17 17:34:45 +08:00
parent 0d1a080394
commit 669cd24960
19 changed files with 63 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/CMakeLists.txt
View file

@ -249,7 +249,7 @@ set(COMMON_SRC_FILES
FrameDump.h
FrameLimiter.cpp
FrameLimiter.h
GunListener.h
ScreenPositionListener.h
InputConfig.cpp
InputConfig.h
GenericMipsExecutor.h

9
Source/GunListener.h
View file

@ -1,9 +0,0 @@
#pragma once
class CGunListener
{
public:
virtual ~CGunListener() = default;
virtual void SetGunPosition(float, float) = 0;
virtual void ReleaseTouchPosition() = 0;
};

12
Source/PS2VM.cpp
View file

@ -136,7 +136,7 @@ bool CPS2VM::HasGunListener() const
return m_gunListener != nullptr;
}
void CPS2VM::SetGunListener(CGunListener* listener)
void CPS2VM::SetGunListener(CScreenPositionListener* listener)
{
m_gunListener = listener;
}
@ -145,7 +145,7 @@ void CPS2VM::ReportGunPosition(float x, float y)
{
if(m_gunListener)
{
m_gunListener->SetGunPosition(x, y);
m_gunListener->SetScreenPosition(x, y);
}
}
@ -154,7 +154,7 @@ bool CPS2VM::HasTouchListener() const
return m_touchListener != nullptr;
}
void CPS2VM::SetTouchListener(CGunListener* listener)
void CPS2VM::SetTouchListener(CScreenPositionListener* listener)
{
m_touchListener = listener;
}
@ -163,15 +163,15 @@ void CPS2VM::ReportTouchPosition(float x, float y)
{
if(m_touchListener)
{
m_touchListener->SetGunPosition(x, y);
m_touchListener->SetScreenPosition(x, y);
}
}
void CPS2VM::ReleaseTouchPosition()
void CPS2VM::ReleaseScreenPosition()
{
if(m_touchListener)
{
m_touchListener->ReleaseTouchPosition();
m_touchListener->ReleaseScreenPosition();
}
}

12
Source/PS2VM.h
View file

@ -7,7 +7,7 @@
#include "MIPS.h"
#include "MailBox.h"
#include "PadHandler.h"
#include "GunListener.h"
#include "ScreenPositionListener.h"
#include "OpticalMedia.h"
#include "VirtualMachine.h"
#include "ee/Ee_SubSystem.h"
@ -87,12 +87,12 @@ public:
void ReportGunPosition(float, float);
bool HasGunListener() const;
void SetGunListener(CGunListener*);
void SetGunListener(CScreenPositionListener*);
void ReportTouchPosition(float, float);
bool HasTouchListener() const;
void SetTouchListener(CGunListener*);
void ReleaseTouchPosition();
void SetTouchListener(CScreenPositionListener*);
void ReleaseScreenPosition();
OpticalMediaPtr m_cdrom0;
CPadHandler* m_pad = nullptr;
@ -193,8 +193,8 @@ private:
int m_spuBlockCount = 0;
CSoundHandler* m_soundHandler = nullptr;
CGunListener* m_gunListener = nullptr;
CGunListener* m_touchListener = nullptr;
CScreenPositionListener* m_gunListener = nullptr;
CScreenPositionListener* m_touchListener = nullptr;
CProfiler::ZoneHandle m_eeProfilerZone = 0;
CProfiler::ZoneHandle m_iopProfilerZone = 0;

9
Source/ScreenPositionListener.h Normal file
View file

@ -0,0 +1,9 @@
#pragma once
class CScreenPositionListener
{
public:
virtual ~CScreenPositionListener() = default;
virtual void SetScreenPosition(float, float) = 0;
virtual void ReleaseScreenPosition() = 0;
};

32
Source/iop/namco_sys246/Iop_NamcoSys246.cpp
View file

@ -403,10 +403,10 @@ void CSys246::ProcessJvsPacket(const uint8* input, uint8* output)
if(m_jvsMode == JVS_MODE::LIGHTGUN)
{
assert(channel == 2);
(*output++) = static_cast<uint8>(m_jvsGunPosX >> 8); //Pos X MSB
(*output++) = static_cast<uint8>(m_jvsGunPosX); //Pos X LSB
(*output++) = static_cast<uint8>(m_jvsGunPosY >> 8); //Pos Y MSB
(*output++) = static_cast<uint8>(m_jvsGunPosY); //Pos Y LSB
(*output++) = static_cast<uint8>(m_jvsScreenPosX >> 8); //Pos X MSB
(*output++) = static_cast<uint8>(m_jvsScreenPosX); //Pos X LSB
(*output++) = static_cast<uint8>(m_jvsScreenPosY >> 8); //Pos Y MSB
(*output++) = static_cast<uint8>(m_jvsScreenPosY); //Pos Y LSB
}
else if(m_jvsMode == JVS_MODE::DRUM)
{
@ -443,10 +443,10 @@ void CSys246::ProcessJvsPacket(const uint8* input, uint8* output)
(*output++) = 0x01; //Command success
(*output++) = static_cast<uint8>(m_jvsGunPosX >> 8); //Pos X MSB
(*output++) = static_cast<uint8>(m_jvsGunPosX); //Pos X LSB
(*output++) = static_cast<uint8>(m_jvsGunPosY >> 8); //Pos Y MSB
(*output++) = static_cast<uint8>(m_jvsGunPosY); //Pos Y LSB
(*output++) = static_cast<uint8>(m_jvsScreenPosX >> 8); //Pos X MSB
(*output++) = static_cast<uint8>(m_jvsScreenPosX); //Pos X LSB
(*output++) = static_cast<uint8>(m_jvsScreenPosY >> 8); //Pos Y MSB
(*output++) = static_cast<uint8>(m_jvsScreenPosY); //Pos Y LSB
(*dstSize) += 5;
}
@ -486,9 +486,9 @@ void CSys246::SetButton(unsigned int buttonIndex, PS2::CControllerInfo::BUTTON b
m_jvsButtonBits[buttonValue] = (1 << buttonIndex);
}
void CSys246::SetLightGunXform(const std::array<float, 4>& lightGunXform)
void CSys246::SetScreenPosXform(const std::array<float, 4>& screenPosXform)
{
m_lightGunXform = lightGunXform;
m_screenPosXform = screenPosXform;
}
void CSys246::SetButtonState(unsigned int padNumber, PS2::CControllerInfo::BUTTON button, bool pressed, uint8* ram)
@ -606,16 +606,16 @@ void CSys246::SetAxisState(unsigned int padNumber, PS2::CControllerInfo::BUTTON
}
}
void CSys246::SetGunPosition(float x, float y)
void CSys246::SetScreenPosition(float x, float y)
{
m_jvsGunPosX = static_cast<int16>((x * m_lightGunXform[0]) + m_lightGunXform[1]);
m_jvsGunPosY = static_cast<int16>((y * m_lightGunXform[2]) + m_lightGunXform[3]);
m_jvsScreenPosX = static_cast<int16>((x * m_screenPosXform[0]) + m_screenPosXform[1]);
m_jvsScreenPosY = static_cast<int16>((y * m_screenPosXform[2]) + m_screenPosXform[3]);
}
void CSys246::ReleaseTouchPosition()
void CSys246::ReleaseScreenPosition()
{
m_jvsGunPosX = 0xFFFF;
m_jvsGunPosY = 0xFFFF; //Y position is negligible
m_jvsScreenPosX = 0xFFFF;
m_jvsScreenPosY = 0xFFFF; //Y position is negligible
}
bool CSys246::Invoke001(uint32 method, uint32* args, uint32 argsSize, uint32* ret, uint32 retSize, uint8* ram)

18
Source/iop/namco_sys246/Iop_NamcoSys246.h
View file

@ -5,7 +5,7 @@
#include "../Iop_SifMan.h"
#include "../../SifModuleAdapter.h"
#include "../../PadInterface.h"
#include "../../GunListener.h"
#include "../../ScreenPositionListener.h"
#include "filesystem_def.h"
namespace Iop
@ -16,7 +16,7 @@ namespace Iop
{
class CAcRam;
class CSys246 : public CModule, public CPadInterface, public CGunListener
class CSys246 : public CModule, public CPadInterface, public CScreenPositionListener
{
public:
enum class JVS_MODE
@ -40,16 +40,16 @@ namespace Iop
void SetJvsMode(JVS_MODE);
void SetButton(unsigned int, PS2::CControllerInfo::BUTTON);
void SetLightGunXform(const std::array<float, 4>&);
void SetScreenPosXform(const std::array<float, 4>&);
//CPadInterface
void SetButtonState(unsigned int, PS2::CControllerInfo::BUTTON, bool, uint8*) override;
void SetAxisState(unsigned int, PS2::CControllerInfo::BUTTON, uint8, uint8*) override;
void GetVibration(unsigned int, uint8& largeMotor, uint8& smallMotor) override{};
//CGunListener
void SetGunPosition(float, float) override;
void ReleaseTouchPosition() override;
//CScreenPositionListener
void SetScreenPosition(float, float) override;
void ReleaseScreenPosition() override;
private:
enum MODULE_ID
@ -119,13 +119,13 @@ namespace Iop
uint32 m_sendAddr = 0;
JVS_MODE m_jvsMode = JVS_MODE::DEFAULT;
std::array<float, 4> m_lightGunXform = {65535, 0, 65535, 0};
std::array<float, 4> m_screenPosXform = {65535, 0, 65535, 0};
std::array<uint16, PS2::CControllerInfo::MAX_BUTTONS> m_jvsButtonBits = {};
uint16 m_jvsButtonState[JVS_PLAYER_COUNT] = {};
uint16 m_jvsSystemButtonState = 0;
uint16 m_jvsGunPosX = 0x7FFF;
uint16 m_jvsGunPosY = 0x7FFF;
uint16 m_jvsScreenPosX = 0x7FFF;
uint16 m_jvsScreenPosY = 0x7FFF;
uint16 m_jvsDrumChannels[JVS_DRUM_CHANNEL_MAX] = {};
uint16 m_jvsWheelChannels[JVS_WHEEL_CHANNEL_MAX] = {};
uint16 m_jvsWheel = 0x0;

2
Source/ui_qt/mainwindow.cpp
View file

@ -892,7 +892,7 @@ void MainWindow::outputWindow_mouseReleaseEvent(QMouseEvent* ev)
m_qtMouseInputProvider->OnMouseRelease(ev->button());
if(m_virtualMachine->HasTouchListener())
{
m_virtualMachine->ReleaseTouchPosition();
m_virtualMachine->ReleaseScreenPosition();
}
}

2
Source/ui_shared/ArcadeDefinition.h
View file

@ -40,7 +40,7 @@ struct ARCADE_MACHINE_DEF
std::string nandFileName;
std::map<unsigned int, PS2::CControllerInfo::BUTTON> buttons;
INPUT_MODE inputMode = INPUT_MODE::DEFAULT;
std::array<float, 4> lightGunXform = {65535, 0, 65535, 0};
std::array<float, 4> screenPosXform = {65535, 0, 65535, 0};
uint32 eeFreqScaleNumerator = 1;
uint32 eeFreqScaleDenominator = 1;
std::string boot;

8
Source/ui_shared/ArcadeUtils.cpp
View file

@ -166,14 +166,14 @@ ARCADE_MACHINE_DEF ReadArcadeMachineDefinition(const fs::path& arcadeDefPath)
std::string inputModeString = defJson["inputMode"];
def.inputMode = ParseEnumValue(inputModeString.c_str(), std::begin(g_inputModeValues), std::end(g_inputModeValues));
}
if(defJson.contains("lightGunXform"))
if(defJson.contains("screenPosXform"))
{
auto lightGunXformArray = defJson["lightGunXform"];
if(lightGunXformArray.is_array() && (lightGunXformArray.size() >= 4))
auto screenPosXformArray = defJson["screenPosXform"];
if(screenPosXformArray.is_array() && (screenPosXformArray.size() >= 4))
{
for(int i = 0; i < 4; i++)
{
def.lightGunXform[i] = lightGunXformArray[i];
def.screenPosXform[i] = screenPosXformArray[i];
}
}
}

4
Source/ui_shared/arcadedrivers/NamcoSys246Driver.cpp
View file

@ -123,7 +123,7 @@ void CNamcoSys246Driver::PrepareEnvironment(CPS2VM* virtualMachine, const ARCADE
case ARCADE_MACHINE_DEF::INPUT_MODE::LIGHTGUN:
virtualMachine->SetGunListener(namcoArcadeModule.get());
namcoArcadeModule->SetJvsMode(Iop::Namco::CSys246::JVS_MODE::LIGHTGUN);
namcoArcadeModule->SetLightGunXform(def.lightGunXform);
namcoArcadeModule->SetScreenPosXform(def.screenPosXform);
break;
case ARCADE_MACHINE_DEF::INPUT_MODE::DRUM:
namcoArcadeModule->SetJvsMode(Iop::Namco::CSys246::JVS_MODE::DRUM);
@ -134,7 +134,7 @@ void CNamcoSys246Driver::PrepareEnvironment(CPS2VM* virtualMachine, const ARCADE
case ARCADE_MACHINE_DEF::INPUT_MODE::TOUCH:
virtualMachine->SetTouchListener(namcoArcadeModule.get());
namcoArcadeModule->SetJvsMode(Iop::Namco::CSys246::JVS_MODE::TOUCH);
namcoArcadeModule->SetLightGunXform(def.lightGunXform);
namcoArcadeModule->SetScreenPosXform(def.screenPosXform);
break;
default:
break;

2
arcadedefs/cobrata.arcadedef
View file

@ -15,7 +15,7 @@
"3": "circle"
},
"inputMode": "lightgun",
"lightGunXform": [ -65535, 0, 65535, 0 ],
"screenPosXform": [ -65535, 0, 65535, 0 ],
"eeFrequencyScale": [4, 3],
"boot": "ac0:CBRLOAD",
"patches":

2
arcadedefs/idolm.arcadedef
View file

@ -11,7 +11,7 @@
"name": "NM00022 IDM1-HA (HDD).chd"
},
"inputMode": "touch",
"lightGunXform": [ 65535, 0, -65535, 0 ],
"screenPosXform": [ 65535, 0, -65535, 0 ],
"eeFrequencyScale": [4, 3],
"boot": "ac0:IDLLOAD",
"patches":

2
arcadedefs/idolmtower.arcadedef
View file

@ -11,7 +11,7 @@
"name": "NM00022 IDM1-HA (HDD).chd"
},
"inputMode": "touch",
"lightGunXform": [ 65535, 0, -65535, 0 ],
"screenPosXform": [ 65535, 0, -65535, 0 ],
"eeFrequencyScale": [4, 3],
"boot": "ac0:IDLLOAD",
"patches":

2
arcadedefs/timecrs3.arcadedef
View file

@ -11,7 +11,7 @@
"name": "tst1dvd0.chd"
},
"inputMode": "lightgun",
"lightGunXform": [ 660, 16053, 220, 16273 ],
"screenPosXform": [ 660, 16053, 220, 16273 ],
"boot": "ac0:TC3LOAD",
"patches":
[

2
arcadedefs/timecrs3e.arcadedef
View file

@ -12,7 +12,7 @@
"name": "tst1dvd0.chd"
},
"inputMode": "lightgun",
"lightGunXform": [ 660, 16053, 220, 16273 ],
"screenPosXform": [ 660, 16053, 220, 16273 ],
"boot": "ac0:TC3LOAD",
"patches":
[

2
arcadedefs/timecrs3u.arcadedef
View file

@ -12,7 +12,7 @@
"name": "tst1dvd0.chd"
},
"inputMode": "lightgun",
"lightGunXform": [ 660, 16053, 220, 16273 ],
"screenPosXform": [ 660, 16053, 220, 16273 ],
"boot": "ac0:TC3LOAD",
"patches":
[

2
arcadedefs/timecrs4.arcadedef
View file

@ -15,7 +15,7 @@
"3": "circle"
},
"inputMode": "lightgun",
"lightGunXform": [ -65535, 0, 65535, 0 ],
"screenPosXform": [ -65535, 0, 65535, 0 ],
"eeFrequencyScale": [3, 2],
"boot": "ac0:TC4LOAD",
"patches":

2
arcadedefs/vnight.arcadedef
View file

@ -11,7 +11,7 @@
"name": "vpn1cd0.chd"
},
"inputMode": "lightgun",
"lightGunXform": [ 53000, 7000, -48146, 50321 ],
"screenPosXform": [ 53000, 7000, -48146, 50321 ],
"boot": "ac0:VPNGAME",
"patches":
[