mirror of
https://github.com/libretro/bsnes-libretro.git
synced 2024-11-27 02:50:32 +00:00
ae5d380d06
byuu says:
Changelog:
- fixed nall/path.hpp compilation issue
- fixed ruby/audio/xaudio header declaration compilation issue (again)
- cleaned up xaudio2.hpp file to match my coding syntax (12.5% of the
file was whitespace overkill)
- added null terminator entry to nall/windows/utf8.hpp argc[] array
- nall/windows/guid.hpp uses the Windows API for generating the GUID
- this should stop all the bug reports where two nall users were
generating GUIDs at the exact same second
- fixed hiro/cocoa compilation issue with uint# types
- fixed major higan/sfc Super Game Boy audio latency issue
- fixed higan/sfc CPU core bug with pei, [dp], [dp]+y instructions
- major cleanups to higan/processor/r65816 core
- merged emulation/native-mode opcodes
- use camel-case naming on memory.hpp functions
- simplify address masking code for memory.hpp functions
- simplify a few opcodes themselves (avoid redundant copies, etc)
- rename regs.* to r.* to match modern convention of other CPU cores
- removed device.order<> concept from Emulator::Interface
- cores will now do the translation to make the job of the UI easier
- fixed plurality naming of arrays in Emulator::Interface
- example: emulator.ports[p].devices[d].inputs[i]
- example: vector<Medium> media
- probably more surprises
Major show-stoppers to the next official release:
- we need to work on GB core improvements: LY=153/0 case, multiple STAT
IRQs case, GBC audio output regs, etc.
- we need to re-add software cursors for light guns (Super Scope,
Justifier)
- after the above, we need to fix the turbo button for the Super Scope
I really have no idea how I want to implement the light guns. Ideally,
we'd want it in higan/video, so we can support the NES Zapper with the
same code. But this isn't going to be easy, because only the SNES knows
when its output is interlaced, and its resolutions can vary as
{256,512}x{224,240,448,480} which requires pixel doubling that was
hard-coded to the SNES-specific behavior, but isn't appropriate to be
exposed in higan/video.
108 lines
3.1 KiB
C++
108 lines
3.1 KiB
C++
#pragma once
|
|
|
|
namespace nall { namespace HID {
|
|
|
|
struct Input {
|
|
Input(const string& name) : _name(name) {}
|
|
|
|
auto name() const -> string { return _name; }
|
|
auto value() const -> int16_t { return _value; }
|
|
auto setValue(int16_t value) -> void { _value = value; }
|
|
|
|
private:
|
|
string _name;
|
|
int16_t _value = 0;
|
|
friend class Group;
|
|
};
|
|
|
|
struct Group : vector<Input> {
|
|
Group(const string& name) : _name(name) {}
|
|
|
|
auto name() const -> string { return _name; }
|
|
auto input(uint id) -> Input& { return operator[](id); }
|
|
auto append(const string& name) -> void { vector::append(Input{name}); }
|
|
|
|
auto find(const string& name) const -> maybe<uint> {
|
|
for(auto id : range(size())) {
|
|
if(operator[](id)._name == name) return id;
|
|
}
|
|
return nothing;
|
|
}
|
|
|
|
private:
|
|
string _name;
|
|
friend class Device;
|
|
};
|
|
|
|
struct Device : vector<Group> {
|
|
Device(const string& name) : _name(name) {}
|
|
|
|
auto pathID() const -> uint32_t { return (uint32_t)(_id >> 32); }
|
|
auto deviceID() const -> uint32_t { return (uint32_t)(_id >> 0); }
|
|
auto vendorID() const -> uint16_t { return (uint16_t)(_id >> 16); }
|
|
auto productID() const -> uint16_t { return (uint16_t)(_id >> 0); }
|
|
|
|
virtual auto isNull() const -> bool { return false; }
|
|
virtual auto isKeyboard() const -> bool { return false; }
|
|
virtual auto isMouse() const -> bool { return false; }
|
|
virtual auto isJoypad() const -> bool { return false; }
|
|
|
|
auto name() const -> string { return _name; }
|
|
auto id() const -> uint64_t { return _id; }
|
|
auto setID(uint64_t id) -> void { _id = id; }
|
|
auto group(uint id) -> Group& { return operator[](id); }
|
|
auto append(const string& name) -> void { vector::append(Group{name}); }
|
|
|
|
auto find(const string& name) const -> maybe<uint> {
|
|
for(auto id : range(size())) {
|
|
if(operator[](id)._name == name) return id;
|
|
}
|
|
return nothing;
|
|
}
|
|
|
|
private:
|
|
string _name;
|
|
uint64_t _id = 0;
|
|
};
|
|
|
|
struct Null : Device {
|
|
Null() : Device("Null") {}
|
|
auto isNull() const -> bool { return true; }
|
|
};
|
|
|
|
struct Keyboard : Device {
|
|
enum GroupID : uint { Button };
|
|
|
|
Keyboard() : Device("Keyboard") { append("Button"); }
|
|
auto isKeyboard() const -> bool { return true; }
|
|
auto buttons() -> Group& { return group(GroupID::Button); }
|
|
};
|
|
|
|
struct Mouse : Device {
|
|
enum GroupID : uint { Axis, Button };
|
|
|
|
Mouse() : Device("Mouse") { append("Axis"), append("Button"); }
|
|
auto isMouse() const -> bool { return true; }
|
|
auto axes() -> Group& { return group(GroupID::Axis); }
|
|
auto buttons() -> Group& { return group(GroupID::Button); }
|
|
};
|
|
|
|
struct Joypad : Device {
|
|
enum GroupID : uint { Axis, Hat, Trigger, Button };
|
|
|
|
Joypad() : Device("Joypad") { append("Axis"), append("Hat"), append("Trigger"), append("Button"); }
|
|
auto isJoypad() const -> bool { return true; }
|
|
auto axes() -> Group& { return group(GroupID::Axis); }
|
|
auto hats() -> Group& { return group(GroupID::Hat); }
|
|
auto triggers() -> Group& { return group(GroupID::Trigger); }
|
|
auto buttons() -> Group& { return group(GroupID::Button); }
|
|
|
|
auto rumble() const -> bool { return _rumble; }
|
|
auto setRumble(bool rumble) -> void { _rumble = rumble; }
|
|
|
|
private:
|
|
bool _rumble = false;
|
|
};
|
|
|
|
}}
|