reflexion 0.3.5 → 0.3.7

data/src/gamepad.cpp

@@ -0,0 +1,176 @@
+#include "gamepad.h"
+
+
+#include <algorithm>
+#include "reflex/exception.h"
+#include "application.h"
+
+
+namespace Reflex
+{
+
+
+	Gamepad::Data::~Data ()
+	{
+	}
+
+	void
+	Gamepad::Data::update_prev ()
+	{
+		if (prev) prev->self->state = state;
+	}
+
+	const char*
+	Gamepad::Data::name () const
+	{
+		return "Unknown";
+	}
+
+	bool
+	Gamepad::Data::is_valid () const
+	{
+		return true;
+	}
+
+	bool
+	Gamepad::Data::has_handle (void* handle) const
+	{
+		return false;
+	}
+
+
+	static Gamepad::List gamepads;
+
+	void
+	Gamepad_add (Application* app, Gamepad* gamepad)
+	{
+		if (!gamepad)
+			argument_error(__FILE__, __LINE__);
+
+		gamepads.emplace_back(gamepad);
+
+		Application_call_device_connect(app, gamepad);
+	}
+
+	void
+	Gamepad_remove (Application* app, Gamepad* gamepad)
+	{
+		if (!gamepad) return;
+
+		auto it = std::find(gamepads.begin(), gamepads.end(), gamepad);
+		if (it == gamepads.end()) return;
+
+		Application_call_device_disconnect(app, gamepad);
+
+		gamepads.erase(it);
+	}
+
+	void
+	Gamepad_remove_all (Application* app)
+	{
+		for (auto& gamepad : gamepads)
+			Gamepad_remove(app, gamepad);
+	}
+
+	Gamepad*
+	Gamepad_find (void* handle)
+	{
+		if (!handle)
+			return NULL;
+
+		auto it = std::find_if(
+			gamepads.begin(), gamepads.end(),
+			[&](auto& gamepad) {return gamepad->self->has_handle(handle);});
+		if (it == gamepads.end())
+			return NULL;
+
+		return it->get();
+	}
+
+	float
+	Gamepad_get_button_press_threshold ()
+	{
+		return 0.35;
+	}
+
+	static Gamepad_CreateFun gamepad_create_fun = NULL;
+
+	void
+	Gamepad_set_create_fun (Gamepad_CreateFun fun)
+	{
+		gamepad_create_fun = fun;
+	}
+
+	Gamepad*
+	Gamepad_create ()
+	{
+		return gamepad_create_fun ? gamepad_create_fun() : new Gamepad();
+	}
+
+
+	Gamepad::Gamepad ()
+	{
+	}
+
+	Gamepad::~Gamepad ()
+	{
+	}
+
+	const char*
+	Gamepad::name () const
+	{
+		return self->name();
+	}
+
+	ulonglong
+	Gamepad::buttons () const
+	{
+		return self->state.buttons;
+	}
+
+	const Point&
+	Gamepad::stick (size_t index) const
+	{
+		if (index >= INDEX_MAX)
+			index_error(__FILE__, __LINE__);
+
+		return self->state.sticks[index];
+	}
+
+	float
+	Gamepad::trigger (size_t index) const
+	{
+		if (index >= INDEX_MAX)
+			index_error(__FILE__, __LINE__);
+
+		return self->state.triggers[index];
+	}
+
+	const Gamepad*
+	Gamepad::prev () const
+	{
+		return self->prev.get();
+	}
+
+	void
+	Gamepad::on_key (KeyEvent* e)
+	{
+	}
+
+	void
+	Gamepad::on_key_down (KeyEvent* e)
+	{
+	}
+
+	void
+	Gamepad::on_key_up (KeyEvent* e)
+	{
+	}
+
+	Gamepad::operator bool () const
+	{
+		return self->is_valid();
+	}
+
+
+}// Reflex

data/src/gamepad.h

