Create LICENSE

updated submodule

.gitattributes

@@ -61,3 +61,5 @@
 #*.PDF   diff=astextplain
 #*.rtf   diff=astextplain
 #*.RTF   diff=astextplain
+
+lib/** linguist-vendored

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "lib/osmparser"]
-	path = lib/osmparser
+	path = vendor/osmparser
 	url = https://github.com/Lauchmelder23/OSMParser
+[submodule "vendor/glfw"]
+	path = vendor/glfw
+	url = git@github.com:glfw/glfw.git

CMakeLists.txt

@@ -5,40 +5,10 @@ cmake_minimum_required (VERSION 3.8)
 
 project ("MapViewer")
 
-find_package(SDL2 CONFIG REQUIRED)
-find_package(SDL2-GFX CONFIG REQUIRED)
-
 # Include sub-projects.
-add_subdirectory ("lib/osmparser")
-add_subdirectory ("lib/triangle")
+add_subdirectory ("vendor/osmparser")
+add_subdirectory ("vendor/triangle")
+add_subdirectory ("vendor/glad")
+add_subdirectory ("vendor/glfw")
 
-file(GLOB_RECURSE SOURCE_FILES
-	"src/*.cpp"
-)
-
-file(GLOB_RECURSE INCLUDE_FILES
-	"include/*.hpp"
-)
-
-add_executable(mapviewer 
-	${INCLUDE_FILES} ${SOURCE_FILES}
-)
-
-target_include_directories(mapviewer PRIVATE 
-	osmp 
-	triangle
-	SDL2::SDL2 SDL2::SDL2_gfx
-)
-
-target_link_libraries(mapviewer PRIVATE 
-	osmp
-	triangle
-	SDL2::SDL2 SDL2::SDL2main SDL2::SDL2_gfx
-)
-
-add_custom_command(TARGET mapviewer POST_BUILD 
-	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/res/map.osm $<TARGET_FILE_DIR:mapviewer>
-	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/res/bigmap.osm $<TARGET_FILE_DIR:mapviewer>
-	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/res/leipzig.osm $<TARGET_FILE_DIR:mapviewer>
-	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/res/jp.osm $<TARGET_FILE_DIR:mapviewer>
-)
+add_subdirectory ("src")

CMakeSettings.json

@@ -9,8 +9,7 @@
       "installRoot": "${projectDir}\\out\\install\\${name}",
       "cmakeCommandArgs": "",
       "buildCommandArgs": "",
-      "ctestCommandArgs": "",
-      "cmakeToolchain": "C:/Users/Robert/source/repos/vcpkg/scripts/buildsystems/vcpkg.cmake"
+      "ctestCommandArgs": ""
     },
     {
       "name": "x64-Release",
@@ -22,8 +21,7 @@
       "buildCommandArgs": "",
       "ctestCommandArgs": "",
       "cmakeToolchain": "C:/Users/Robert/source/repos/vcpkg/scripts/buildsystems/vcpkg.cmake",
-      "inheritEnvironments": [ "msvc_x64_x64" ],
-      "variables": []
+      "inheritEnvironments": [ "msvc_x64_x64" ]
     }
   ]
 }

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

lib/osmparser

@@ -1 +0,0 @@
-Subproject commit 00bc940cffaa90750ad43f51515cd650f5a8474f

lib/triangle/CMakeLists.txt

@@ -1,22 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-
-file(GLOB_RECURSE CPP_FILES 
-	"src/*.c"
-)
-
-file(GLOB_RECURSE HPP_FILES 
-	"include/*.h"
-)
-
-SET_SOURCE_FILES_PROPERTIES( ${CPP_FILES} PROPERTIES LANGUAGE CXX )
-
-add_library(triangle STATIC 
-	${CPP_FILES} ${HPP_FILES}
-)
-
-target_include_directories(triangle PUBLIC 
-	include 
-	${TINYXML2_INCLUDE_DIR}
-)
-
-target_compile_definitions(triangle PUBLIC NO_TIMER TRILIBRARY REDUCED DCT_ONLY ANSI_DECLARATORS)

src/CMakeLists.txt

@@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 3.10)
+
+add_executable(mapviewer
+    main.cpp
+    Multipolygon.cpp
+	Window.cpp
+)
+
+target_link_libraries(mapviewer PRIVATE 
+	osmparser
+	triangle
+	glfw
+    glad
+)
+
+add_custom_command(TARGET mapviewer POST_BUILD 
+	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/res/map.osm $<TARGET_FILE_DIR:mapviewer>
+	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/res/bigmap.osm $<TARGET_FILE_DIR:mapviewer>
+	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/res/leipzig.osm $<TARGET_FILE_DIR:mapviewer>
+	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/res/jp.osm $<TARGET_FILE_DIR:mapviewer>
+)

src/Window.cpp

@@ -0,0 +1,56 @@
+#include "Window.hpp"
+
+#include <stdexcept>
+#include <glad/glad.h>
+#include <glfw/glfw3.h>
+
+void Window::PollEvents()
+{
+	glfwPollEvents();
+}
+
+void Window::Init()
+{
+	glfwInit();
+}
+
+Window::Window(const Vector2i& size, const std::string& title)
+{
+	handle = glfwCreateWindow(size.x, size.y, title.c_str(), NULL, NULL);
+	if (!handle)
+		throw std::runtime_error("Failed to create window");
+
+	glfwMakeContextCurrent(handle);
+
+	if (!gladLoadGLLoader((GLADloadproc)glfwGetProcAddress))
+		throw std::runtime_error("Failed to load GL loader");
+
+	glViewport(0, 0, size.x, size.y);
+}
+
+Window::~Window()
+{
+	if(handle)
+		glfwDestroyWindow(handle);
+}
+
+Window::operator bool() const
+{
+	return !(bool)glfwWindowShouldClose(handle);
+}
+
+void Window::Close()
+{
+	glfwSetWindowShouldClose(handle, true);
+}
+
+void Window::Clear(float r, float g, float b, float a)
+{
+	glClearColor(r, g, b, a);
+	glClear(GL_COLOR_BUFFER_BIT);
+}
+
+void Window::SwapBuffers()
+{
+	glfwSwapBuffers(handle);
+}

src/Window.hpp

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <string>
+#include "vector2.hpp"
+
+struct GLFWwindow;
+
+class Window
+{
+public:
+	static void PollEvents();
+	static void Init();
+
+public:
+	Window(const Vector2i& size, const std::string& title);
+	~Window();
+
+	operator bool() const;
+
+	void Close();
+	void Clear(float r, float g, float b, float a);
+	void SwapBuffers();
+
+private:
+	GLFWwindow* handle;
+};

src/main.cpp

@@ -4,9 +4,8 @@
 #include <algorithm>
 
 #include <osmp.hpp>
-#include <SDL.h>
-#include <SDL2_gfxPrimitives.h>
-#include <../include/multipolygon.hpp>
+#include "multipolygon.hpp"
+#include "Window.hpp"
 
 // Map values from one interval [A, B] to another [a, b]
 inline float Map(float A, float B, float a, float b, float x);
@@ -14,33 +13,30 @@ inline float Map(float A, float B, float a, float b, float x);
 typedef struct sArea
 {
 	size_t   length;
-	Uint8 r = 0;
-	Uint8 g = 0;
-	Uint8 b = 10;
-	Sint16* x;
-	Sint16* y;
+	uint8_t  r = 0;
+	uint8_t  g = 0;
+	uint8_t  b = 10;
+	int16_t* x;
+	int16_t* y;
 } Area;
 
 typedef struct sHighway
 {
 	size_t length;
-	Uint8 r, g, b;
-	SDL_FPoint* points;
+	uint8_t r, g, b;
+	Vector2f* points;
 } Highway;
 
 int main(int argc, char** argv)
 {
-	SDL_Init(SDL_INIT_VIDEO);
-	// Load map data and calculate window size
-	SDL_DisplayMode DM;
-	SDL_GetCurrentDisplayMode(0, &DM);
+	Window::Init();
 
 	std::cout << "Loading and parsing OSM XML file. This might take a bit..." << std::flush;
 	osmp::Object* obj = new osmp::Object("leipzig.osm");
 	std::cout << "Done!" << std::endl;
 	osmp::Bounds bounds = obj->bounds;
 	float aspectRatio = (float)(bounds.maxlon - bounds.minlon) / (float)(bounds.maxlat - bounds.minlat);
-	int windowHeight = DM.h - 100;
+	int windowHeight = 900 - 100;
 	int windowWidth = windowHeight * aspectRatio;
 
 	// Fetch all the ways
@@ -63,8 +59,8 @@ int main(int argc, char** argv)
 
 			Area area;
 			area.length = nodes.size();
-			area.x = new Sint16[area.length];
-			area.y = new Sint16[area.length];
+			area.x = new int16_t[area.length];
+			area.y = new int16_t[area.length];
 
 			area.r = 150;
 			area.g = 150;
@@ -82,7 +78,7 @@ int main(int argc, char** argv)
 		{
 			Highway highway;
 			highway.length = nodes.size();
-			highway.points = new SDL_FPoint[highway.length];
+			highway.points = new Vector2f[highway.length];
 
 			for (int i = 0; i < highway.length; i++)
 			{
@@ -104,7 +100,7 @@ int main(int argc, char** argv)
 		{
 			Highway railway;
 			railway.length = nodes.size();
-			railway.points = new SDL_FPoint[railway.length];
+			railway.points = new Vector2f[railway.length];
 
 			for (int i = 0; i < railway.length; i++)
 			{
@@ -139,65 +135,39 @@ int main(int argc, char** argv)
 	delete obj;
 
 	// Create Window + Renderer
-	SDL_Window* window = SDL_CreateWindow("MapViewer", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, windowWidth, windowHeight, SDL_WINDOW_SHOWN);
-	if (window == nullptr)
-	{
-		std::cerr << "Failed to create Window" << std::endl;
-		return 1;
-	}
-
-	SDL_Renderer* renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_SOFTWARE);
-	if (renderer == nullptr)
-	{
-		std::cerr << "Failed to create renderer" << std::endl;
-		return 1;
-	}
+	Window window(Vector2i{ 1280, 800 }, "Map Viewer");
 
 	// Window loop
-	bool isOpen = true;
-	SDL_Event e;
-	while (isOpen)
+	while ((bool)window)
 	{
-		while (SDL_PollEvent(&e))
-		{
-			if (e.type == SDL_WINDOWEVENT)
-			{
-				switch (e.window.event)
-				{
-				case SDL_WINDOWEVENT_CLOSE:
-					isOpen = false;
-					break;
-				}
-			}
-		}
+		Window::PollEvents();
 
-		SDL_SetRenderDrawColor(renderer, 240, 240, 250, 255);
-		SDL_RenderClear(renderer);
+		window.Clear(0.2f, 0.0f, 0.2f, 1.0f);
 		
 		 for (Multipolygon& multipolygon : multipolygons) {
-			multipolygon.Draw(renderer);
+			// multipolygon.Draw(renderer);
 		 }
 
 		for (Area& area : buildings)
 		{
-			filledPolygonRGBA(renderer, area.x, area.y, area.length, area.r, area.g, area.b, 255);
+			// filledPolygonRGBA(renderer, area.x, area.y, area.length, area.r, area.g, area.b, 255);
 		}
 
 		for (Highway& highway : highways)
 		{
-			SDL_SetRenderDrawColor(renderer, highway.r, highway.g, highway.b, 255);
-			SDL_RenderDrawLinesF(renderer, highway.points, highway.length);
+			// SDL_SetRenderDrawColor(renderer, highway.r, highway.g, highway.b, 255);
+			// SDL_RenderDrawLinesF(renderer, highway.points, highway.length);
 		}
 		
 
-		SDL_RenderPresent(renderer);
+		window.SwapBuffers();
 	}
 
 	// Cleanup time
-	SDL_DestroyRenderer(renderer);
-	SDL_DestroyWindow(window);
+	// SDL_DestroyRenderer(renderer);
+	// SDL_DestroyWindow(window);
 
-	SDL_Quit();
+	// SDL_Quit();
 
 	for (Area& area : buildings) {
 		delete[] area.x;

src/multipolygon.cpp

@@ -1,4 +1,4 @@
-#include "..\include\multipolygon.hpp"
+#include "Multipolygon.hpp"
 
 #include <vector>
 #include <array>
@@ -7,10 +7,7 @@
 #include <iostream>
 
 #include <triangle.h>
-#include <osmway.hpp>
-#include <osmnode.hpp>
-#include <SDL.h>
-#include <SDL2_gfxPrimitives.h>
+#include <osmp.hpp>
 
 #define BREAKIF(x) if(relation->id == x) __debugbreak()
 #define INDEXOF(x, y, n) (y * n + x)
@@ -38,19 +35,19 @@ inline double Map(double A, double B, double a, double b, double x)
 }
 
 // TODO: Implement better algorithm
-[[nodiscard]] bool Intersect(double p1_x, double p1_y, double p2_x, double p2_y, double q1_x, double q1_y, double q2_x, double q2_y);
-[[nodiscard]] bool Intersect(const osmp::Node& p1, const osmp::Node& p2, const osmp::Node& q1, const osmp::Node& q2);
-[[nodiscard]] bool SelfIntersecting(const Ring& ring);
+bool Intersect(double p1_x, double p1_y, double p2_x, double p2_y, double q1_x, double q1_y, double q2_x, double q2_y);
+bool Intersect(const osmp::Node& p1, const osmp::Node& p2, const osmp::Node& q1, const osmp::Node& q2);
+bool SelfIntersecting(const Ring& ring);
 
-[[nodiscard]] bool BuildRing(Ring& ring, osmp::MemberWays& unassigned, int ringCount);
-[[nodiscard]] bool AssignRings(std::vector<Ring>& rings, const osmp::MemberWays& members);
+bool BuildRing(Ring& ring, osmp::MemberWays& unassigned, int ringCount);
+bool AssignRings(std::vector<Ring>& rings, const osmp::MemberWays& members);
 
 void FindAllContainedRings(const std::vector<bool>& containmentMatrix, int container, int numRings, std::vector<int>& buffer);
 void FindAllContainedRingsThatArentContainedByUnusedRings(const std::vector<bool>& containmentMatrix, int container, int numRings, const std::vector<Ring>& unusedRings, std::vector<int>& buffer);
-[[nodiscard]] int FindUncontainedRing(const std::vector<bool>& containmentMatrix, int rings, const std::vector<Ring>& unusedRings);
-[[nodiscard]] bool PointInsideRing(const Ring& ring, const osmp::Node& point);
-[[nodiscard]] bool IsRingContained(const Ring& r1, const Ring& r2);
-[[nodiscard]] bool GroupRings(std::vector<RingGroup>& ringGroup, std::vector<Ring>& rings);
+int  FindUncontainedRing(const std::vector<bool>& containmentMatrix, int rings, const std::vector<Ring>& unusedRings);
+bool PointInsideRing(const Ring& ring, const osmp::Node& point);
+bool IsRingContained(const Ring& r1, const Ring& r2);
+bool GroupRings(std::vector<RingGroup>& ringGroup, std::vector<Ring>& rings);
 
 Multipolygon::Multipolygon(const osmp::Relation& relation, int width, int height, const osmp::Bounds& bounds) :
 	r(255), g(0), b(255), visible(true), rendering(RenderType::FILL), id(relation->id)
@@ -557,7 +554,7 @@ void Multipolygon::SetColor(int r, int g, int b)
 	this->b = b;
 }
 
-void Multipolygon::Draw(SDL_Renderer* renderer)
+void Multipolygon::Draw()
 {
 	if (!visible)
 		return;
@@ -580,23 +577,23 @@ void Multipolygon::Draw(SDL_Renderer* renderer)
 			for (int i = 0; i < polygon.indices.size(); i += 3)	// Be a graphics card
 			{
 
-				filledTrigonRGBA(renderer,
+				/*filledTrigonRGBA(renderer,
 					polygon.vertices[polygon.indices[i + 0]].x, polygon.vertices[polygon.indices[i + 0]].y,
 					polygon.vertices[polygon.indices[i + 1]].x, polygon.vertices[polygon.indices[i + 1]].y,
 					polygon.vertices[polygon.indices[i + 2]].x, polygon.vertices[polygon.indices[i + 2]].y,
 					r, g, b, 255
-				);
+				);*/
 			}
 			break;
 
 		case RenderType::OUTLINE:
 			for(int i = 0; i < polygon.segments.size(); i += 2)
 			{
-				thickLineRGBA(renderer,
+				/*thickLineRGBA(renderer,
 					polygon.vertices[polygon.segments[i + 0]].x, polygon.vertices[polygon.segments[i + 0]].y,
 					polygon.vertices[polygon.segments[i + 1]].x, polygon.vertices[polygon.segments[i + 1]].y,
 					5, r, g, b, 255
-				);
+				);*/
 			}
 			break;
 
@@ -604,21 +601,21 @@ void Multipolygon::Draw(SDL_Renderer* renderer)
 			for (int i = 0; i < polygon.indices.size(); i += 3)	// Be a graphics card
 			{
 
-				filledTrigonRGBA(renderer,
+				/*filledTrigonRGBA(renderer,
 					polygon.vertices[polygon.indices[i + 0]].x, polygon.vertices[polygon.indices[i + 0]].y,
 					polygon.vertices[polygon.indices[i + 1]].x, polygon.vertices[polygon.indices[i + 1]].y,
 					polygon.vertices[polygon.indices[i + 2]].x, polygon.vertices[polygon.indices[i + 2]].y,
 					r, g, b, 255
-				);
+				);*/
 			}
 
 			for (int i = 0; i < polygon.segments.size(); i += 2)
 			{
-				lineRGBA(renderer,
+				/*lineRGBA(renderer,
 					polygon.vertices[polygon.segments[i + 0]].x, polygon.vertices[polygon.segments[i + 0]].y,
 					polygon.vertices[polygon.segments[i + 1]].x, polygon.vertices[polygon.segments[i + 1]].y,
 					10, 10, 15, 255
-				);
+				);*/
 			}
 			break;
 		}

src/multipolygon.hpp

@@ -2,10 +2,7 @@
 
 #include <memory>
 
-#include <osmrelation.hpp>
-
-struct SDL_FPoint;
-struct SDL_Renderer;
+#include <osmp.hpp>
 
 class Multipolygon
 {
@@ -13,7 +10,7 @@ public:
 	Multipolygon(const osmp::Relation& relation, int width, int height, const osmp::Bounds& bounds);
 
 	void SetColor(int r, int g, int b);
-	void Draw(SDL_Renderer* renderer);
+	void Draw();
 
 	bool operator < (const Multipolygon& other) const {
 		return (rendering < other.rendering);

src/vector2.hpp

@@ -0,0 +1,8 @@
+template<typename T>
+struct Vector2D
+{
+	T x, y;
+};
+
+typedef Vector2D<float> Vector2f;
+typedef Vector2D<int>   Vector2i;

vendor/glad/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.10)
+
+add_library(glad STATIC
+    src/glad.c
+)
+
+target_include_directories(glad PUBLIC
+    include
+)

vendor/glad/include/KHR/khrplatform.h

@@ -0,0 +1,311 @@
+#ifndef __khrplatform_h_
+#define __khrplatform_h_
+
+/*
+** Copyright (c) 2008-2018 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/* Khronos platform-specific types and definitions.
+ *
+ * The master copy of khrplatform.h is maintained in the Khronos EGL
+ * Registry repository at https://github.com/KhronosGroup/EGL-Registry
+ * The last semantic modification to khrplatform.h was at commit ID:
+ *      67a3e0864c2d75ea5287b9f3d2eb74a745936692
+ *
+ * Adopters may modify this file to suit their platform. Adopters are
+ * encouraged to submit platform specific modifications to the Khronos
+ * group so that they can be included in future versions of this file.
+ * Please submit changes by filing pull requests or issues on
+ * the EGL Registry repository linked above.
+ *
+ *
+ * See the Implementer's Guidelines for information about where this file
+ * should be located on your system and for more details of its use:
+ *    http://www.khronos.org/registry/implementers_guide.pdf
+ *
+ * This file should be included as
+ *        #include <KHR/khrplatform.h>
+ * by Khronos client API header files that use its types and defines.
+ *
+ * The types in khrplatform.h should only be used to define API-specific types.
+ *
+ * Types defined in khrplatform.h:
+ *    khronos_int8_t              signed   8  bit
+ *    khronos_uint8_t             unsigned 8  bit
+ *    khronos_int16_t             signed   16 bit
+ *    khronos_uint16_t            unsigned 16 bit
+ *    khronos_int32_t             signed   32 bit
+ *    khronos_uint32_t            unsigned 32 bit
+ *    khronos_int64_t             signed   64 bit
+ *    khronos_uint64_t            unsigned 64 bit
+ *    khronos_intptr_t            signed   same number of bits as a pointer
+ *    khronos_uintptr_t           unsigned same number of bits as a pointer
+ *    khronos_ssize_t             signed   size
+ *    khronos_usize_t             unsigned size
+ *    khronos_float_t             signed   32 bit floating point
+ *    khronos_time_ns_t           unsigned 64 bit time in nanoseconds
+ *    khronos_utime_nanoseconds_t unsigned time interval or absolute time in
+ *                                         nanoseconds
+ *    khronos_stime_nanoseconds_t signed time interval in nanoseconds
+ *    khronos_boolean_enum_t      enumerated boolean type. This should
+ *      only be used as a base type when a client API's boolean type is
+ *      an enum. Client APIs which use an integer or other type for
+ *      booleans cannot use this as the base type for their boolean.
+ *
+ * Tokens defined in khrplatform.h:
+ *
+ *    KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
+ *
+ *    KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
+ *    KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
+ *
+ * Calling convention macros defined in this file:
+ *    KHRONOS_APICALL
+ *    KHRONOS_APIENTRY
+ *    KHRONOS_APIATTRIBUTES
+ *
+ * These may be used in function prototypes as:
+ *
+ *      KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
+ *                                  int arg1,
+ *                                  int arg2) KHRONOS_APIATTRIBUTES;
+ */
+
+#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC)
+#   define KHRONOS_STATIC 1
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APICALL
+ *-------------------------------------------------------------------------
+ * This precedes the return type of the function in the function prototype.
+ */
+#if defined(KHRONOS_STATIC)
+    /* If the preprocessor constant KHRONOS_STATIC is defined, make the
+     * header compatible with static linking. */
+#   define KHRONOS_APICALL
+#elif defined(_WIN32)
+#   define KHRONOS_APICALL __declspec(dllimport)
+#elif defined (__SYMBIAN32__)
+#   define KHRONOS_APICALL IMPORT_C
+#elif defined(__ANDROID__)
+#   define KHRONOS_APICALL __attribute__((visibility("default")))
+#else
+#   define KHRONOS_APICALL
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APIENTRY
+ *-------------------------------------------------------------------------
+ * This follows the return type of the function  and precedes the function
+ * name in the function prototype.
+ */
+#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
+    /* Win32 but not WinCE */
+#   define KHRONOS_APIENTRY __stdcall
+#else
+#   define KHRONOS_APIENTRY
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APIATTRIBUTES
+ *-------------------------------------------------------------------------
+ * This follows the closing parenthesis of the function prototype arguments.
+ */
+#if defined (__ARMCC_2__)
+#define KHRONOS_APIATTRIBUTES __softfp
+#else
+#define KHRONOS_APIATTRIBUTES
+#endif
+
+/*-------------------------------------------------------------------------
+ * basic type definitions
+ *-----------------------------------------------------------------------*/
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
+
+
+/*
+ * Using <stdint.h>
+ */
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+/*
+ * To support platform where unsigned long cannot be used interchangeably with
+ * inptr_t (e.g. CHERI-extended ISAs), we can use the stdint.h intptr_t.
+ * Ideally, we could just use (u)intptr_t everywhere, but this could result in
+ * ABI breakage if khronos_uintptr_t is changed from unsigned long to
+ * unsigned long long or similar (this results in different C++ name mangling).
+ * To avoid changes for existing platforms, we restrict usage of intptr_t to
+ * platforms where the size of a pointer is larger than the size of long.
+ */
+#if defined(__SIZEOF_LONG__) && defined(__SIZEOF_POINTER__)
+#if __SIZEOF_POINTER__ > __SIZEOF_LONG__
+#define KHRONOS_USE_INTPTR_T
+#endif
+#endif
+
+#elif defined(__VMS ) || defined(__sgi)
+
+/*
+ * Using <inttypes.h>
+ */
+#include <inttypes.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
+
+/*
+ * Win32
+ */
+typedef __int32                 khronos_int32_t;
+typedef unsigned __int32        khronos_uint32_t;
+typedef __int64                 khronos_int64_t;
+typedef unsigned __int64        khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(__sun__) || defined(__digital__)
+
+/*
+ * Sun or Digital
+ */
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#if defined(__arch64__) || defined(_LP64)
+typedef long int                khronos_int64_t;
+typedef unsigned long int       khronos_uint64_t;
+#else
+typedef long long int           khronos_int64_t;
+typedef unsigned long long int  khronos_uint64_t;
+#endif /* __arch64__ */
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif 0
+
+/*
+ * Hypothetical platform with no float or int64 support
+ */
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#define KHRONOS_SUPPORT_INT64   0
+#define KHRONOS_SUPPORT_FLOAT   0
+
+#else
+
+/*
+ * Generic fallback
+ */
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#endif
+
+
+/*
+ * Types that are (so far) the same on all platforms
+ */
+typedef signed   char          khronos_int8_t;
+typedef unsigned char          khronos_uint8_t;
+typedef signed   short int     khronos_int16_t;
+typedef unsigned short int     khronos_uint16_t;
+
+/*
+ * Types that differ between LLP64 and LP64 architectures - in LLP64,
+ * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
+ * to be the only LLP64 architecture in current use.
+ */
+#ifdef KHRONOS_USE_INTPTR_T
+typedef intptr_t               khronos_intptr_t;
+typedef uintptr_t              khronos_uintptr_t;
+#elif defined(_WIN64)
+typedef signed   long long int khronos_intptr_t;
+typedef unsigned long long int khronos_uintptr_t;
+#else
+typedef signed   long  int     khronos_intptr_t;
+typedef unsigned long  int     khronos_uintptr_t;
+#endif
+
+#if defined(_WIN64)
+typedef signed   long long int khronos_ssize_t;
+typedef unsigned long long int khronos_usize_t;
+#else
+typedef signed   long  int     khronos_ssize_t;
+typedef unsigned long  int     khronos_usize_t;
+#endif
+
+#if KHRONOS_SUPPORT_FLOAT
+/*
+ * Float type
+ */
+typedef          float         khronos_float_t;
+#endif
+
+#if KHRONOS_SUPPORT_INT64
+/* Time types
+ *
+ * These types can be used to represent a time interval in nanoseconds or
+ * an absolute Unadjusted System Time.  Unadjusted System Time is the number
+ * of nanoseconds since some arbitrary system event (e.g. since the last
+ * time the system booted).  The Unadjusted System Time is an unsigned
+ * 64 bit value that wraps back to 0 every 584 years.  Time intervals
+ * may be either signed or unsigned.
+ */
+typedef khronos_uint64_t       khronos_utime_nanoseconds_t;
+typedef khronos_int64_t        khronos_stime_nanoseconds_t;
+#endif
+
+/*
+ * Dummy value used to pad enum types to 32 bits.
+ */
+#ifndef KHRONOS_MAX_ENUM
+#define KHRONOS_MAX_ENUM 0x7FFFFFFF
+#endif
+
+/*
+ * Enumerated boolean type
+ *
+ * Values other than zero should be considered to be true.  Therefore
+ * comparisons should not be made against KHRONOS_TRUE.
+ */
+typedef enum {
+    KHRONOS_FALSE = 0,
+    KHRONOS_TRUE  = 1,
+    KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
+} khronos_boolean_enum_t;
+
+#endif /* __khrplatform_h_ */

vendor/glfw

@@ -0,0 +1 @@
+Subproject commit 7dfd84c458dfa12b351c932b8281b13faf7b50b9

vendor/osmparser

@@ -0,0 +1 @@
+Subproject commit 3023d822532d1d0ede6752d8787d8489f6229856

vendor/triangle/CMakeLists.txt

@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.10)
+
+SET_SOURCE_FILES_PROPERTIES( "src/triangle.c" PROPERTIES LANGUAGE CXX )
+
+add_library(triangle STATIC 
+	"src/triangle.c"
+)
+
+target_include_directories(triangle PUBLIC 
+	${CMAKE_CURRENT_LIST_DIR}/include
+)
+
+target_compile_definitions(triangle PUBLIC NO_TIMER TRILIBRARY REDUCED DCT_ONLY ANSI_DECLARATORS)