ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JS joypad API improvements.

This commit is contained in:
harry 2024-02-14 06:28:26 -05:00
parent 446763b232
commit f85f93c5bd
2 changed files with 60 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/drivers/Qt/QtScriptManager.cpp
View File

@ -102,7 +102,7 @@ ColorScriptObject::~ColorScriptObject()
//----------------------------------------------------
int JoypadScriptObject::numInstances = 0;
JoypadScriptObject::JoypadScriptObject(int playerIdx)
JoypadScriptObject::JoypadScriptObject(int playerIdx, bool immediate)
: QObject()
{
numInstances++;
@ -110,7 +110,20 @@ JoypadScriptObject::JoypadScriptObject(int playerIdx)
moveToThread(QApplication::instance()->thread());
if ( (playerIdx < 0) || (playerIdx >= MAX_JOYPAD_PLAYERS) )
{
QString msg = "Error: Joypad player index (" + QString::number(playerIdx) + ") is out of bounds!\n";
auto* engine = FCEU::JSEngine::getCurrent();
if (engine != nullptr)
{
engine->throwError(QJSValue::RangeError, msg);
}
playerIdx = 0;
}
player = playerIdx;
refreshData(immediate);
}
//----------------------------------------------------
JoypadScriptObject::~JoypadScriptObject()
@ -119,21 +132,9 @@ JoypadScriptObject::~JoypadScriptObject()
//printf("JoypadScriptObject %p Destructor: %i\n", this, numInstances);
}
//----------------------------------------------------
void JoypadScriptObject::readData()
void JoypadScriptObject::refreshData(bool immediate)
{
uint8_t buttons = joy[player];
a = (buttons & 0x01) ? true : false;
b = (buttons & 0x02) ? true : false;
select = (buttons & 0x04) ? true : false;
start = (buttons & 0x08) ? true : false;
up = (buttons & 0x10) ? true : false;
down = (buttons & 0x20) ? true : false;
left = (buttons & 0x40) ? true : false;
right = (buttons & 0x80) ? true : false;
}
//----------------------------------------------------
void JoypadScriptObject::readDataPhy()
if (immediate)
{
uint32_t gpData = GetGamepadPressedImmediate();
uint8_t buttons = gpData >> (player * 8);
@ -147,6 +148,20 @@ void JoypadScriptObject::readDataPhy()
left = (buttons & 0x40) ? true : false;
right = (buttons & 0x80) ? true : false;
}
else
{
uint8_t buttons = joy[player];
a = (buttons & 0x01) ? true : false;
b = (buttons & 0x02) ? true : false;
select = (buttons & 0x04) ? true : false;
start = (buttons & 0x08) ? true : false;
up = (buttons & 0x10) ? true : false;
down = (buttons & 0x20) ? true : false;
left = (buttons & 0x40) ? true : false;
right = (buttons & 0x80) ? true : false;
}
}
//----------------------------------------------------
//---- EMU State Object
//----------------------------------------------------
@ -844,17 +859,6 @@ InputScriptObject::InputScriptObject(QObject* parent)
{
script = qobject_cast<QtScriptInstance*>(parent);
engine = script->getEngine();
for (int i=0; i<MAX_NUM_JOYPADS; i++)
{
joypad[i].qObj = new JoypadScriptObject(i);
joypad[i].jsObj = engine->newQObject( joypad[i].qObj );
//#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
// QJSEngine::setObjectOwnership( joypad[i].qObj, QJSEngine::CppScriptOwnership);
//#endif
}
}
//----------------------------------------------------
InputScriptObject::~InputScriptObject()
@ -863,21 +867,15 @@ InputScriptObject::~InputScriptObject()
//----------------------------------------------------
QJSValue InputScriptObject::readJoypad(int player, bool immediate)
{
if ( (player < 0) || (player >= MAX_NUM_JOYPADS) )
{
QString msg = "Error: Joypad player index (" + QString::number(player) + ") is out of bounds!\n";
engine->throwError(QJSValue::RangeError, msg);
player = 0;
}
if (immediate)
{
joypad[player].qObj->readDataPhy();
}
else
{
joypad[player].qObj->readData();
}
return joypad[player].jsObj;
JoypadScriptObject* joypadObj = new JoypadScriptObject(player, immediate);
QJSValue jsObj = engine->newQObject( joypadObj );
#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
QJSEngine::setObjectOwnership( joypadObj, QJSEngine::JavaScriptOwnership);
#endif
return jsObj;
}
//----------------------------------------------------
//---- Memory Script Object
@ -1490,6 +1488,9 @@ int QtScriptInstance::initEngine()
QJSValue jsColorMetaObject = engine->newQMetaObject(&JS::ColorScriptObject::staticMetaObject);
engine->globalObject().setProperty("Color", jsColorMetaObject);
QJSValue jsJoypadMetaObject = engine->newQMetaObject(&JS::JoypadScriptObject::staticMetaObject);
engine->globalObject().setProperty("Joypad", jsJoypadMetaObject);
QJSValue jsEmuStateMetaObject = engine->newQMetaObject(&JS::EmuStateScriptObject::staticMetaObject);
engine->globalObject().setProperty("EmuState", jsEmuStateMetaObject);

21
src/drivers/Qt/QtScriptManager.h
View File

@ -116,14 +116,12 @@ class JoypadScriptObject: public QObject
Q_PROPERTY(bool start READ getStart)
Q_PROPERTY(bool a READ getA)
Q_PROPERTY(bool b READ getB)
Q_PROPERTY(int player READ getPlayer)
Q_PROPERTY(int player READ getPlayer WRITE setPlayer)
public:
JoypadScriptObject(int playerIdx);
Q_INVOKABLE JoypadScriptObject(int playerIdx = 0, bool immediate = false);
~JoypadScriptObject();
void readData();
void readDataPhy();
static constexpr int MAX_JOYPAD_PLAYERS = 4;
private:
bool up = false;
bool down = false;
@ -137,6 +135,7 @@ private:
static int numInstances;
public slots:
Q_INVOKABLE void refreshData(bool immediate = false);
Q_INVOKABLE bool getUp(){ return up; }
Q_INVOKABLE bool getDown(){ return down; }
Q_INVOKABLE bool getLeft(){ return left; }
@ -145,7 +144,9 @@ public slots:
Q_INVOKABLE bool getStart(){ return start; }
Q_INVOKABLE bool getA(){ return a; }
Q_INVOKABLE bool getB(){ return b; }
Q_INVOKABLE int maxPlayers(){ return MAX_JOYPAD_PLAYERS; }
Q_INVOKABLE int getPlayer(){ return player; }
Q_INVOKABLE void setPlayer(int newPlayerIdx){ player = newPlayerIdx; }
};
class EmuStateScriptObject: public QObject
@ -352,20 +353,14 @@ public:
void setEngine(FCEU::JSEngine* _engine){ engine = _engine; }
void setDialog(QScriptDialog_t* _dialog){ dialog = _dialog; }
static constexpr int MAX_NUM_JOYPADS = 4;
private:
FCEU::JSEngine* engine = nullptr;
QScriptDialog_t* dialog = nullptr;
QtScriptInstance* script = nullptr;
struct
{
JoypadScriptObject* qObj;
QJSValue jsObj;
} joypad[MAX_NUM_JOYPADS];
public slots:
Q_INVOKABLE QJSValue readJoypad(int player, bool immediate = false);
Q_INVOKABLE QJSValue readJoypad(int player = 0, bool immediate = false);
Q_INVOKABLE int maxJoypadPlayers(){ return JoypadScriptObject::MAX_JOYPAD_PLAYERS; }
};
} // JS