@@ -0,0 +1,74 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_SRC_GAMEPAD_H__
+#define __REFLEX_SRC_GAMEPAD_H__
+
+
+#include <memory>
+#include "reflex/gamepad.h"
+
+
+namespace Reflex
+{
+
+
+	class Application;
+
+
+	struct Gamepad::Data
+	{
+
+		struct State
+		{
+
+			ulonglong buttons = 0;
+
+			Point sticks[2];
+
+			float triggers[2];
+
+		};// State
+
+		State state;
+
+		std::unique_ptr<Gamepad> prev;
+
+		virtual ~Data ();
+
+		virtual void update_prev ();
+
+		virtual const char* name () const;
+
+		virtual bool is_valid () const;
+
+		virtual bool has_handle (void* handle) const;
+
+	};// Gamepad
+
+
+	void Gamepad_init (Application* app);
+
+	void Gamepad_fin  (Application* app);
+
+	void Gamepad_add    (Application* app, Gamepad* gamepad);
+
+	void Gamepad_remove (Application* app, Gamepad* gamepad);
+
+	void Gamepad_remove_all (Application* app);
+
+	Gamepad* Gamepad_find (void* handle);
+
+	float Gamepad_get_button_press_threshold ();
+
+
+	typedef Gamepad* (*Gamepad_CreateFun) ();
+
+	void Gamepad_set_create_fun (Gamepad_CreateFun fun);
+
+	Gamepad* Gamepad_create ();
+
+
+}// Reflex
+
+
+#endif//EOH

data/src/ios/app_delegate.mm

@@ -76,7 +76,7 @@
 			return YES;
 
 		Reflex::Event e;
-		application->on_start(&e);
+		Application_call_start(application, &e);
 		started = true;
 
 		return !e.is_blocked();
@@ -147,7 +147,7 @@
 		if (self->application)
 		{
 			Reflex::Event e;
-			self->application->on_quit(&e);
+			Application_call_quit(self->application, &e);
 			if (e.is_blocked())
 			{
 				Reflex::not_implemented_error(

data/src/ios/application.mm

@@ -75,35 +75,10 @@ namespace Reflex
 		not_implemented_error(__FILE__, __LINE__);
 	}
 
-	void
-	Application::on_start (Event* e)
-	{
-	}
-
-	void
-	Application::on_quit (Event* e)
-	{
-	}
-
-	void
-	Application::on_motion (MotionEvent* e)
-	{
-	}
-
-	void
-	Application::on_preference (Event* e)
-	{
-	}
-
 	void
 	Application::on_about (Event* e)
 	{
 	}
 
-	Application::operator bool () const
-	{
-		return true;
-	}
-
 
 }// Reflex

data/src/ios/event.h

@@ -22,11 +22,6 @@ namespace Reflex
 	};// NativePointerEvent
 
 
-	void init_game_controllers ();
-
-	void fin_game_controllers ();
-
-
 }// Reflex
 
 

data/src/ios/event.mm

@@ -3,8 +3,6 @@
 
 
 #include <assert.h>
-#include <algorithm>
-#import <GameController/GameController.h>
 #include "window.h"
 
 
@@ -56,10 +54,11 @@ namespace Reflex
 	static uint
 	get_modifiers (const UIEvent* event)
 	{
-		assert(event);
+		if (!event) return 0;
 
 		NSInteger flags = 0;
-		if (@available(iOS 13.4, *)) flags = event.modifierFlags;
+		if (@available(iOS 13.4, *))
+			flags = event.modifierFlags;
 
 		return
 			(flags & UIKeyModifierAlphaShift) ? MOD_CAPS    : 0 |
@@ -70,6 +69,13 @@ namespace Reflex
 			(flags & UIKeyModifierNumericPad) ? MOD_NUMPAD  : 0;
 	}
 
