!BREAKING refactor: remove GLM dependency

GLM structures are replaced by `Vec{2,3,4}`, `Quat`, `Color` and `Mat{3,4}` in `zenkit/Misc.hh`.

Author: lmichaelis

.gitmodules

@@ -7,6 +7,3 @@
 [submodule "vendor/libsquish"]
 	path = vendor/libsquish
 	url = https://github.com/lmichaelis/phoenix-libsquish.git
-[submodule "vendor/glm"]
-	path = vendor/glm
-	url = https://github.com/g-truc/glm.git

CMakeLists.txt

@@ -130,22 +130,13 @@ target_include_directories(zenkit PUBLIC include)
 target_compile_definitions(zenkit PRIVATE _ZKEXPORT=1 ZKNO_REM=1)
 target_compile_options(zenkit PRIVATE ${_ZK_COMPILE_FLAGS})
 target_link_options(zenkit PUBLIC ${_ZK_LINK_FLAGS})
-target_link_libraries(zenkit PUBLIC glm::glm_static squish)
+target_link_libraries(zenkit PUBLIC squish)
 set_target_properties(zenkit PROPERTIES DEBUG_POSTFIX "d" VERSION ${PROJECT_VERSION})
 
 if (ZK_ENABLE_INSTALL)
     install(TARGETS zenkit ARCHIVE LIBRARY RUNTIME)
     install(DIRECTORY "include/phoenix" TYPE INCLUDE)
     install(DIRECTORY "include/zenkit" TYPE INCLUDE)
-
-    if (NOT ZK_BUILD_SHARED)
-        # For static linking we'll need to provide the dependency static libraries
-        install(DIRECTORY "${glm_SOURCE_DIR}/glm" TYPE INCLUDE FILES_MATCHING PATTERN "*.hpp" PATTERN "*.inl" PATTERN "*.h")
-
-        foreach (lib glm::glm_static)
-            install(FILES "$<TARGET_LINKER_FILE:${lib}>" TYPE LIB)
-        endforeach ()
-    endif ()
 endif ()
 
 # when building tests, create a test executable and load it into CTest

include/zenkit/Archive.hh

@@ -7,10 +7,6 @@
 #include "zenkit/Stream.hh"
 #include "zenkit/Error.hh"
 
-#include <glm/mat3x3.hpp>
-#include <glm/vec2.hpp>
-#include <glm/vec3.hpp>
-
 #include <memory>
 #include <string>
 #include <unordered_map>
@@ -203,17 +199,17 @@ namespace zenkit {
 		/// \brief Reads a RGBA color value from the reader.
 		/// \return The value read.
 		/// \throws zenkit::ParserError if the value actually present is not a color
-		virtual glm::u8vec4 read_color() = 0;
+		virtual Color read_color() = 0;
 
 		/// \brief Reads a vec3 value from the reader.
 		/// \return The value read.
 		/// \throws zenkit::ParserError if the value actually present is not a vec3
-		virtual glm::vec3 read_vec3() = 0;
+		virtual Vec3 read_vec3() = 0;
 
 		/// \brief Reads a vec2 value from the reader.
 		/// \return The value read.
 		/// \throws zenkit::ParserError if the value actually present is not a vec2
-		virtual glm::vec2 read_vec2() = 0;
+		virtual Vec2 read_vec2() = 0;
 
 		/// \brief Reads a bounding box consisting of two consecutive vec3's from the reader.
 		/// \return The value read.
@@ -222,7 +218,7 @@ namespace zenkit {
 
 		/// \brief Reads a 3-by-3 matrix from the reader.
 		/// \return The matrix.
-		virtual glm::mat3x3 read_mat3x3() = 0;
+		virtual Mat3 read_mat3x3() = 0;
 
 		virtual std::unique_ptr<Read> read_raw(std::size_t size) = 0;
 
@@ -285,11 +281,11 @@ namespace zenkit {
 		virtual void write_word(std::string_view name, std::uint16_t v) = 0;
 		virtual void write_enum(std::string_view name, std::uint32_t v) = 0;
 		virtual void write_bool(std::string_view name, bool v) = 0;
-		virtual void write_color(std::string_view name, glm::u8vec4 v) = 0;
-		virtual void write_vec3(std::string_view name, glm::vec3 const& v) = 0;
-		virtual void write_vec2(std::string_view name, glm::vec2 v) = 0;
+		virtual void write_color(std::string_view name, Color v) = 0;
+		virtual void write_vec3(std::string_view name, Vec3 const& v) = 0;
+		virtual void write_vec2(std::string_view name, Vec2 v) = 0;
 		virtual void write_bbox(std::string_view name, AxisAlignedBoundingBox const& v) = 0;
-		virtual void write_mat3x3(std::string_view name, glm::mat3x3 const& v) = 0;
+		virtual void write_mat3x3(std::string_view name, Mat3 const& v) = 0;
 		virtual void write_raw(std::string_view name, std::vector<std::byte> const& v) = 0;
 		virtual void write_raw(std::string_view name, std::byte const* v, std::uint16_t length) = 0;
 		virtual void write_raw_float(std::string_view name, float const* v, std::uint16_t length) = 0;

include/zenkit/Boxes.hh

@@ -2,8 +2,7 @@
 // SPDX-License-Identifier: MIT
 #pragma once
 #include "zenkit/Library.hh"
-
-#include <glm/vec3.hpp>
+#include "zenkit/Misc.hh"
 
 #include <vector>
 
@@ -14,14 +13,14 @@ namespace zenkit {
 	/// \brief Represents a axis-aligned bounding box (AABB)
 	struct AxisAlignedBoundingBox {
 		static constexpr AxisAlignedBoundingBox zero() {
-			return {glm::vec3 {0}, glm::vec3 {0}};
+			return {Vec3 {0}, Vec3 {0}};
 		}
 
 		/// \brief The coordinates of the minimum corner of the bounding box.
-		glm::vec3 min;
+		Vec3 min;
 
 		/// \brief The coordinates of the maximum corner of the bounding box.
-		glm::vec3 max;
+		Vec3 max;
 
 		ZKAPI void load(Read* r);
 		ZKAPI void save(Write* w) const;
@@ -33,9 +32,9 @@ namespace zenkit {
 	/// boxes](https://en.wikipedia.org/wiki/Minimum_bounding_box#Arbitrarily_oriented_minimum_bounding_box) may be
 	/// rotated in the coordinate system and don't have to align with its axes.
 	struct OrientedBoundingBox {
-		glm::vec3 center;
-		glm::vec3 axes[3];
-		glm::vec3 half_width;
+		Vec3 center;
+		Vec3 axes[3];
+		Vec3 half_width;
 
 		std::vector<OrientedBoundingBox> children;
 

include/zenkit/Font.hh

@@ -2,8 +2,7 @@
 // SPDX-License-Identifier: MIT
 #pragma once
 #include "zenkit/Library.hh"
-
-#include <glm/vec2.hpp>
+#include "zenkit/Misc.hh"
 
 #include <cstdint>
 #include <string>
@@ -22,7 +21,7 @@ namespace zenkit {
 		/// \note These values are not stored as absolute pixels but rather in percent of the width and
 		///       height of the image. Thus to calculate the real pixel position of the top left corner,
 		///       one multiplies `uv[0].x` by the width of the font texture and `uv[0].y` by its height.
-		glm::vec2 uv[2];
+		Vec2 uv[2];
 
 		[[nodiscard]] ZKAPI bool operator==(FontGlyph const& g) const noexcept;
 	};

include/zenkit/Material.hh

@@ -1,13 +1,10 @@
-// Copyright © 2021-2023 GothicKit Contributors.
+// Copyright © 2021-2024 GothicKit Contributors.
 // SPDX-License-Identifier: MIT
 #pragma once
 #include "Object.hh"
 #include "zenkit/Library.hh"
 #include "zenkit/Misc.hh"
 
-#include <glm/vec2.hpp>
-#include <glm/vec4.hpp>
-
 #include <string>
 
 namespace zenkit {
@@ -149,13 +146,13 @@ namespace zenkit {
 
 		std::string name;
 		MaterialGroup group {MaterialGroup::UNDEFINED};
-		glm::u8vec4 color {0, 0, 0, 0};
+		Color color {0, 0, 0, 0};
 		float smooth_angle {0.0f};
 		std::string texture {};
-		glm::vec2 texture_scale {};
+		Vec2 texture_scale {};
 		float texture_anim_fps {0.0f};
 		AnimationMapping texture_anim_map_mode {AnimationMapping::NONE};
-		glm::vec2 texture_anim_map_dir {};
+		Vec2 texture_anim_map_dir {};
 		bool disable_collision {false};
 		bool disable_lightmap {false};
 		bool dont_collapse {false};
@@ -175,6 +172,6 @@ namespace zenkit {
 		float wave_grid_size {0.0f};
 		bool ignore_sun {false};
 		AlphaFunction alpha_func {AlphaFunction::NONE};
-		glm::vec2 default_mapping {};
+		Vec2 default_mapping {};
 	};
 } // namespace zenkit

include/zenkit/Mesh.hh

@@ -7,9 +7,6 @@
 #include "zenkit/Material.hh"
 #include "zenkit/Texture.hh"
 
-#include <glm/vec2.hpp>
-#include <glm/vec3.hpp>
-
 #include <memory>
 #include <string>
 #include <vector>
@@ -21,20 +18,20 @@ namespace zenkit {
 	/// \brief Represents a light map.
 	struct LightMap {
 		std::shared_ptr<Texture> image;
-		glm::vec3 normals[2];
-		glm::vec3 origin;
+		Vec3 normals[2];
+		Vec3 origin;
 	};
 
 	/// \brief Represents a vertex feature.
 	struct VertexFeature {
 		/// \brief The texture coordinates of the polygon.
-		glm::vec2 texture;
+		Vec2 texture;
 
 		/// \brief A value indicating the light level of the polygon.
 		uint32_t light;
 
 		/// The normal vector of the polygon.
-		glm::vec3 normal;
+		Vec3 normal;
 	};
 
 	/// \brief Flags set for a polygon of a mesh.
@@ -111,7 +108,7 @@ namespace zenkit {
 		std::vector<Material> materials {};
 
 		/// \brief A list of vertices of this mesh.
-		std::vector<glm::vec3> vertices {};
+		std::vector<Vec3> vertices {};
 
 		/// \brief A list of vertex features of this mesh.
 		std::vector<VertexFeature> features {};