update engine (inputs rewrite)

malytomas · malytomas · commit 7e452e50f7d0 · 2024-01-31T07:37:24.000+01:00
diff --git a/externals/cage b/externals/cage
@@ -1 +1 @@
-Subproject commit 586b6e75ad6a1da686c7ed751eefa510de9f353a
+Subproject commit 71fb52e6c7f4caef47216c181a22063208aff52e
diff --git a/sources/main.cpp b/sources/main.cpp
@@ -20,7 +20,7 @@ int main(int argc, const char *args[])
 		engineInitialize(EngineCreateConfig());
 		controlThread().updatePeriod(1000000 / 30);
 
-		const auto closeListener = engineWindow()->events.listen(inputListener<InputClassEnum::WindowClose, InputWindow>([](auto) { engineStop(); }));
+		const auto closeListener = engineWindow()->events.listen(inputFilter([](input::WindowClose) { engineStop(); }));
 		engineWindow()->title("MazeTD");
 		engineAssets()->add(HashString("mazetd/mazetd.pack"));
 
diff --git a/sources/player/buildingsList.cpp b/sources/player/buildingsList.cpp
@@ -9,9 +9,9 @@ namespace mazetd
 {
 	namespace
 	{
-		bool buildingSelectionClick(Entity *e)
+		bool buildingSelectionClick(input::GuiValue in)
 		{
-			playerBuildingSelection = e;
+			playerBuildingSelection = in.entity;
 			engineGuiManager()->focus(0); // defocus to allow using keyboard shortcuts
 			return true;
 		}
@@ -76,9 +76,9 @@ namespace mazetd
 				Entity *e = ents->create(++index);
 				e->value<GuiButtonComponent>();
 				e->value<GuiTextComponent>().value = String(name);
-				e->value<GuiEventComponent>().event.bind<&buildingSelectionClick>();
+				e->value<GuiEventComponent>().event = inputFilter(buildingSelectionClick);
 				e->value<NameComponent>().name = name;
-				e->value<GuiTooltipComponent>().tooltip.bind<&buildingTooltip>();
+				e->value<GuiTooltipComponent>().tooltip.bind<buildingTooltip>();
 				return e;
 			}
 
diff --git a/sources/player/buildingsPlacement.cpp b/sources/player/buildingsPlacement.cpp
@@ -179,7 +179,7 @@ namespace mazetd
 			updateAttacksMods();
 		}
 
-		bool mouseEvent(InputMouse in)
+		bool mouseEvent(auto in)
 		{
 			if (!gameReady || playerCursorTile == m || in.mods != ModifiersFlags::None)
 				return false;
@@ -195,16 +195,7 @@ namespace mazetd
 			return false;
 		}
 
-		EventListener<bool(const GenericInput &)> mousePressListener;
-		EventListener<bool(const GenericInput &)> mouseMoveListener;
-
-		const auto engineInitListener = controlThread().initialize.listen(
-			[]()
-			{
-				mousePressListener.attach(engineWindow()->events);
-				mousePressListener.bind(inputListener<InputClassEnum::MousePress, InputMouse>(&mouseEvent));
-				mouseMoveListener.attach(engineWindow()->events);
-				mouseMoveListener.bind(inputListener<InputClassEnum::MouseMove, InputMouse>(&mouseEvent));
-			});
+		EventListener<bool(const GenericInput &)> mousePressListener = engineEvents().listen(inputFilter(mouseEvent<input::MousePress>), 200);
+		EventListener<bool(const GenericInput &)> mouseMoveListener = engineEvents().listen(inputFilter(mouseEvent<input::MouseMove>), 201);
 	}
 }
diff --git a/sources/player/camera.cpp b/sources/player/camera.cpp
@@ -44,7 +44,7 @@ namespace mazetd
 			return pos - cntr;
 		}
 
-		bool mousePress(InputMouse in)
+		bool mousePress(input::MousePress in)
 		{
 			if (in.buttons != MouseButtonsFlags::Right)
 				return false;
@@ -63,14 +63,14 @@ namespace mazetd
 			playerPanning = false;
 		}
 
