Minor fixes and improvements on settings

.github/workflows/build.yml

@@ -86,8 +86,10 @@ jobs:
               uses: actions/checkout@v1
             - name: Checkout submodules
               run: git submodule update --init --recursive
+            - name: brew update
+              run: brew update
             - name: Install packages
-              run: brew install cmake freetype libvorbis sdl2 libpng jpeg libarchive
+              run: brew install freetype libvorbis sdl2 libpng jpeg libarchive
             - name: cmake
               run: cmake . -DLibArchive_LIBRARY=/usr/local/opt/libarchive/lib/libarchive.dylib -DLibArchive_INCLUDE_DIR=/usr/local/opt/libarchive/include -DCMAKE_BUILD_TYPE=Release
             - name: make

Audio/CMakeLists.txt

@@ -60,3 +60,8 @@ target_link_libraries(Audio ${OGG_LIBRARIES})
 target_link_libraries(Audio ${Vorbis_LIBRARIES})
 
 target_link_libraries(Audio cc-common)
+
+# Enable multiprocess compiling
+if(MSVC)
+    target_compile_options(Audio PRIVATE /MP)
+endif(MSVC)

Beatmap/CMakeLists.txt

@@ -24,7 +24,7 @@ source_group("" FILES ${PCH_FILES})
 enable_precompiled_headers("${BEATMAP_SRC}" ${PCH_SRC})
 
 add_library(Beatmap ${BEATMAP_SRC} ${PCH_FILES})
-target_compile_features(Beatmap PUBLIC cxx_std_14)
+target_compile_features(Beatmap PUBLIC cxx_std_17)
 target_include_directories(Beatmap PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
 target_include_directories(Beatmap PRIVATE
     ${INCROOT}
@@ -42,3 +42,8 @@ target_link_libraries(Beatmap sqlite3)
 target_link_libraries(Beatmap nlohmann_json)
 
 target_link_libraries(Beatmap cc-common)
+
+# Enable multiprocess compiling
+if(MSVC)
+    target_compile_options(Beatmap PRIVATE /MP)
+endif(MSVC)

Beatmap/src/MapDatabase.cpp

@@ -414,7 +414,7 @@ class MapDatabase_Impl
 			if (gotVersion == 18)
 			{
 				m_database.Exec("ALTER TABLE Scores ADD COLUMN window_slam INTEGER");
-				m_database.Exec("UPDATE Scores SET window_miss=75");
+				m_database.Exec("UPDATE Scores SET window_slam=84");
 				gotVersion = 19;
 			}
 			m_database.Exec(Utility::Sprintf("UPDATE Database SET `version`=%d WHERE `rowid`=1", m_version));

GUI/CMakeLists.txt

@@ -22,7 +22,7 @@ source_group("" FILES ${PCH_FILES})
 enable_precompiled_headers("${GUI_SRC}" ${PCH_SRC})
 
 add_library(GUI ${GUI_SRC} ${PCH_FILES})
-target_compile_features(GUI PUBLIC cxx_std_14)
+target_compile_features(GUI PUBLIC cxx_std_17)
 target_include_directories(GUI PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
 target_include_directories(GUI PRIVATE
     ${SRCROOT}
@@ -37,3 +37,8 @@ target_link_libraries(GUI Graphics)
 target_link_libraries(GUI lua)
 
 target_link_libraries(GUI cc-common)
+
+# Enable multiprocess compiling
+if(MSVC)
+    target_compile_options(GUI PRIVATE /MP)
+endif(MSVC)

Graphics/CMakeLists.txt

@@ -22,7 +22,7 @@ source_group("" FILES ${PCH_FILES})
 enable_precompiled_headers("${GRAPHICS_SRC}" ${PCH_SRC})
 
 add_library(Graphics ${GRAPHICS_SRC} ${PCH_FILES})
-target_compile_features(Graphics PUBLIC cxx_std_14)
+target_compile_features(Graphics PUBLIC cxx_std_17)
 target_include_directories(Graphics PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
 target_include_directories(Graphics PRIVATE
     ${INCROOT}
@@ -58,3 +58,8 @@ if(UNIX)
 endif(UNIX)
 
 target_link_libraries(Graphics cc-common)
+
+# Enable multiprocess compiling
+if(MSVC)
+    target_compile_options(Graphics PRIVATE /MP)
+endif(MSVC)

Graphics/include/Graphics/Window.hpp

@@ -5,13 +5,13 @@
 
 namespace Graphics
 {
-	// Windowed or bordered window style
+	/// Windowed or bordered window style
 	enum class WindowStyle
 	{
 		Windowed, Borderless
 	};
 
-	// Text input data
+	/// Text input data
 	struct TextComposition
 	{
 		String composition;
@@ -26,6 +26,39 @@ namespace Graphics
 	class Window : Unique
 	{
 	public:
+		/// Window position and size parameter
+		struct PosAndShape
+		{
+			enum class Mode { Windowed, Fullscreen, WindowedFullscreen };
+			Mode mode;
+
+			PosAndShape(bool fullscreen, bool windowedFullscreen, const Vector2i& pos, const Vector2i& size, int32 monitorId, const Vector2i& fullscreenSize)
+				: PosAndShape(FlagsToMode(fullscreen, windowedFullscreen), pos, size, monitorId, fullscreenSize) {}
+
+			PosAndShape(Mode mode, const Vector2i& pos, const Vector2i& size, int32 monitorId, const Vector2i& fullscreenSize)
+				: mode(mode), windowPos(pos), windowSize(size), monitorId(monitorId), fullscreenSize(fullscreenSize){}
+
+			inline static Mode FlagsToMode(bool fullscreen, bool windowedFullscreen)
+			{
+				return fullscreen ? windowedFullscreen ? Mode::WindowedFullscreen : Mode::Fullscreen : Mode::Windowed;
+			}
+
+			inline void SetMode(bool fullscreen, bool windowedFullscreen)
+			{
+				mode = FlagsToMode(fullscreen, windowedFullscreen);
+			}
+
+			/// Position of the window; ignored when in fullscreen mode
+			Vector2i windowPos;
+			/// Size of the window; ignored when in fullscreen mode
+			Vector2i windowSize;
+
+			/// Monitor to use when in fullscreen; ignored when in windowed mode
+			int32 monitorId;
+			/// Only used for windowed fullscreen mode
+			Vector2i fullscreenSize;
+		};
+
 		Window(Vector2i size = Vector2i(800, 600), uint8 samplecount = 0);
 		~Window();
 		// Show the window
@@ -56,8 +89,6 @@ namespace Graphics
 
 		// Get full window position
 		Vector2i GetWindowPos() const;
-		// Set full window position
-		void SetWindowPos(const Vector2i& pos);
 
 		// Window Client area size
 		Vector2i GetWindowSize() const;
@@ -67,9 +98,9 @@ namespace Graphics
 
 		// Window is active
 		bool IsActive() const;
+
 		// Set window client area size
-		void SetWindowSize(const Vector2i& size);
-		void SwitchFullscreen(int w, int h, int fsw = -1, int fsh = -1, uint32 monitorID = -1, bool windowedFullscreen = false);
+		void SetPosAndShape(const PosAndShape& posAndShape, bool ensureInBound);
 		bool IsFullscreen() const;
 
 		int GetDisplayIndex() const;
@@ -118,6 +149,7 @@ namespace Graphics
 		Delegate<const String&> OnTextInput;
 		Delegate<const TextComposition&> OnTextComposition;
 		Delegate<const Vector2i&> OnResized;
+		Delegate<const Vector2i&> OnMoved;
 		Delegate<bool> OnFocusChanged;
 
 	private: