Many things for widget system

.github/workflows/build-test.yml

@@ -59,7 +59,8 @@ jobs:
             libglew-dev \
             libglm-dev \
             libomp-17-dev \
-            libpng-dev
+            libpng-dev \
+            libfreetype-dev
 
 
       - name: Build

CMakeLists.txt

@@ -69,13 +69,14 @@ find_package(GLEW REQUIRED)
 find_package(glfw3 REQUIRED)
 find_package(glm REQUIRED)
 find_package(PNG REQUIRED)
+find_package(Freetype REQUIRED)
 # find_package(OpenMP REQUIRED)
 
 target_link_libraries(FunGame PRIVATE glfw)
 target_link_libraries(FunGame PRIVATE OpenGL::GL)
 target_link_libraries(FunGame PRIVATE GLEW::GLEW)
 target_link_libraries(FunGame PRIVATE PNG::PNG)
-# target_link_libraries(FunGame PRIVATE OpenMP::OpenMP_CXX)
+target_link_libraries(FunGame PRIVATE Freetype::Freetype)
 
 if(WIN32)
     target_link_libraries(FunGame PRIVATE glm)
@@ -138,8 +139,17 @@ else()
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
   )
 
+  add_custom_target(fonts
+    # maybe vendor is already made by something else?
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/vendor/fonts
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/vendor/fonts ${CMAKE_BINARY_DIR}/vendor/fonts
+    COMMENT " copying ${CMAKE_SOURCE_DIR}/vendor/fonts to ${CMAKE_BINARY_DIR}/vendor/fonts "
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+  )
+
   add_dependencies(FunGame resources)
   add_dependencies(FunGame data)
+  add_dependencies(FunGame fonts)
 endif()
 
 configure_file(src/config.h.in config.h)

README.md

@@ -15,7 +15,8 @@ pacman -Su \
     mingw-w64-x86_64-ninja \
     mingw-w64-x86_64-glew \
     mingw-w64-x86_64-glfw \