-		bool mouseRelease(InputMouse in)
+		bool mouseRelease(input::MouseRelease in)
 		{
 			if (in.buttons == MouseButtonsFlags::Right)
 				stop();
 			return false;
 		}
 
-		bool mouseMove(InputMouse)
+		bool mouseMove(input::MouseMove)
 		{
 			if (!playerPanning)
 				return false;
@@ -87,7 +87,7 @@ namespace mazetd
 			return false;
 		}
 
-		bool mouseWheel(InputMouseWheel in)
+		bool mouseWheel(input::MouseWheel in)
 		{
 			switch (in.mods)
 			{
@@ -108,13 +108,13 @@ namespace mazetd
 			return false;
 		}
 
-		bool focusLose(InputWindow)
+		bool focusLose(input::WindowFocusLose)
 		{
 			stop();
 			return false;
 		}
 
-		bool keyRelease(InputKey in)
+		bool keyRelease(input::KeyPress in)
 		{
 			if (in.key == 'C')
 			{
@@ -125,29 +125,12 @@ namespace mazetd
 			return false;
 		}
 
-		EventListener<bool(const GenericInput &)> mousePressListener;
-		EventListener<bool(const GenericInput &)> mouseReleaseListener;
-		EventListener<bool(const GenericInput &)> mouseMoveListener;
-		EventListener<bool(const GenericInput &)> mouseWheelListener;
-		EventListener<bool(const GenericInput &)> focusloseListener;
-		EventListener<bool(const GenericInput &)> keyReleaseListener;
-
-		const auto engineInitListener = controlThread().initialize.listen(
-			[]()
-			{
-				mousePressListener.attach(engineWindow()->events, 100);
-				mousePressListener.bind(inputListener<InputClassEnum::MousePress, InputMouse>(&mousePress));
-				mouseReleaseListener.attach(engineWindow()->events, 101);
-				mouseReleaseListener.bind(inputListener<InputClassEnum::MouseRelease, InputMouse>(&mouseRelease));
-				mouseMoveListener.attach(engineWindow()->events, 102);
-				mouseMoveListener.bind(inputListener<InputClassEnum::MouseMove, InputMouse>(&mouseMove));
-				mouseWheelListener.attach(engineWindow()->events, 103);
-				mouseWheelListener.bind(inputListener<InputClassEnum::MouseWheel, InputMouseWheel>(&mouseWheel));
-				focusloseListener.attach(engineWindow()->events, 104);
-				focusloseListener.bind(inputListener<InputClassEnum::FocusLose, InputWindow>(&focusLose));
-				keyReleaseListener.attach(engineWindow()->events, 105);
-				keyReleaseListener.bind(inputListener<InputClassEnum::KeyRelease, InputKey>(&keyRelease));
-			});
+		EventListener<bool(const GenericInput &)> mousePressListener = engineEvents().listen(inputFilter(mousePress), 100);
+		EventListener<bool(const GenericInput &)> mouseReleaseListener = engineEvents().listen(inputFilter(mouseRelease), 101);
+		EventListener<bool(const GenericInput &)> mouseMoveListener = engineEvents().listen(inputFilter(mouseMove), 102);
+		EventListener<bool(const GenericInput &)> mouseWheelListener = engineEvents().listen(inputFilter(mouseWheel), 103);
+		EventListener<bool(const GenericInput &)> focusloseListener = engineEvents().listen(inputFilter(focusLose), 104);
+		EventListener<bool(const GenericInput &)> keyReleaseListener = engineEvents().listen(inputFilter(keyRelease), 105);
 
 		const auto engineUpdateListener = controlThread().update.listen(
 			[]()
diff --git a/sources/player/gameSpeed.cpp b/sources/player/gameSpeed.cpp
@@ -10,7 +10,7 @@ namespace mazetd
 {
 	namespace
 	{
-		bool keyPress(InputKey in)
+		bool keyPress(input::KeyPress in)
 		{
 			if (!gameReady)
 				return false;
@@ -35,6 +35,8 @@ namespace mazetd
 			return false;
 		}
 
+		EventListener<bool(const GenericInput &)> keyPressListener = engineEvents().listen(inputFilter(keyPress), 110);
+
 		void gameScheduleAction()
 		{
 			if (!gameReady || gamePaused)
@@ -43,15 +45,11 @@ namespace mazetd
 			eventGameUpdate().dispatch();
 		}
 
-		EventListener<bool(const GenericInput &)> keyPressListener;
 		Holder<Schedule> gameUpdateSchedule;
 
 		const auto engineInitListener = controlThread().initialize.listen(
 			[]()
 			{
-				keyPressListener.attach(engineWindow()->events, 110);
-				keyPressListener.bind(inputListener<InputClassEnum::KeyPress, InputKey>(&keyPress));
-
 				ScheduleCreateConfig cfg;
 				cfg.name = "game update";
 				cfg.type = ScheduleTypeEnum::SteadyPeriodic;
diff --git a/sources/screens/about.cpp b/sources/screens/about.cpp
@@ -26,7 +26,7 @@ namespace mazetd
 		}
 		{
 			auto _ = g->rightRow();
-			g->button().text("Close").event<&setScreenMainmenu>();
+			g->button().text("Close").event(setScreenMainmenu);
 		}
 	}
 }
diff --git a/sources/screens/game.cpp b/sources/screens/game.cpp
@@ -150,7 +150,7 @@ namespace mazetd
 		{ // top bar
 			auto _1 = g->alignment(Vec2(0.5, 0));
 			auto _2 = g->row();
-			g->button().image(HashString("mazetd/gui/menu.png")).event<&setScreenPaused>().size(Vec2(50, 0));
+			g->button().image(HashString("mazetd/gui/menu.png")).event(setScreenPaused).size(Vec2(50, 0));
 			{
 				auto _1 = g->panel();
 				auto _2 = g->row();
diff --git a/sources/screens/lost.cpp b/sources/screens/lost.cpp
@@ -22,6 +22,6 @@ namespace mazetd
 			auto _ = g->panel().text("Game Over");
 			g->label().text(Stringizer() + "Waves: " + SpawningGroup::waveIndex);
 		}
-		g->button().text("Close").event<&buttonStop>();
+		g->button().text("Close").event(buttonStop);
 	}
 }
diff --git a/sources/screens/mainMenu.cpp b/sources/screens/mainMenu.cpp
@@ -19,14 +19,14 @@ namespace mazetd
 			auto _1 = g->alignment(Vec2(0.8, 0.666));
 			auto _2 = g->panel();
 			auto _3 = g->column();
-			g->button().text("Start").event<&setScreenGenerating>();
-			g->button().text("About").event<&setScreenAbout>();
-			g->button().text("Quit").event<&engineStop>();
+			g->button().text("Start").event(setScreenGenerating);
+			g->button().text("About").event(setScreenAbout);
+			g->button().text("Quit").event(engineStop);
 		}
 	}
 
 	namespace
 	{
-		const auto engineInitListener = controlThread().initialize.listen(&setScreenMainmenu, 999);
+		const auto engineInitListener = controlThread().initialize.listen(setScreenMainmenu, 999);
 	}
 }
