Merge branch 'master' of https://github.com/supertuxkart/stk-code
This commit is contained in:
commit
0c23e6063d
File diff suppressed because it is too large
Load Diff
@ -24,124 +24,126 @@
|
||||
namespace irr
|
||||
{
|
||||
|
||||
class CIrrDeviceAndroid : public CIrrDeviceStub, video::IImagePresenter
|
||||
{
|
||||
public:
|
||||
//! constructor
|
||||
CIrrDeviceAndroid(const SIrrlichtCreationParameters& param);
|
||||
class CIrrDeviceAndroid : public CIrrDeviceStub, video::IImagePresenter
|
||||
{
|
||||
public:
|
||||
//! constructor
|
||||
CIrrDeviceAndroid(const SIrrlichtCreationParameters& param);
|
||||
|
||||
//! destructor
|
||||
virtual ~CIrrDeviceAndroid();
|
||||
//! destructor
|
||||
virtual ~CIrrDeviceAndroid();
|
||||
|
||||
virtual bool run();
|
||||
virtual void yield();
|
||||
virtual void sleep(u32 timeMs, bool pauseTimer=false);
|
||||
virtual void setWindowCaption(const wchar_t* text);
|
||||
virtual void setWindowClass(const char* text) {}
|
||||
virtual bool present(video::IImage* surface, void* windowId, core::rect<s32>* srcClip);
|
||||
virtual bool isWindowActive() const;
|
||||
virtual bool isWindowFocused() const;
|
||||
virtual bool isWindowMinimized() const;
|
||||
virtual void closeDevice();
|
||||
virtual void setResizable( bool resize=false );
|
||||
virtual void minimizeWindow();
|
||||
virtual void maximizeWindow();
|
||||
virtual void restoreWindow();
|
||||
virtual bool moveWindow(int x, int y);
|
||||
virtual bool getWindowPosition(int* x, int* y);
|
||||
virtual E_DEVICE_TYPE getType() const;
|
||||
virtual bool activateAccelerometer(float updateInterval);
|
||||
virtual bool deactivateAccelerometer();
|
||||
virtual bool isAccelerometerActive();
|
||||
virtual bool isAccelerometerAvailable();
|
||||
virtual bool activateGyroscope(float updateInterval);
|
||||
virtual bool deactivateGyroscope();
|
||||
virtual bool isGyroscopeActive();
|
||||
virtual bool isGyroscopeAvailable();
|
||||
|
||||
class CCursorControl : public gui::ICursorControl
|
||||
{
|
||||
public:
|
||||
virtual bool run();
|
||||
virtual void yield();
|
||||
virtual void sleep(u32 timeMs, bool pauseTimer=false);
|
||||
virtual void setWindowCaption(const wchar_t* text);
|
||||
virtual void setWindowClass(const char* text) {}
|
||||
virtual bool present(video::IImage* surface, void* windowId, core::rect<s32>* srcClip);
|
||||
virtual bool isWindowActive() const;
|
||||
virtual bool isWindowFocused() const;
|
||||
virtual bool isWindowMinimized() const;
|
||||
virtual void closeDevice();
|
||||
virtual void setResizable( bool resize=false );
|
||||
virtual void minimizeWindow();
|
||||
virtual void maximizeWindow();
|
||||
virtual void restoreWindow();
|
||||
virtual bool moveWindow(int x, int y);
|
||||
virtual bool getWindowPosition(int* x, int* y);
|
||||
virtual E_DEVICE_TYPE getType() const;
|
||||
virtual bool activateAccelerometer(float updateInterval);
|
||||
virtual bool deactivateAccelerometer();
|
||||
virtual bool isAccelerometerActive();
|
||||
virtual bool isAccelerometerAvailable();
|
||||
virtual bool activateGyroscope(float updateInterval);
|
||||
virtual bool deactivateGyroscope();
|
||||
virtual bool isGyroscopeActive();
|
||||
virtual bool isGyroscopeAvailable();
|
||||
|
||||
class CCursorControl : public gui::ICursorControl
|
||||
{
|
||||
public:
|
||||
|
||||
CCursorControl() : CursorPos(core::position2d<s32>(0, 0)) {}
|
||||
virtual void setVisible(bool visible) {}
|
||||
virtual bool isVisible() const {return false;}
|
||||
virtual void setPosition(const core::position2d<f32> &pos)
|
||||
{
|
||||
setPosition(pos.X, pos.Y);
|
||||
}
|
||||
virtual void setPosition(f32 x, f32 y)
|
||||
{
|
||||
CursorPos.X = x;
|
||||
CursorPos.Y = y;
|
||||
}
|
||||
virtual void setPosition(const core::position2d<s32> &pos)
|
||||
{
|
||||
setPosition(pos.X, pos.Y);
|
||||
}
|
||||
virtual void setPosition(s32 x, s32 y)
|
||||
{
|
||||
CursorPos.X = x;
|
||||
CursorPos.Y = y;
|
||||
}
|
||||
virtual const core::position2d<s32>& getPosition()
|
||||
{
|
||||
return CursorPos;
|
||||
}
|
||||
virtual core::position2d<f32> getRelativePosition()
|
||||
{
|
||||
return core::position2d<f32>(0, 0);
|
||||
}
|
||||
virtual void setReferenceRect(core::rect<s32>* rect=0) {}
|
||||
private:
|
||||
core::position2d<s32> CursorPos;
|
||||
};
|
||||
|
||||
static void onCreate();
|
||||
CCursorControl() : CursorPos(core::position2d<s32>(0, 0)) {}
|
||||
virtual void setVisible(bool visible) {}
|
||||
virtual bool isVisible() const {return false;}
|
||||
virtual void setPosition(const core::position2d<f32> &pos)
|
||||
{
|
||||
setPosition(pos.X, pos.Y);
|
||||
}
|
||||
virtual void setPosition(f32 x, f32 y)
|
||||
{
|
||||
CursorPos.X = x;
|
||||
CursorPos.Y = y;
|
||||
}
|
||||
virtual void setPosition(const core::position2d<s32> &pos)
|
||||
{
|
||||
setPosition(pos.X, pos.Y);
|
||||
}
|
||||
virtual void setPosition(s32 x, s32 y)
|
||||
{
|
||||
CursorPos.X = x;
|
||||
CursorPos.Y = y;
|
||||
}
|
||||
virtual const core::position2d<s32>& getPosition()
|
||||
{
|
||||
return CursorPos;
|
||||
}
|
||||
virtual core::position2d<f32> getRelativePosition()
|
||||
{
|
||||
return core::position2d<f32>(0, 0);
|
||||
}
|
||||
virtual void setReferenceRect(core::rect<s32>* rect=0) {}
|
||||
private:
|
||||
core::position2d<s32> CursorPos;
|
||||
};
|
||||
|
||||
static void onCreate();
|
||||
|
||||
private:
|
||||
android_app* Android;
|
||||
ASensorManager* SensorManager;
|
||||
ASensorEventQueue* SensorEventQueue;
|
||||
const ASensor* Accelerometer;
|
||||
const ASensor* Gyroscope;
|
||||
private:
|
||||
android_app* Android;
|
||||
ASensorManager* SensorManager;
|
||||
ASensorEventQueue* SensorEventQueue;
|
||||
const ASensor* Accelerometer;
|
||||
const ASensor* Gyroscope;
|
||||
|
||||
static bool IsPaused;
|
||||
static bool IsFocused;
|
||||
static bool IsStarted;
|
||||
|
||||
struct TouchEventData
|
||||
{
|
||||
int x;
|
||||
int y;
|
||||
ETOUCH_INPUT_EVENT event;
|
||||
|
||||
TouchEventData() : x(0), y(0), event(ETIE_COUNT) {};
|
||||
};
|
||||
|
||||
TouchEventData TouchEventsData[32];
|
||||
bool IsMousePressed;
|
||||
float GamepadAxisX;
|
||||
float GamepadAxisY;
|
||||
static bool IsPaused;
|
||||
static bool IsFocused;
|
||||
static bool IsStarted;
|
||||
|
||||
struct TouchEventData
|
||||
{
|
||||
int x;
|
||||
int y;
|
||||
ETOUCH_INPUT_EVENT event;
|
||||
|
||||
TouchEventData() : x(0), y(0), event(ETIE_COUNT) {};
|
||||
};
|
||||
|
||||
TouchEventData TouchEventsData[32];
|
||||
bool IsMousePressed;
|
||||
float GamepadAxisX;
|
||||
float GamepadAxisY;
|
||||
|
||||
video::SExposedVideoData ExposedVideoData;
|
||||
video::SExposedVideoData ExposedVideoData;
|
||||
|
||||
std::map<int, EKEY_CODE> KeyMap;
|
||||
|
||||
void printConfig();
|
||||
void createDriver();
|
||||
void createKeyMap();
|
||||
void createVideoModeList();
|
||||
void getKeyChar(SEvent& event);
|
||||
video::SExposedVideoData& getExposedVideoData();
|
||||
|
||||
static void handleAndroidCommand(android_app* app, int32_t cmd);
|
||||
static s32 handleInput(android_app* app, AInputEvent* event);
|
||||
std::map<int, EKEY_CODE> KeyMap;
|
||||
|
||||
void printConfig();
|
||||
void createDriver();
|
||||
void createKeyMap();
|
||||
void createVideoModeList();
|
||||
void getKeyChar(SEvent& event);
|
||||
int getRotation();
|
||||
int getDefaultRotation();
|
||||
video::SExposedVideoData& getExposedVideoData();
|
||||
|
||||
static void handleAndroidCommand(android_app* app, int32_t cmd);
|
||||
static s32 handleInput(android_app* app, AInputEvent* event);
|
||||
|
||||
s32 handleTouch(AInputEvent* androidEvent);
|
||||
s32 handleKeyboard(AInputEvent* androidEvent);
|
||||
s32 handleGamepad(AInputEvent* androidEvent);
|
||||
};
|
||||
s32 handleTouch(AInputEvent* androidEvent);
|
||||
s32 handleKeyboard(AInputEvent* androidEvent);
|
||||
s32 handleGamepad(AInputEvent* androidEvent);
|
||||
};
|
||||
|
||||
} // end namespace irr
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user