diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 305d7b7..059bbcf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,10 +3,11 @@ cmake_minimum_required(VERSION 3.10) add_executable(mapviewer main.cpp multipolygon.cpp + Window.cpp ) -target_include_directories(mapviewer PRIVATE - osmp +target_link_libraries(mapviewer PRIVATE + osmparser triangle glfw glad diff --git a/src/Window.cpp b/src/Window.cpp new file mode 100644 index 0000000..1b8e24f --- /dev/null +++ b/src/Window.cpp @@ -0,0 +1,56 @@ +#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 new file mode 100644 index 0000000..ce8aa0c --- /dev/null +++ b/src/Window.hpp @@ -0,0 +1,26 @@ +#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 4d6c1b9..482fd9a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4,43 +4,39 @@ #include #include -#include -#include -#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); typedef struct sArea { - size_t length; - Uint8 r = 0; - Uint8 g = 0; - Uint8 b = 10; - Sint16* x; - Sint16* y; + size_t length; + 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; diff --git a/src/multipolygon.cpp b/src/multipolygon.cpp index 52196c4..89fe67d 100644 --- a/src/multipolygon.cpp +++ b/src/multipolygon.cpp @@ -1,4 +1,4 @@ -#include "..\include\multipolygon.hpp" +#include "multipolygon.hpp" #include #include @@ -7,10 +7,7 @@ #include #include -#include -#include -#include -#include +#include #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& rings, const osmp::MemberWays& members); +bool BuildRing(Ring& ring, osmp::MemberWays& unassigned, int ringCount); +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); -[[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); +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); 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; } diff --git a/src/multipolygon.hpp b/src/multipolygon.hpp index c86a836..112b839 100644 --- a/src/multipolygon.hpp +++ b/src/multipolygon.hpp @@ -2,10 +2,7 @@ #include -#include - -struct SDL_FPoint; -struct SDL_Renderer; +#include 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); diff --git a/src/vector2.hpp b/src/vector2.hpp new file mode 100644 index 0000000..bffef1a --- /dev/null +++ b/src/vector2.hpp @@ -0,0 +1,8 @@ +template +struct Vector2D +{ + T x, y; +}; + +typedef Vector2D Vector2f; +typedef Vector2D Vector2i; \ No newline at end of file