diff --git a/sources/screens/paused.cpp b/sources/screens/paused.cpp
@@ -23,7 +23,7 @@ namespace mazetd
 		{
 			auto _ = g->panel().text("Pause");
 		}
-		g->button().text("Continue").event<&setScreenGame>();
-		g->button().text("Abort").event<&buttonStop>();
+		g->button().text("Continue").event(setScreenGame);
+		g->button().text("Abort").event(buttonStop);
 	}
 }
diff --git a/sources/screens/won.cpp b/sources/screens/won.cpp
@@ -24,7 +24,7 @@ namespace mazetd
 			auto _ = g->panel().text("Victory");
 			g->label().text(Stringizer() + "Waves: " + SpawningGroup::waveIndex);
 		}
-		g->button().text("Continue").event<&setScreenGame>();
-		g->button().text("Abort").event<&buttonStop>();
+		g->button().text("Continue").event(setScreenGame);
+		g->button().text("Abort").event(buttonStop);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ namespace mazetd`
`9`	`9`	`{`
`10`	`10`	`namespace`
`11`	`11`	`{`
`12`		`- bool buildingSelectionClick(Entity *e)`
	`12`	`+ bool buildingSelectionClick(input::GuiValue in)`
`13`	`13`	`{`
`14`		`- playerBuildingSelection = e;`
	`14`	`+ playerBuildingSelection = in.entity;`
`15`	`15`	`engineGuiManager()->focus(0); // defocus to allow using keyboard shortcuts`
`16`	`16`	`return true;`
`17`	`17`	`}`
`@@ -76,9 +76,9 @@ namespace mazetd`
`76`	`76`	`Entity *e = ents->create(++index);`
`77`	`77`	`e->value<GuiButtonComponent>();`
`78`	`78`	`e->value<GuiTextComponent>().value = String(name);`
`79`		`- e->value<GuiEventComponent>().event.bind<&buildingSelectionClick>();`
	`79`	`+ e->value<GuiEventComponent>().event = inputFilter(buildingSelectionClick);`
`80`	`80`	`e->value<NameComponent>().name = name;`
`81`		`- e->value<GuiTooltipComponent>().tooltip.bind<&buildingTooltip>();`
	`81`	`+ e->value<GuiTooltipComponent>().tooltip.bind<buildingTooltip>();`
`82`	`82`	`return e;`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ namespace mazetd`
`179`	`179`	`updateAttacksMods();`
`180`	`180`	`}`
`181`	`181`
`182`		`- bool mouseEvent(InputMouse in)`
	`182`	`+ bool mouseEvent(auto in)`
`183`	`183`	`{`
`184`	`184`	`if (!gameReady \|\| playerCursorTile == m \|\| in.mods != ModifiersFlags::None)`
`185`	`185`	`return false;`
`@@ -195,16 +195,7 @@ namespace mazetd`
`195`	`195`	`return false;`
`196`	`196`	`}`
`197`	`197`
`198`		`- EventListener<bool(const GenericInput &)> mousePressListener;`
`199`		`- EventListener<bool(const GenericInput &)> mouseMoveListener;`
`200`		`-`
`201`		`- const auto engineInitListener = controlThread().initialize.listen(`
`202`		`- []()`
`203`		`- {`
`204`		`- mousePressListener.attach(engineWindow()->events);`
`205`		`- mousePressListener.bind(inputListener<InputClassEnum::MousePress, InputMouse>(&mouseEvent));`
`206`		`- mouseMoveListener.attach(engineWindow()->events);`
`207`		`- mouseMoveListener.bind(inputListener<InputClassEnum::MouseMove, InputMouse>(&mouseEvent));`
`208`		`- });`
	`198`	`+ EventListener<bool(const GenericInput &)> mousePressListener = engineEvents().listen(inputFilter(mouseEvent<input::MousePress>), 200);`
	`199`	`+ EventListener<bool(const GenericInput &)> mouseMoveListener = engineEvents().listen(inputFilter(mouseEvent<input::MouseMove>), 201);`
`209`	`200`	`}`
`210`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ namespace mazetd`
`44`	`44`	`return pos - cntr;`
`45`	`45`	`}`
`46`	`46`
`47`		`- bool mousePress(InputMouse in)`
	`47`	`+ bool mousePress(input::MousePress in)`
`48`	`48`	`{`
`49`	`49`	`if (in.buttons != MouseButtonsFlags::Right)`
`50`	`50`	`return false;`
`@@ -63,14 +63,14 @@ namespace mazetd`
`63`	`63`	`playerPanning = false;`
`64`	`64`	`}`
`65`	`65`
`66`		`- bool mouseRelease(InputMouse in)`
	`66`	`+ bool mouseRelease(input::MouseRelease in)`
`67`	`67`	`{`
`68`	`68`	`if (in.buttons == MouseButtonsFlags::Right)`
`69`	`69`	`stop();`
`70`	`70`	`return false;`
`71`	`71`	`}`
`72`	`72`
`73`		`- bool mouseMove(InputMouse)`
	`73`	`+ bool mouseMove(input::MouseMove)`
`74`	`74`	`{`
`75`	`75`	`if (!playerPanning)`
`76`	`76`	`return false;`
`@@ -87,7 +87,7 @@ namespace mazetd`
`87`	`87`	`return false;`
`88`	`88`	`}`
`89`	`89`
`90`		`- bool mouseWheel(InputMouseWheel in)`
	`90`	`+ bool mouseWheel(input::MouseWheel in)`
`91`	`91`	`{`
`92`	`92`	`switch (in.mods)`
`93`	`93`	`{`
`@@ -108,13 +108,13 @@ namespace mazetd`
`108`	`108`	`return false;`
`109`	`109`	`}`
`110`	`110`
`111`		`- bool focusLose(InputWindow)`
	`111`	`+ bool focusLose(input::WindowFocusLose)`
`112`	`112`	`{`
`113`	`113`	`stop();`
`114`	`114`	`return false;`
`115`	`115`	`}`
`116`	`116`
`117`		`- bool keyRelease(InputKey in)`
	`117`	`+ bool keyRelease(input::KeyPress in)`
`118`	`118`	`{`
`119`	`119`	`if (in.key == 'C')`
`120`	`120`	`{`
`@@ -125,29 +125,12 @@ namespace mazetd`
`125`	`125`	`return false;`
`126`	`126`	`}`
`127`	`127`
`128`		`- EventListener<bool(const GenericInput &)> mousePressListener;`
`129`		`- EventListener<bool(const GenericInput &)> mouseReleaseListener;`
`130`		`- EventListener<bool(const GenericInput &)> mouseMoveListener;`
`131`		`- EventListener<bool(const GenericInput &)> mouseWheelListener;`
`132`		`- EventListener<bool(const GenericInput &)> focusloseListener;`
`133`		`- EventListener<bool(const GenericInput &)> keyReleaseListener;`
`134`		`-`
`135`		`- const auto engineInitListener = controlThread().initialize.listen(`
`136`		`- []()`
`137`		`- {`
`138`		`- mousePressListener.attach(engineWindow()->events, 100);`
`139`		`- mousePressListener.bind(inputListener<InputClassEnum::MousePress, InputMouse>(&mousePress));`
`140`		`- mouseReleaseListener.attach(engineWindow()->events, 101);`
`141`		`- mouseReleaseListener.bind(inputListener<InputClassEnum::MouseRelease, InputMouse>(&mouseRelease));`
`142`		`- mouseMoveListener.attach(engineWindow()->events, 102);`
`143`		`- mouseMoveListener.bind(inputListener<InputClassEnum::MouseMove, InputMouse>(&mouseMove));`
`144`		`- mouseWheelListener.attach(engineWindow()->events, 103);`
`145`		`- mouseWheelListener.bind(inputListener<InputClassEnum::MouseWheel, InputMouseWheel>(&mouseWheel));`
`146`		`- focusloseListener.attach(engineWindow()->events, 104);`
`147`		`- focusloseListener.bind(inputListener<InputClassEnum::FocusLose, InputWindow>(&focusLose));`
`148`		`- keyReleaseListener.attach(engineWindow()->events, 105);`
`149`		`- keyReleaseListener.bind(inputListener<InputClassEnum::KeyRelease, InputKey>(&keyRelease));`
`150`		`- });`
	`128`	`+ EventListener<bool(const GenericInput &)> mousePressListener = engineEvents().listen(inputFilter(mousePress), 100);`
	`129`	`+ EventListener<bool(const GenericInput &)> mouseReleaseListener = engineEvents().listen(inputFilter(mouseRelease), 101);`
	`130`	`+ EventListener<bool(const GenericInput &)> mouseMoveListener = engineEvents().listen(inputFilter(mouseMove), 102);`
	`131`	`+ EventListener<bool(const GenericInput &)> mouseWheelListener = engineEvents().listen(inputFilter(mouseWheel), 103);`
	`132`	`+ EventListener<bool(const GenericInput &)> focusloseListener = engineEvents().listen(inputFilter(focusLose), 104);`
	`133`	`+ EventListener<bool(const GenericInput &)> keyReleaseListener = engineEvents().listen(inputFilter(keyRelease), 105);`
`151`	`134`
`152`	`135`	`const auto engineUpdateListener = controlThread().update.listen(`
`153`	`136`	`[]()`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace mazetd`
`10`	`10`	`{`
`11`	`11`	`namespace`
`12`	`12`	`{`
`13`		`- bool keyPress(InputKey in)`
	`13`	`+ bool keyPress(input::KeyPress in)`
`14`	`14`	`{`
`15`	`15`	`if (!gameReady)`
`16`	`16`	`return false;`
`@@ -35,6 +35,8 @@ namespace mazetd`
`35`	`35`	`return false;`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ EventListener<bool(const GenericInput &)> keyPressListener = engineEvents().listen(inputFilter(keyPress), 110);`
	`39`	`+`
`38`	`40`	`void gameScheduleAction()`
`39`	`41`	`{`
`40`	`42`	`if (!gameReady \|\| gamePaused)`
`@@ -43,15 +45,11 @@ namespace mazetd`
`43`	`45`	`eventGameUpdate().dispatch();`
`44`	`46`	`}`
`45`	`47`
`46`		`- EventListener<bool(const GenericInput &)> keyPressListener;`
`47`	`48`	`Holder<Schedule> gameUpdateSchedule;`
`48`	`49`
`49`	`50`	`const auto engineInitListener = controlThread().initialize.listen(`
`50`	`51`	`[]()`
`51`	`52`	`{`
`52`		`- keyPressListener.attach(engineWindow()->events, 110);`
`53`		`- keyPressListener.bind(inputListener<InputClassEnum::KeyPress, InputKey>(&keyPress));`
`54`		`-`
`55`	`53`	`ScheduleCreateConfig cfg;`
`56`	`54`	`cfg.name = "game update";`
`57`	`55`	`cfg.type = ScheduleTypeEnum::SteadyPeriodic;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ namespace mazetd`
`26`	`26`	`}`
`27`	`27`	`{`
`28`	`28`	`auto _ = g->rightRow();`
`29`		`- g->button().text("Close").event<&setScreenMainmenu>();`
	`29`	`+ g->button().text("Close").event(setScreenMainmenu);`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ namespace mazetd`
`150`	`150`	`{ // top bar`
`151`	`151`	`auto _1 = g->alignment(Vec2(0.5, 0));`
`152`	`152`	`auto _2 = g->row();`
`153`		`- g->button().image(HashString("mazetd/gui/menu.png")).event<&setScreenPaused>().size(Vec2(50, 0));`
	`153`	`+ g->button().image(HashString("mazetd/gui/menu.png")).event(setScreenPaused).size(Vec2(50, 0));`
`154`	`154`	`{`
`155`	`155`	`auto _1 = g->panel();`
`156`	`156`	`auto _2 = g->row();`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ namespace mazetd`
`22`	`22`	`auto _ = g->panel().text("Game Over");`
`23`	`23`	`g->label().text(Stringizer() + "Waves: " + SpawningGroup::waveIndex);`
`24`	`24`	`}`
`25`		`- g->button().text("Close").event<&buttonStop>();`
	`25`	`+ g->button().text("Close").event(buttonStop);`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,14 @@ namespace mazetd`
`19`	`19`	`auto _1 = g->alignment(Vec2(0.8, 0.666));`
`20`	`20`	`auto _2 = g->panel();`
`21`	`21`	`auto _3 = g->column();`
`22`		`- g->button().text("Start").event<&setScreenGenerating>();`
`23`		`- g->button().text("About").event<&setScreenAbout>();`
`24`		`- g->button().text("Quit").event<&engineStop>();`
	`22`	`+ g->button().text("Start").event(setScreenGenerating);`
	`23`	`+ g->button().text("About").event(setScreenAbout);`
	`24`	`+ g->button().text("Quit").event(engineStop);`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`namespace`
`29`	`29`	`{`
`30`		`- const auto engineInitListener = controlThread().initialize.listen(&setScreenMainmenu, 999);`
	`30`	`+ const auto engineInitListener = controlThread().initialize.listen(setScreenMainmenu, 999);`
`31`	`31`	`}`
`32`	`32`	`}`