-    mingw-w64-x86_64-glm
+    mingw-w64-x86_64-glm \
+    mingw-w64-x86_64-freetype
 ```
 
 ## Building

resources/shaders/overlay/FramedWindow.frag

@@ -0,0 +1,87 @@
+#version 450 core
+
+// Ouput data
+layout(location = 0) out vec3 color;
+
+in vec2 UV; // in pixels
+uniform ivec2 frame_size;
+uniform usampler2D window_texture;
+uniform int ui_scale;
+
+// uniform 
+uniform ivec4 border_size;
+uniform ivec4 side_lengths;
+uniform ivec2 inner_pattern_size;
+uniform ivec2 positions[9];
+
+void
+main(){
+    int width_2 = side_lengths[0];
+    int height_4 = side_lengths[1];
+    int width_5 = inner_pattern_size[0];
+    int height_5 = inner_pattern_size[1];
+    int height_6 = side_lengths[2];
+    int width_8 = side_lengths[3];
+
+    ivec2 pixel_position = ivec2(int(UV.x), int(UV.y));
+    ivec2 ui_position = pixel_position / ui_scale;
+    ivec2 frame_size_px = frame_size / ui_scale;
+
+    ivec2 texture_offset;
+
+// The window is arranged like this
+//  0 | 1 | 2
+// ---+---+---
+//  3 | 4 | 5
+// ---+---+---
+//  6 | 7 | 8
+//
+    if (ui_position.y < border_size[1] && ui_position.x < border_size[0]) { // 0
+        ivec2 local_position = ivec2(ui_position.x, ui_position.y);
+        texture_offset = local_position + positions[0];
+    }
+    else if (ui_position.y < border_size[1] && frame_size_px.x - ui_position.x - 1 < border_size[2]) { // 2
+        ivec2 local_position = ivec2(ui_position.x - frame_size_px.x + border_size[2], ui_position.y);
+        texture_offset = local_position + positions[2];
+    }
+    else if ((frame_size_px.y - ui_position.y - 1 < border_size[3]) && ui_position.x < border_size[0]) { // 6
+        ivec2 local_position = ivec2(ui_position.x, ui_position.y - frame_size_px.y + border_size[3]);
+        texture_offset = local_position + positions[6];
+    }
+    else if ((frame_size_px.y - ui_position.y - 1 < border_size[3]) && (frame_size_px.x - ui_position.x - 1 < border_size[2])) { // 8
+        ivec2 local_position = ivec2(ui_position.x - frame_size_px.x + border_size[2], ui_position.y - frame_size_px.y + border_size[3]);
+        texture_offset = local_position + positions[8];
+    }
+    else if (ui_position.x < border_size[0]) { // 3
+        ivec2 local_position = ivec2(ui_position.x, ui_position.y - border_size[1]);
+        local_position.y = local_position.y % height_4;
+        texture_offset = local_position + positions[3];
+    }
+    else if (ui_position.y < border_size[1]) { // 1
+        ivec2 local_position = ivec2(ui_position.x, ui_position.y);
+        local_position.x = local_position.x % width_2;
+        texture_offset = local_position + positions[1];
+    }
+    else if ((frame_size_px.x - ui_position.x) <= border_size[3]) { // 5
+        ivec2 local_position = ivec2(border_size[2] - frame_size_px.x + ui_position.x, ui_position.y - border_size[3]);
+        local_position.y = local_position.y % height_6;
+        texture_offset = local_position + positions[5];
+    }
+    else if ((frame_size_px.y - ui_position.y) <= border_size[3]) { // 7
+        ivec2 local_position = ivec2(ui_position.x - border_size[2], ui_position.y - frame_size_px.y + border_size[3]);
+        local_position.x = local_position.x % width_8;
+        texture_offset = local_position + positions[7];
+    } else { // 4
+        ivec2 local_position = ivec2(ui_position.x - border_size[0], ui_position.y - border_size[1]);
+        local_position.x = local_position.x % width_5;
+        local_position.y = local_position.y % height_5;
+        texture_offset = positions[4] + local_position;
+    }
+
+    uvec4 color_int = texelFetch(window_texture, texture_offset, 0);
+    if (color_int.a == 0) {
+        discard;
+    }
+
+    color = vec3(color_int.rgb)/255.0;
+}

resources/shaders/overlay/TextWindow.frag

@@ -0,0 +1,23 @@
+#version 450 core
+
+
+// Ouput data
+layout(location = 0) out vec3 color;
+
+uniform usampler2D font_texture;
+// right now only using the rgb components
+// may in the future use the alpha component
+uniform vec4 font_color;
+
+in vec2 UV;
+
+void
+main() {
+    uint alpha = texelFetch(font_texture, ivec2(UV), 0).r;
+
+    if (alpha > 0) {
+        color = font_color.rgb;
+    } else {
+        discard;
+    }
+}

resources/shaders/overlay/TextWindow.vert

@@ -0,0 +1,21 @@
+#version 450 core
+
+// Screen and texture position of letter
+layout(location = 0) in ivec4 pos;
+
+// this is the size of the view 
+// then switch to division
+uniform ivec2 frame_size;
+uniform int ui_scale;
+
+// Output data ; will be interpolated for each fragment.
+out vec2 UV;
+
+void
+main() {
+
+    gl_Position = vec4(ui_scale * (vec2(pos.xy) / vec2(frame_size)) - 1, 1, 1);
+    UV = vec2(pos.w, pos.z);
+    //UV = vec2((pos.z - 304) * 20, pos.w * 2);
+}
+

resources/shaders/overlay/Widget.vert

@@ -0,0 +1,15 @@
+#version 450 core
+
+// Input vertex data, different for all executions of this shader.
+layout(location = 0) in vec3 pos;
+layout(location = 1) in vec2 vertex_position_screenspace;
+
+// Output data ; will be interpolated for each fragment.
+out vec2 UV;
+
+void
+main() {
+    gl_Position = vec4(pos, 1);
+    UV = vertex_position_screenspace;
+}
+

resources/textures/GenericBorder.json

@@ -0,0 +1,57 @@
+{
+    "texture_file": "./GenericBorder.png",
+    "border_size": [
+        5,
+        5,
+        5,
+        5
+    ],
+    "side_lengths": [
+        1,
+        1,
+        1,
+        1
+    ],
+    "inner_pattern_size": [
+        1,
+        1
+    ],
+    "texture_regions": [
+        [
+            0,
+            0
+        ],
+        [
+            5,
+            0
+        ],
+        [
+            6,
+            0
+        ],
+        [
+            0,
+            5
+        ],
+        [
+            5,
+            5
+        ],
+        [
+            6,
+            5
+        ],
+        [
+            0,
+            6
+        ],
+        [
+            5,
+            6
+        ],
+        [
+            6,
+            6
+        ]
+    ]
+}

resources/textures/GenericBorder_2.json

@@ -0,0 +1,57 @@
+{
+    "texture_file": "./GenericBorder_2.png",
+    "border_size": [
+        7,
+        7,
+        7,
+        7
+    ],
+    "side_lengths": [
+        10,
+        10,
+        10,
+        10
+    ],
+    "inner_pattern_size": [
+        10,
+        10
+    ],
+    "texture_regions": [
+        [
+            0,
+            0
+        ],
+        [
+            6,
+            0
+        ],
+        [
+            15,
+            0
+        ],
+        [
+            0,
+            6
+        ],
+        [
+            6,
+            6
+        ],
+        [
+            15,
+            6
+        ],
+        [
+            0,
+            15
+        ],
+        [
+            6,
+            15
+        ],
+        [
+            15,
+            15
+        ]
+    ]
+}

resources/textures/GenericButton.json

@@ -0,0 +1,57 @@
+{
+    "texture_file": "./GenericButton.png",
+    "border_size": [
+        5,
+        5,
+        5,
+        5
+    ],
+    "side_lengths": [
+        1,
+        1,
+        1,
+        1
+    ],
+    "inner_pattern_size": [
+        1,
+        1
+    ],
+    "texture_regions": [
+        [
+            0,
+            0
+        ],
+        [
+            5,
+            0
+        ],
+        [
+            6,
+            0
+        ],
+        [
+            0,
+            5
+        ],
+        [
+            5,
+            5
+        ],
+        [
+            6,
+            5
+        ],
+        [
+            0,
+            6
+        ],
+        [
+            5,
+            6
+        ],
+        [
+            6,
+            6
+        ]
+    ]
+}

src/exceptions.hpp

@@ -8,13 +8,14 @@
 namespace exc {
 
 class file_not_found_error : public std::runtime_error {
-    constexpr static std::string ERROR_PREFIX_ = "Could not open ";
+    constexpr static std::string_view ERROR_PREFIX_ = "Could not open ";
 
     std::filesystem::path path_;
 
  public:
     file_not_found_error(std::filesystem::path path) :
-        runtime_error(ERROR_PREFIX_ + path.string()), path_(std::move(path)) {}
+        runtime_error(std::move(std::string(ERROR_PREFIX_) + path.string())),
+        path_(std::move(path)) {}
 
     file_not_found_error(const file_not_found_error& other) noexcept = default;