Cleanup event types

2018-06-19 11:37:12 -07:00
parent 3491c5cf9c
commit 8e91009bc4
31 changed files with 160 additions and 329 deletions
--- a/project/include/ui/GamepadEvent.h
+++ b/project/include/ui/GamepadEvent.h
@@ -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);
 		
 	};