diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 261eeb9..0000000 --- a/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - 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. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4ca7ef4..305d7b7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,12 +2,11 @@ cmake_minimum_required(VERSION 3.10) add_executable(mapviewer main.cpp - Multipolygon.cpp - Window.cpp + multipolygon.cpp ) -target_link_libraries(mapviewer PRIVATE - osmparser +target_include_directories(mapviewer PRIVATE + osmp triangle glfw glad diff --git a/src/Window.cpp b/src/Window.cpp deleted file mode 100644 index 1b8e24f..0000000 --- a/src/Window.cpp +++ /dev/null @@ -1,56 +0,0 @@ -#include "Window.hpp" - -#include -#include -#include - -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); -} diff --git a/src/Window.hpp b/src/Window.hpp deleted file mode 100644 index ce8aa0c..0000000 --- a/src/Window.hpp +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include -#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; -}; \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 482fd9a..4d6c1b9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4,39 +4,43 @@ #include #include -#include "multipolygon.hpp" -#include "Window.hpp" +#include +#include +#include <../include/multipolygon.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); typedef struct sArea { - size_t length; - uint8_t r = 0; - uint8_t g = 0; - uint8_t b = 10; - int16_t* x; - int16_t* y; + size_t length; + Uint8 r = 0; + Uint8 g = 0; + Uint8 b = 10; + Sint16* x; + Sint16* y; } Area; typedef struct sHighway { size_t length; - uint8_t r, g, b; - Vector2f* points; + Uint8 r, g, b; + SDL_FPoint* points; } Highway; int main(int argc, char** argv) { - Window::Init(); + SDL_Init(SDL_INIT_VIDEO); + // Load map data and calculate window size + SDL_DisplayMode DM; + SDL_GetCurrentDisplayMode(0, &DM); 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 = 900 - 100; + int windowHeight = DM.h - 100; int windowWidth = windowHeight * aspectRatio; // Fetch all the ways @@ -59,8 +63,8 @@ int main(int argc, char** argv) Area area; area.length = nodes.size(); - area.x = new int16_t[area.length]; - area.y = new int16_t[area.length]; + area.x = new Sint16[area.length]; + area.y = new Sint16[area.length]; area.r = 150; area.g = 150; @@ -78,7 +82,7 @@ int main(int argc, char** argv) { Highway highway; highway.length = nodes.size(); - highway.points = new Vector2f[highway.length]; + highway.points = new SDL_FPoint[highway.length]; for (int i = 0; i < highway.length; i++) { @@ -100,7 +104,7 @@ int main(int argc, char** argv) { Highway railway; railway.length = nodes.size(); - railway.points = new Vector2f[railway.length]; + railway.points = new SDL_FPoint[railway.length]; for (int i = 0; i < railway.length; i++) { @@ -135,39 +139,65 @@ int main(int argc, char** argv) delete obj; // Create Window + Renderer - Window window(Vector2i{ 1280, 800 }, "Map Viewer"); + 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 loop - while ((bool)window) + bool isOpen = true; + SDL_Event e; + while (isOpen) { - Window::PollEvents(); + while (SDL_PollEvent(&e)) + { + if (e.type == SDL_WINDOWEVENT) + { + switch (e.window.event) + { + case SDL_WINDOWEVENT_CLOSE: + isOpen = false; + break; + } + } + } - window.Clear(0.2f, 0.0f, 0.2f, 1.0f); + SDL_SetRenderDrawColor(renderer, 240, 240, 250, 255); + SDL_RenderClear(renderer); 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); } - window.SwapBuffers(); + SDL_RenderPresent(renderer); } // 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; diff --git a/src/multipolygon.cpp b/src/multipolygon.cpp index 1f2517f..52196c4 100644 --- a/src/multipolygon.cpp +++ b/src/multipolygon.cpp @@ -1,4 +1,4 @@ -#include "Multipolygon.hpp" +#include "..\include\multipolygon.hpp" #include #include @@ -7,7 +7,10 @@ #include #include -#include +#include +#include +#include +#include #define BREAKIF(x) if(relation->id == x) __debugbreak() #define INDEXOF(x, y, n) (y * n + x) @@ -35,19 +38,19 @@ inline double Map(double A, double B, double a, double b, double x) } // TODO: Implement better algorithm -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 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 BuildRing(Ring& ring, osmp::MemberWays& unassigned, int ringCount); -bool AssignRings(std::vector& rings, const osmp::MemberWays& members); +[[nodiscard]] bool BuildRing(Ring& ring, osmp::MemberWays& unassigned, int ringCount); +[[nodiscard]] bool AssignRings(std::vector& rings, const osmp::MemberWays& members); void FindAllContainedRings(const std::vector& containmentMatrix, int container, int numRings, std::vector& buffer); void FindAllContainedRingsThatArentContainedByUnusedRings(const std::vector& containmentMatrix, int container, int numRings, const std::vector& unusedRings, std::vector& buffer); -int FindUncontainedRing(const std::vector& containmentMatrix, int rings, const std::vector& unusedRings); -bool PointInsideRing(const Ring& ring, const osmp::Node& point); -bool IsRingContained(const Ring& r1, const Ring& r2); -bool GroupRings(std::vector& ringGroup, std::vector& rings); +[[nodiscard]] int FindUncontainedRing(const std::vector& containmentMatrix, int rings, const std::vector& 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, std::vector& 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) @@ -554,7 +557,7 @@ void Multipolygon::SetColor(int r, int g, int b) this->b = b; } -void Multipolygon::Draw() +void Multipolygon::Draw(SDL_Renderer* renderer) { if (!visible) return; @@ -577,23 +580,23 @@ void Multipolygon::Draw() 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; @@ -601,21 +604,21 @@ void Multipolygon::Draw() 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; } diff --git a/src/multipolygon.hpp b/src/multipolygon.hpp index 112b839..c86a836 100644 --- a/src/multipolygon.hpp +++ b/src/multipolygon.hpp @@ -2,7 +2,10 @@ #include -#include +#include + +struct SDL_FPoint; +struct SDL_Renderer; class Multipolygon { @@ -10,7 +13,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(); + void Draw(SDL_Renderer* renderer); bool operator < (const Multipolygon& other) const { return (rendering < other.rendering); diff --git a/src/vector2.hpp b/src/vector2.hpp deleted file mode 100644 index bffef1a..0000000 --- a/src/vector2.hpp +++ /dev/null @@ -1,8 +0,0 @@ -template -struct Vector2D -{ - T x, y; -}; - -typedef Vector2D Vector2f; -typedef Vector2D Vector2i; \ No newline at end of file diff --git a/vendor/osmparser b/vendor/osmparser index 3023d82..340774d 160000 --- a/vendor/osmparser +++ b/vendor/osmparser @@ -1 +1 @@ -Subproject commit 3023d822532d1d0ede6752d8787d8489f6229856 +Subproject commit 340774d8f66f1cf359bfe01257bc26e8e64eb020 diff --git a/vendor/triangle/CMakeLists.txt b/vendor/triangle/CMakeLists.txt index b7296d8..9e6095d 100644 --- a/vendor/triangle/CMakeLists.txt +++ b/vendor/triangle/CMakeLists.txt @@ -1,13 +1,22 @@ cmake_minimum_required(VERSION 3.10) -SET_SOURCE_FILES_PROPERTIES( "src/triangle.c" PROPERTIES LANGUAGE CXX ) +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 - "src/triangle.c" + ${CPP_FILES} ${HPP_FILES} ) target_include_directories(triangle PUBLIC - ${CMAKE_CURRENT_LIST_DIR}/include + include + ${TINYXML2_INCLUDE_DIR} ) target_compile_definitions(triangle PUBLIC NO_TIMER TRILIBRARY REDUCED DCT_ONLY ANSI_DECLARATORS) \ No newline at end of file