Work on public API

dirkwhoffmann · Jul 10, 2024 · f43bcc3 · f43bcc3
1 parent a236b5e
commit f43bcc3
Show file tree

Hide file tree

Showing 6 changed files with 210 additions and 24 deletions.
diff --git a/Emulator/Peripherals/Joystick/Joystick.cpp b/Emulator/Peripherals/Joystick/Joystick.cpp
@@ -19,6 +19,17 @@ Joystick::Joystick(Amiga& ref, ControlPort& pref) : SubComponent(ref, pref.objid
 
 };
 
+void
+Joystick::cacheInfo(JoystickInfo &result) const
+{
+    {   SYNCHRONIZED
+
+        result.button = button;
+        result.axisX = axisX;
+        result.axisY = axisY;
+    }
+}
+
 i64
 Joystick::getOption(Option option) const
 {

diff --git a/Emulator/Peripherals/Joystick/Joystick.h b/Emulator/Peripherals/Joystick/Joystick.h
@@ -14,7 +14,7 @@
 
 namespace vamiga {
 
-class Joystick : public SubComponent {
+class Joystick : public SubComponent, public Inspectable<JoystickInfo> {
 
     Descriptions descriptions = {
         {
@@ -70,18 +70,20 @@ class Joystick : public SubComponent {
 
     Joystick(Amiga& ref, ControlPort& pref);
 
+    Joystick& operator= (const Joystick& other) {
+
+        CLONE(button)
+        CLONE(axisX)
+        CLONE(axisY)
+
+        CLONE(config)
+
+        return *this;
+    }
+
 
     //
-    // Methods from CoreObject
-    //
-
-private:
-
-    void _dump(Category category, std::ostream& os) const override;
-
-
-    //
-    // Methods from CoreComponent
+    // Methods from Serializable
     //
 
 private:
@@ -104,10 +106,28 @@ class Joystick : public SubComponent {
 
     void _didLoad() override;
 
+
+    //
+    // Methods from CoreComponent
+    //
+
 public:
 
     const Descriptions &getDescriptions() const override { return descriptions; }
 
+private:
+
+    void _dump(Category category, std::ostream& os) const override;
+
+
+    //
+    // Methods from Inspectable
+    //
+
+private:
+
+    void cacheInfo(JoystickInfo &result) const override;
+
 
     //
     // Methods from Configurable

diff --git a/Emulator/Peripherals/Joystick/JoystickTypes.h b/Emulator/Peripherals/Joystick/JoystickTypes.h
@@ -87,3 +87,11 @@ typedef struct
     isize autofireDelay;
 }
 JoystickConfig;
+
+typedef struct
+{
+    bool button;
+    int axisX;
+    int axisY;
+}
+JoystickInfo;
diff --git a/Emulator/VAmiga.cpp b/Emulator/VAmiga.cpp
@@ -482,6 +482,58 @@ HardDriveAPI::setFlag(DiskFlags mask, bool value)
 }
 
 
+//
+// Peripherals (Joystick)
+//
+
+const JoystickInfo &
+JoystickAPI::getInfo() const
+{
+    return joystick->getInfo();
+}
+
+const JoystickInfo &
+JoystickAPI::getCachedInfo() const
+{
+    return joystick->getCachedInfo();
+}
+
+
+//
+// Mouse
+//
+
+bool 
+MouseAPI::detectShakeXY(double x, double y)
+{
+    return mouse->detectShakeXY(x, y);
+}
+
+bool 
+MouseAPI::detectShakeDxDy(double dx, double dy)
+{
+    return mouse->detectShakeDxDy(dx, dy);
+}
+
+void 
+MouseAPI::setXY(double x, double y)
+{
+    emu->put(Cmd(CMD_MOUSE_MOVE_ABS, CoordCmd { .port = mouse->objid, .x = x, .y = y }));
+}
+
+void 
+MouseAPI::setDxDy(double dx, double dy)
+{
+    emu->put(Cmd(CMD_MOUSE_MOVE_REL, CoordCmd { .port = mouse->objid, .x = dx, .y = dy }));
+}
+
+void 
+MouseAPI::trigger(GamePadAction action)
+{
+    emu->put(Cmd(CMD_MOUSE_EVENT, GamePadCmd { .port = mouse->objid, .action = action }));
+}
+
+
 //
 // Miscellaneous (Debugger)
 //