+	uint
+	KeyEvent_get_modifiers ()
+	{
+		return get_modifiers(nil);
+	}
+
+
 	NativePointerEvent::NativePointerEvent (
 		NSSet* touches, UIEvent* event, UIView* view)
 	{
@@ -99,86 +105,4 @@ namespace Reflex
 	}
 
 
-	static void
-	call_gamepad_event (int code, bool pressed)
-	{
-		Window* win = Window_get_active();
-		if (!win) return;
-
-		auto action = pressed ? KeyEvent::DOWN : KeyEvent::UP;
-		KeyEvent e(action, NULL, code, 0, 0);
-		Window_call_key_event(win, &e);
-	}
-
-	static void
-	handle_gamepad_event (GCControllerButtonInput* input, int code)
-	{
-		[input setPressedChangedHandler:
-			^(GCControllerButtonInput* button, float value, BOOL pressed) {
-				call_gamepad_event(code, pressed);
-			}];
-	}
-
-	static void
-	handle_gamepad_events (GCController* controller)
-	{
-		GCExtendedGamepad* gamepad = controller.extendedGamepad;
-		if (!gamepad) return;
-
-		handle_gamepad_event(gamepad.dpad.left,  KEY_GAMEPAD_LEFT);
-		handle_gamepad_event(gamepad.dpad.right, KEY_GAMEPAD_RIGHT);
-		handle_gamepad_event(gamepad.dpad.up,    KEY_GAMEPAD_UP);
-		handle_gamepad_event(gamepad.dpad.down,  KEY_GAMEPAD_DOWN);
-
-		handle_gamepad_event(gamepad.buttonA, KEY_GAMEPAD_A);
-		handle_gamepad_event(gamepad.buttonB, KEY_GAMEPAD_B);
-		handle_gamepad_event(gamepad.buttonX, KEY_GAMEPAD_X);
-		handle_gamepad_event(gamepad.buttonY, KEY_GAMEPAD_Y);
-
-		handle_gamepad_event(gamepad. leftShoulder, KEY_GAMEPAD_SHOULDER_LEFT);
-		handle_gamepad_event(gamepad.rightShoulder, KEY_GAMEPAD_SHOULDER_RIGHT);
-		handle_gamepad_event(gamepad. leftTrigger,  KEY_GAMEPAD_TRIGGER_LEFT);
-		handle_gamepad_event(gamepad.rightTrigger,  KEY_GAMEPAD_TRIGGER_RIGHT);
-
-		if (@available(iOS 12.1, *))
-		{
-			handle_gamepad_event(gamepad. leftThumbstickButton, KEY_GAMEPAD_THUMB_LEFT);
-			handle_gamepad_event(gamepad.rightThumbstickButton, KEY_GAMEPAD_THUMB_RIGHT);
-		}
-
-		if (@available(iOS 13.0, *))
-		{
-			handle_gamepad_event(gamepad.buttonMenu,    KEY_GAMEPAD_MENU);
-			handle_gamepad_event(gamepad.buttonOptions, KEY_GAMEPAD_OPTION);
-		}
-
-		if (@available(iOS 14.0, *))
-			handle_gamepad_event(gamepad.buttonHome, KEY_GAMEPAD_HOME);
-	}
-
-	static id game_controllers_observer = nil;
-
-	void
-	init_game_controllers ()
-	{
-		for (GCController* c in GCController.controllers)
-			handle_gamepad_events(c);
-
-		game_controllers_observer = [NSNotificationCenter.defaultCenter
-			addObserverForName: GCControllerDidConnectNotification
-			object: nil
-			queue: NSOperationQueue.mainQueue
-			usingBlock: ^(NSNotification* n) {handle_gamepad_events(n.object);}];
-	}
-
-	void
-	fin_game_controllers ()
-	{
-		if (!game_controllers_observer) return;
-
-		[NSNotificationCenter.defaultCenter
-			removeObserver: game_controllers_observer];
-	}
-
-
-};// Reflex
+}// Reflex