Fixed friend class not working for emscripten builds. Release build 5869.
This commit is contained in:
parent
6b2f4f7bf9
commit
aa483f1d5e
@ -39,7 +39,7 @@ All rights reserved.
|
|||||||
#define VERSION_MAJOR 0
|
#define VERSION_MAJOR 0
|
||||||
#define VERSION_MINOR 2
|
#define VERSION_MINOR 2
|
||||||
#define VERSION_PATCH 1
|
#define VERSION_PATCH 1
|
||||||
#define VERSION_BUILD 5867
|
#define VERSION_BUILD 5869
|
||||||
|
|
||||||
#define stringify(a) stringify_(a)
|
#define stringify(a) stringify_(a)
|
||||||
#define stringify_(a) #a
|
#define stringify_(a) #a
|
||||||
|
@ -160,13 +160,26 @@ namespace olc {
|
|||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
GamePad(LPCDIDEVICEINSTANCEA lpddi);
|
GamePad(LPCDIDEVICEINSTANCEA lpddi);
|
||||||
GamePad(DWORD xId);
|
GamePad(DWORD xId);
|
||||||
|
private:
|
||||||
|
void startVibration(float strength = 1) const;
|
||||||
|
|
||||||
|
void stopVibration() const;
|
||||||
|
public:
|
||||||
#endif
|
#endif
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
GamePad(std::string path, int fd);
|
GamePad(std::string path, int fd);
|
||||||
|
|
||||||
|
void startVibration(float strength = 1) const;
|
||||||
|
|
||||||
|
void stopVibration() const;
|
||||||
#endif
|
#endif
|
||||||
#ifdef __EMSCRIPTEN__
|
#ifdef __EMSCRIPTEN__
|
||||||
// TODO ctor
|
// TODO ctor
|
||||||
GamePad(long id, std::string name);
|
GamePad(long id, std::string name);
|
||||||
|
|
||||||
|
void startVibration(float strength = 1) const;
|
||||||
|
|
||||||
|
void stopVibration() const;
|
||||||
#endif
|
#endif
|
||||||
GamePad(const GamePad &other) = delete;
|
GamePad(const GamePad &other) = delete;
|
||||||
|
|
||||||
@ -214,10 +227,6 @@ namespace olc {
|
|||||||
|
|
||||||
static void updateGamepads();
|
static void updateGamepads();
|
||||||
|
|
||||||
void startVibration(float strength = 1) const;
|
|
||||||
|
|
||||||
void stopVibration() const;
|
|
||||||
|
|
||||||
std::string name;
|
std::string name;
|
||||||
int axisCount = GP_AXIS_COUNT;
|
int axisCount = GP_AXIS_COUNT;
|
||||||
int buttonCount = GP_BUTTON_COUNT;
|
int buttonCount = GP_BUTTON_COUNT;
|
||||||
|
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user