Cleanup event types

This commit is contained in:
Joshua Granick
2018-06-19 11:37:12 -07:00
parent 3491c5cf9c
commit 8e91009bc4
31 changed files with 160 additions and 329 deletions

View File

@@ -16,28 +16,18 @@ namespace lime {
};
struct HL_DropEvent {
struct DropEvent {
hl_type* t;
vbyte* file;
DropEventType type;
};
class DropEvent {
static ValuePointer* callback;
static ValuePointer* eventObject;
public:
static ValuePointer* callback;
static ValuePointer* eventObject;
DropEvent ();
static void Dispatch (DropEvent* event);
char* file;
DropEventType type;
DropEvent ();
static void Dispatch (DropEvent* event);
};

View File

@@ -20,34 +20,21 @@ namespace lime {
};
struct HL_GamepadEvent {
struct GamepadEvent {
hl_type* t;
int axis;
int button;
int id;
GamepadEventType type;
double value;
double axisValue;
};
class GamepadEvent {
static ValuePointer* callback;
static ValuePointer* eventObject;
public:
static ValuePointer* callback;
static ValuePointer* eventObject;
GamepadEvent ();
static void Dispatch (GamepadEvent* event);
int axis;
double axisValue;
int button;
int id;
GamepadEventType type;
GamepadEvent ();
static void Dispatch (GamepadEvent* event);
};

View File

@@ -22,36 +22,22 @@ namespace lime {
};
struct HL_JoystickEvent {
struct JoystickEvent {
hl_type* t;
int id;
int index;
JoystickEventType type;
int value;
int eventValue;
double x;
double y;
};
class JoystickEvent {
static ValuePointer* callback;
static ValuePointer* eventObject;
public:
static ValuePointer* callback;
static ValuePointer* eventObject;
JoystickEvent ();
static void Dispatch (JoystickEvent* event);
int eventValue;
int id;
int index;
JoystickEventType type;
double x;
double y;
JoystickEvent ();
static void Dispatch (JoystickEvent* event);
};

View File

@@ -18,7 +18,7 @@ namespace lime {
};
struct HL_KeyEvent {
struct KeyEvent {
hl_type* t;
int keyCode;
@@ -26,24 +26,12 @@ namespace lime {
KeyEventType type;
int windowID;
};
class KeyEvent {
static ValuePointer* callback;
static ValuePointer* eventObject;
public:
static ValuePointer* callback;
static ValuePointer* eventObject;
KeyEvent ();
static void Dispatch (KeyEvent* event);
double keyCode;
uint16_t modifier;
KeyEventType type;
uint32_t windowID;
KeyEvent ();
static void Dispatch (KeyEvent* event);
};

View File

@@ -20,7 +20,7 @@ namespace lime {
};
struct HL_MouseEvent {
struct MouseEvent {
hl_type* t;
int button;
@@ -31,27 +31,12 @@ namespace lime {
double x;
double y;
};
class MouseEvent {
static ValuePointer* callback;
static ValuePointer* eventObject;
public:
static ValuePointer* callback;
static ValuePointer* eventObject;
MouseEvent ();
static void Dispatch (MouseEvent* event);
int button;
double movementX;
double movementY;
MouseEventType type;
uint32_t windowID;
double x;
double y;
MouseEvent ();
static void Dispatch (MouseEvent* event);
};

View File

@@ -18,7 +18,7 @@ namespace lime {
};
struct HL_TextEvent {
struct TextEvent {
hl_type* t;
int id;
@@ -28,25 +28,12 @@ namespace lime {
TextEventType type;
int windowID;
};
class TextEvent {
static ValuePointer* callback;
static ValuePointer* eventObject;
public:
static ValuePointer* callback;
static ValuePointer* eventObject;
TextEvent ();
static void Dispatch (TextEvent* event);
long length;
long start;
char text[32];
TextEventType type;
uint32_t windowID;
TextEvent ();
static void Dispatch (TextEvent* event);
};

View File

@@ -19,7 +19,7 @@ namespace lime {
};
struct HL_TouchEvent {
struct TouchEvent {
hl_type* t;
int device;
@@ -31,28 +31,12 @@ namespace lime {
double x;
double y;
};
class TouchEvent {
static ValuePointer* callback;
static ValuePointer* eventObject;
public:
static ValuePointer* callback;
static ValuePointer* eventObject;
TouchEvent ();
static void Dispatch (TouchEvent* event);
uint32_t device;
float dx;
float dy;
uint32_t id;
float pressure;
TouchEventType type;
float x;
float y;
TouchEvent ();
static void Dispatch (TouchEvent* event);
};

View File

@@ -28,7 +28,7 @@ namespace lime {
};
struct HL_WindowEvent {
struct WindowEvent {
hl_type* t;
int height;
@@ -38,26 +38,12 @@ namespace lime {
int x;
int y;
};
class WindowEvent {
static ValuePointer* callback;
static ValuePointer* eventObject;
public:
static ValuePointer* callback;
static ValuePointer* eventObject;
WindowEvent ();
static void Dispatch (WindowEvent* event);
int height;
WindowEventType type;
int width;
uint32_t windowID;
int x;
int y;
WindowEvent ();
static void Dispatch (WindowEvent* event);
};