diff options
| author | Loek Le Blansch <loek@pipeframe.xyz> | 2024-11-15 20:03:51 +0100 | 
|---|---|---|
| committer | Loek Le Blansch <loek@pipeframe.xyz> | 2024-11-15 20:03:51 +0100 | 
| commit | 9f6475e7b0698c414138e2a8140b47f01ce9c5d1 (patch) | |
| tree | 3dd74938da60a0de1a77360280c15ff8949d02cf /mwe/events/src/loopManager.cpp | |
| parent | 424611c6016e4a189e3a887fabe8e45b637e80f4 (diff) | |
| parent | b597af6c64ccf50c7f92a2b78e7950ee3ab230f7 (diff) | |
Merge branch 'loek/wrap'
Diffstat (limited to 'mwe/events/src/loopManager.cpp')
| -rw-r--r-- | mwe/events/src/loopManager.cpp | 21 | 
1 files changed, 8 insertions, 13 deletions
| diff --git a/mwe/events/src/loopManager.cpp b/mwe/events/src/loopManager.cpp index 0b7d888..c58a5e7 100644 --- a/mwe/events/src/loopManager.cpp +++ b/mwe/events/src/loopManager.cpp @@ -1,8 +1,7 @@  #include "loopManager.h"  LoopManager::LoopManager() : inputSystem(std::make_unique<InputSystem>()) { -	shutdownHandler -		= [this](const ShutDownEvent & event) { this->onShutdown(event); }; +	shutdownHandler = [this](const ShutDownEvent & event) { this->onShutdown(event); };  	subscribe(shutdownHandler);  }  void LoopManager::processInput() { @@ -63,17 +62,15 @@ void LoopManager::setup() {  	subscribe<KeyPressedEvent>(callback, false);  	EventHandler<MousePressedEvent> mouseCallback = onMouse;  	subscribe<MousePressedEvent>(mouseCallback, false); -	EventHandler<KeyPressedEvent> closeWindowCallback -		= [this](const KeyPressedEvent & e) { -			  if (e.getKeyCode() == Escape) { -				  this->setRunning(false); -			  } -		  }; +	EventHandler<KeyPressedEvent> closeWindowCallback = [this](const KeyPressedEvent & e) { +		if (e.getKeyCode() == Escape) { +			this->setRunning(false); +		} +	};  	subscribe<KeyPressedEvent>(closeWindowCallback, false);  	Button * testButton = new Button(200, 200);  	testButton->color = {100, 0, 100}; -	testButton->onClick -		= []() { std::cout << "Button was clicked" << std::endl; }; +	testButton->onClick = []() { std::cout << "Button was clicked" << std::endl; };  	testButton->x = 200;  	testButton->y = 200;  	inputSystem->registerButton(testButton); @@ -93,9 +90,7 @@ void LoopManager::render() {  		window.renderUIObjects();  	}  } -void LoopManager::onShutdown(const ShutDownEvent & e) { -	this->gameRunning = false; -} +void LoopManager::onShutdown(const ShutDownEvent & e) { this->gameRunning = false; }  void LoopManager::update() {  	//fprintf(stderr, "**********normal update********** \n");  	LoopTimer & timer = LoopTimer::getInstance(); |