ofMainloop cleanup (#7357)

#changelog #core

Author: dimitre

libs/openFrameworks/app/ofMainLoop.cpp

@@ -5,10 +5,11 @@
  *      Author: arturo
  */
 
-#include <ofMainLoop.h>
+#include "ofMainLoop.h"
 #include "ofWindowSettings.h"
 #include "ofAppBaseWindow.h"
 #include "ofBaseApp.h"
+#include "ofConstants.h"
 
 //========================================================================
 // default windowing
@@ -67,6 +68,23 @@ std::shared_ptr<ofAppBaseWindow> ofMainLoop::createWindow(const ofWindowSettings
 	return window;
 }
 
+template<typename Window>
+void ofMainLoop::addWindow(const std::shared_ptr<Window> & window){
+	allowMultiWindow = Window::allowsMultiWindow();
+	if(Window::doesLoop()){
+		windowLoop = Window::loop;
+	}
+	if(Window::needsPolling()){
+		windowPollEvents = Window::pollEvents;
+	}
+	if(!allowMultiWindow){
+		windowsApps.clear();
+	}
+	windowsApps[window] = std::shared_ptr<ofBaseApp>();
+	currentWindow = window;
+	ofAddListener(window->events().keyPressed,this,&ofMainLoop::keyPressed);
+}
+
 void ofMainLoop::run(const std::shared_ptr<ofAppBaseWindow> & window, std::shared_ptr<ofBaseApp> && app){
 	windowsApps[window] = app;
 	if(app){
@@ -162,7 +180,7 @@ void ofMainLoop::exit(){
 	for(auto i: windowsApps){
 		std::shared_ptr<ofAppBaseWindow> window = i.first;
 		std::shared_ptr<ofBaseApp> app = i.second;
-		
+
 		if(window == nullptr) {
 			continue;
 		}
@@ -260,5 +278,5 @@ void ofMainLoop::setEscapeQuitsLoop(bool quits){
 void ofMainLoop::keyPressed(ofKeyEventArgs & key){
 	if (key.key == OF_KEY_ESC && escapeQuits == true){				// "escape"
 		shouldClose(0);
-    }
+	}
 }

libs/openFrameworks/app/ofMainLoop.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "ofConstants.h"
 #include "ofEvents.h"
 #include <map>
 
@@ -15,21 +14,7 @@ class ofMainLoop {
 
 	std::shared_ptr<ofAppBaseWindow> createWindow(const ofWindowSettings & settings);
 	template<typename Window>
-	void addWindow(const std::shared_ptr<Window> & window){
-		allowMultiWindow = Window::allowsMultiWindow();
-		if(Window::doesLoop()){
-		    windowLoop = Window::loop;
-		}
-		if(Window::needsPolling()){
-			windowPollEvents = Window::pollEvents;
-		}
-		if(!allowMultiWindow){
-		    windowsApps.clear();
-		}
-		windowsApps[window] = std::shared_ptr<ofBaseApp>();
-		currentWindow = window;
-		ofAddListener(window->events().keyPressed,this,&ofMainLoop::keyPressed);
-	}
+	void addWindow(const std::shared_ptr<Window> & window);
 
 	void run(const std::shared_ptr<ofAppBaseWindow> & window, std::shared_ptr<ofBaseApp> && app);
 	void run(std::shared_ptr<ofBaseApp> && app);
@@ -48,7 +33,7 @@ class ofMainLoop {
 	ofEvent<void> loopEvent;
 private:
 	void keyPressed(ofKeyEventArgs & key);
-	std::map<std::shared_ptr<ofAppBaseWindow>,std::shared_ptr<ofBaseApp> > windowsApps;
+	std::map<std::shared_ptr<ofAppBaseWindow>, std::shared_ptr<ofBaseApp> > windowsApps;
 	bool bShouldClose;
 	std::weak_ptr<ofAppBaseWindow> currentWindow;
 	int status;

libs/openFrameworks/app/ofWindowSettings.h

@@ -1,5 +1,4 @@
 #pragma once
-#include "ofConstants.h"
 #include "glm/vec2.hpp"