Merge pull request #87 from dpaulat/feature/placefiles

Placefiles

.gitmodules

@@ -31,3 +31,9 @@
 [submodule "external/date"]
 	path = external/date
 	url = https://github.com/HowardHinnant/date.git
+[submodule "external/units"]
+	path = external/units
+	url = https://github.com/nholthaus/units.git
+[submodule "external/textflowcpp"]
+	path = external/textflowcpp
+	url = https://github.com/catchorg/textflowcpp.git

ACKNOWLEDGEMENTS.md

@@ -18,6 +18,7 @@ Supercell Wx uses code from the following dependencies:
 | [CSS Color Parser](https://github.com/deanm/css-color-parser-js) | [MIT License](https://spdx.org/licenses/MIT.html) | Ported to C++ for MapLibre Native |
 | [Date](https://github.com/HowardHinnant/date) | [MIT License](https://spdx.org/licenses/MIT.html) |
 | [Dear ImGui](https://github.com/ocornut/imgui) | [MIT License](https://spdx.org/licenses/MIT.html) |
+| [fontconfig](http://fontconfig.org/) | [MIT License](https://spdx.org/licenses/MIT.html) |
 | [FreeType](https://freetype.org/) | [Freetype Project License](https://spdx.org/licenses/FTL.html) |
 | [FreeType GL](https://github.com/rougier/freetype-gl) | [BSD 2-Clause with views sentence](https://spdx.org/licenses/BSD-2-Clause-Views.html) |
 | [GeographicLib](https://geographiclib.sourceforge.io/) | [MIT License](https://spdx.org/licenses/MIT.html) |
@@ -36,6 +37,8 @@ Supercell Wx uses code from the following dependencies:
 | [spdlog](https://github.com/gabime/spdlog) | [MIT License](https://spdx.org/licenses/MIT.html) |
 | [SQLite](https://www.sqlite.org/) | Public Domain |
 | [stb](https://github.com/nothings/stb) | Public Domain |
+| [TextFlowCpp](https://github.com/catchorg/textflowcpp) | [Boost Software License 1.0](https://spdx.org/licenses/BSL-1.0.html) |
+| [Units](https://github.com/nholthaus/units) | [MIT License](https://spdx.org/licenses/MIT.html) |
 | [Vulkan SDK](https://www.vulkan.org/) | [Apache License 2.0](https://spdx.org/licenses/Apache-2.0.html) |
 | [zlib](https://zlib.net/) | [zlib License](https://spdx.org/licenses/Zlib.html) |
 
@@ -55,7 +58,9 @@ Supercell Wx uses assets from the following sources:
 
 | Source | License | Notes |
 | ------ | ------- | ----- |
+| Alte DIN 1451 Mittelschrift | SIL Open Font License |
 | [Font Awesome Free](https://fontawesome.com/) | CC BY 4.0 License |
+| [Inconsolata](https://fonts.google.com/specimen/Inconsolata) | SIL Open Font License |
 | [NOAA's Weather and Climate Toolkit](https://www.ncdc.noaa.gov/wct/) | Public Domain | Default Color Tables |
 | [Supercell thunderstorm with dramatic clouds](https://www.shutterstock.com/image-photo/supercell-thunderstorm-dramatic-clouds-1354353521) | Shutterstock Standard License | Photo by John Sirlin
 

conanfile.py

@@ -4,6 +4,7 @@ class SupercellWxConan(ConanFile):
     settings   = ("os", "compiler", "build_type", "arch")
     requires   = ("boost/1.81.0",
                   "cpr/1.9.3",
+                  "fontconfig/2.14.2",
                   "freetype/2.12.1",
                   "geographiclib/1.52",
                   "glew/2.2.0",

external/CMakeLists.txt

@@ -10,7 +10,9 @@ set_property(DIRECTORY
              hsluv-c.cmake
              imgui.cmake
              mapbox-gl-native.cmake
-             stb.cmake)
+             stb.cmake
+             textflowcpp.cmake
+             units.cmake)
 
 include(aws-sdk-cpp.cmake)
 include(date.cmake)
@@ -19,3 +21,5 @@ include(hsluv-c.cmake)
 include(imgui.cmake)
 include(mapbox-gl-native.cmake)
 include(stb.cmake)
+include(textflowcpp.cmake)
+include(units.cmake)

external/textflowcpp.cmake

@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.20)
+set(PROJECT_NAME scwx-textflowcpp)
+
+set(TEXTFLOWCPP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/textflowcpp PARENT_SCOPE)

external/units.cmake

@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.20)
+set(PROJECT_NAME scwx-units)
+
+add_subdirectory(units)

scwx-qt/gl/color.frag

@@ -1,5 +1,5 @@
 #version 330 core
-in vec4 color;
+smooth in vec4 color;
 
 layout (location = 0) out vec4 fragColor;
 

scwx-qt/gl/color.vert

@@ -4,7 +4,7 @@ layout (location = 1) in vec4 aColor;
 
 uniform mat4 uMVPMatrix;
 
-out vec4 color;
+smooth out vec4 color;
 
 void main()
 {

scwx-qt/gl/geo_line.vert

@@ -8,15 +8,15 @@
 
 layout (location = 0) in vec2 aLatLong;
 layout (location = 1) in vec2 aXYOffset;
-layout (location = 2) in vec2 aTexCoord;
+layout (location = 2) in vec3 aTexCoord;
 layout (location = 3) in vec4 aModulate;
 
 uniform mat4 uMVPMatrix;
 uniform mat4 uMapMatrix;
 uniform vec2 uMapScreenCoord;
 
-smooth out vec2 texCoord;
-flat   out vec4 modulate;
+smooth out vec3 texCoord;
+smooth out vec4 color;
 
 vec2 latLngToScreenCoordinate(in vec2 latLng)
 {
@@ -31,7 +31,7 @@ void main()
 {
    // Pass the texture coordinate and color modulate to the fragment shader
    texCoord = aTexCoord;
-   modulate = aModulate;
+   color    = aModulate;
 
    vec2 p = latLngToScreenCoordinate(aLatLong) - uMapScreenCoord;
 

scwx-qt/gl/geo_texture2d.vert

@@ -0,0 +1,65 @@
+#version 330 core
+
+#define DEGREES_MAX   360.0f
+#define LATITUDE_MAX  85.051128779806604f
+#define LONGITUDE_MAX 180.0f
+#define PI            3.1415926535897932384626433f
+#define RAD2DEG       57.295779513082320876798156332941f
+#define DEG2RAD       0.0174532925199432957692369055556f
+
+layout (location = 0) in vec2  aLatLong;
+layout (location = 1) in vec2  aXYOffset;
+layout (location = 2) in vec3  aTexCoord;
+layout (location = 3) in vec4  aModulate;
+layout (location = 4) in float aAngleDeg;
+layout (location = 5) in int   aThreshold;
+layout (location = 6) in ivec2 aTimeRange;
+
+uniform mat4 uMVPMatrix;
+uniform mat4 uMapMatrix;
+uniform vec2 uMapScreenCoord;
+
+out VertexData
+{
+   int   threshold;
+   vec3  texCoord;
+   vec4  color;
+   ivec2 timeRange;
+} vsOut;
+
+smooth out vec3 texCoord;
+smooth out vec4 color;
+
+vec2 latLngToScreenCoordinate(in vec2 latLng)
+{
+   vec2 p;
+   latLng.x = clamp(latLng.x, -LATITUDE_MAX, LATITUDE_MAX);
+   p.xy     = vec2(LONGITUDE_MAX + latLng.y,
+                   -(LONGITUDE_MAX - RAD2DEG * log(tan(PI / 4 + latLng.x * PI / DEGREES_MAX))));
+   return p;
+}
+
+void main()
+{
+   // Pass the threshold and time range to the geometry shader
+   vsOut.threshold = aThreshold;
+   vsOut.timeRange = aTimeRange;
+
+   // Pass the texture coordinate and color modulate to the geometry and
+   // fragment shaders
+   vsOut.texCoord = aTexCoord;
+   vsOut.color    = aModulate;
+   texCoord       = aTexCoord;
+   color          = aModulate;
+
+   vec2 p = latLngToScreenCoordinate(aLatLong) - uMapScreenCoord;
+
+   // Rotate clockwise
+   float angle  = aAngleDeg * DEG2RAD;
+   mat2  rotate = mat2(cos(angle), -sin(angle),
+                       sin(angle), cos(angle));
+
+   // Transform the position to screen coordinates
+   gl_Position = uMapMatrix * vec4(p, 0.0f, 1.0f) +
+                 uMVPMatrix * vec4(rotate * aXYOffset, 0.0f, 0.0f);
+}

scwx-qt/gl/map_color.vert

@@ -0,0 +1,38 @@
+#version 330 core
+
+layout (location = 0) in vec2  aScreenCoord;
+layout (location = 1) in vec2  aXYOffset;
+layout (location = 2) in vec4  aColor;
+layout (location = 3) in int   aThreshold;
+layout (location = 4) in ivec2 aTimeRange;
+
+uniform mat4 uMVPMatrix;
+uniform mat4 uMapMatrix;
+uniform vec2 uMapScreenCoord;
+
+out VertexData
+{
+   int   threshold;
+   vec3  texCoord;
+   vec4  color;
+   ivec2 timeRange;
+} vsOut;
+
+smooth out vec4 color;
+
+void main()
+{
+   // Pass the threshold and time range to the geometry shader
+   vsOut.threshold = aThreshold;
+   vsOut.timeRange = aTimeRange;
+
+   // Pass the color to the geometry and fragment shaders
+   vsOut.color = aColor;
+   color       = aColor;
+
+   vec2 p = aScreenCoord - uMapScreenCoord;
+
+   // Transform the position to screen coordinates
+   gl_Position = uMapMatrix * vec4(p, 0.0f, 1.0f) +
+                 uMVPMatrix * vec4(aXYOffset, 0.0f, 0.0f);
+}

scwx-qt/gl/texture2d.frag

@@ -6,11 +6,11 @@ precision mediump float;
 uniform sampler2D uTexture;
 
 smooth in vec2 texCoord;
-flat   in vec4 modulate;
+smooth in vec4 color;
 
 layout (location = 0) out vec4 fragColor;
 
 void main()
 {
-   fragColor = texture(uTexture, texCoord) * modulate;
+   fragColor = texture(uTexture, texCoord) * color;
 }

scwx-qt/gl/texture2d_array.frag

@@ -0,0 +1,16 @@
+#version 330 core
+
+// Lower the default precision to medium
+precision mediump float;
+
+uniform sampler2DArray uTexture;
+
+smooth in vec3 texCoord;
+smooth in vec4 color;
+
+layout (location = 0) out vec4 fragColor;
+
+void main()
+{
+   fragColor = texture(uTexture, texCoord) * color;
+}

scwx-qt/gl/threshold.geom

@@ -0,0 +1,46 @@
+#version 330 core
+
+layout (triangles) in;
+layout (triangle_strip, max_vertices = 3) out;
+
+uniform float uMapDistance;
+uniform int   uSelectedTime;
+
+in VertexData
+{
+   int   threshold;
+   vec3  texCoord;
+   vec4  color;
+   ivec2 timeRange;
+} gsIn[];
+
+smooth out vec3 texCoord;
+smooth out vec4 color;
+
+void main()
+{
+   if ((gsIn[0].threshold <= 0 ||            // If Threshold: 0 was specified, no threshold
+        gsIn[0].threshold >= uMapDistance || // If Threshold is above current map distance
+        gsIn[0].threshold >= 999) &&         // If Threshold: 999 was specified (or greater), no threshold
+       (gsIn[0].timeRange[0] == 0 ||              // If there is no start time specified
+        (gsIn[0].timeRange[0] <= uSelectedTime && // If the selected time is after the start time
+         uSelectedTime < gsIn[0].timeRange[1])))  // If the selected time is before the end time
+   {
+      gl_Position = gl_in[0].gl_Position;
+      texCoord    = gsIn[0].texCoord;
+      color       = gsIn[0].color;
+      EmitVertex();
+
+      gl_Position = gl_in[1].gl_Position;
+      texCoord    = gsIn[1].texCoord;
+      color       = gsIn[1].color;
+
+      EmitVertex();
+      gl_Position = gl_in[2].gl_Position;
+      texCoord    = gsIn[2].texCoord;
+      color       = gsIn[2].color;
+
+      EmitVertex();
+      EndPrimitive();
+   }
+}