chore: bump ZenKit

Author: lmichaelis

CMakeLists.txt

@@ -103,3 +103,6 @@ set_target_properties(zenkitcapi PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBIL
 
 install(TARGETS zenkitcapi ARCHIVE LIBRARY RUNTIME)
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/zenkit-capi" TYPE INCLUDE)
+
+add_executable(test test.c)
+target_link_libraries(test PRIVATE zenkitcapi)

include/zenkit-capi/Matrix.h

@@ -4,24 +4,22 @@
 #include "Vector.h"
 
 #ifdef __cplusplus
-	#include <glm/mat4x4.hpp>
-
 extern "C" {
 #endif
 
 typedef struct ZkInternal_Mat4x4 {
 #ifdef __cplusplus
 	inline ZkInternal_Mat4x4() = default;
 
-	inline ZkInternal_Mat4x4(glm::mat4 const& v) {
+	inline ZkInternal_Mat4x4(zenkit::Mat4 const& v) {
 		columns[0] = v[0];
 		columns[1] = v[1];
 		columns[2] = v[2];
 		columns[3] = v[3];
 	}
 
-	operator glm::mat4() const {
-		return glm::mat4 {
+	operator zenkit::Mat4() const {
+		return zenkit::Mat4 {
 		    columns[0],
 		    columns[1],
 		    columns[2],
@@ -37,14 +35,14 @@ typedef struct ZkInternal_Mat3x3 {
 #ifdef __cplusplus
 	inline ZkInternal_Mat3x3() = default;
 
-	inline ZkInternal_Mat3x3(glm::mat3 const& v) {
+	inline ZkInternal_Mat3x3(zenkit::Mat3 const& v) {
 		columns[0] = v[0];
 		columns[1] = v[1];
 		columns[2] = v[2];
 	}
 
-	operator glm::mat3() const {
-		return glm::mat3 {
+	operator zenkit::Mat3() const {
+		return zenkit::Mat3 {
 		    columns[0],
 		    columns[1],
 		    columns[2],

include/zenkit-capi/SaveGame.h

@@ -9,9 +9,9 @@ using ZkSaveGame = zenkit::SaveGame;
 using ZkSaveMetadata = zenkit::SaveMetadata;
 using ZkSaveState = zenkit::SaveState;
 #else
-typedef ZkInternal_SaveGame ZkSaveGame;
-typedef ZkInternal_SaveMetadata ZkSaveMetadata;
-typedef ZkInternal_SaveState ZkSaveState;
+typedef struct ZkInternal_SaveGame ZkSaveGame;
+typedef struct ZkInternal_SaveMetadata ZkSaveMetadata;
+typedef struct ZkInternal_SaveState ZkSaveState;
 #endif
 
 typedef enum {

include/zenkit-capi/Vector.h

@@ -4,11 +4,8 @@
 #include <stdint.h>
 
 #ifdef __cplusplus
-	#include <glm/vec2.hpp>
-	#include <glm/vec3.hpp>
-	#include <glm/vec4.hpp>
-	#include <glm/gtc/quaternion.hpp>
 	#include <zenkit/Texture.hh>
+	#include <zenkit/Misc.hh>
 #endif
 
 typedef struct ZkInternal_Vec2 {
@@ -17,9 +14,9 @@ typedef struct ZkInternal_Vec2 {
 
 #ifdef __cplusplus
 	ZkInternal_Vec2() : x(0), y(0) {}
-	ZkInternal_Vec2(glm::vec2 v) : x(v.x), y(v.y) {}
+	ZkInternal_Vec2(zenkit::Vec2 v) : x(v.x), y(v.y) {}
 
-	operator glm::vec2() const {
+	operator zenkit::Vec2() const {
 		return {x, y};
 	}
 #endif
@@ -32,9 +29,9 @@ typedef struct ZkInternal_Vec3 {
 
 #ifdef __cplusplus
 	ZkInternal_Vec3() : x(0), y(0), z(0) {}
-	ZkInternal_Vec3(glm::vec3 v) : x(v.x), y(v.y), z(v.z) {}
+	ZkInternal_Vec3(zenkit::Vec3 v) : x(v.x), y(v.y), z(v.z) {}
 
-	operator glm::vec3() const {
+	operator zenkit::Vec3() const {
 		return {x, y, z};
 	}
 #endif
@@ -48,9 +45,9 @@ typedef struct ZkInternal_Vec4 {
 
 #ifdef __cplusplus
 	ZkInternal_Vec4() : x(0), y(0), z(0), w(0) {}
-	ZkInternal_Vec4(glm::vec4 v) : x(v.x), y(v.y), z(v.z), w(v.w) {}
+	ZkInternal_Vec4(zenkit::Vec4 v) : x(v.x), y(v.y), z(v.z), w(v.w) {}
 
-	operator glm::vec4() const {
+	operator zenkit::Vec4() const {
 		return {x, y, z, w};
 	}
 #endif
@@ -64,9 +61,9 @@ typedef struct ZkInternal_Quat {
 
 #ifdef __cplusplus
 	ZkInternal_Quat() : x(0), y(0), z(0), w(0) {}
-	ZkInternal_Quat(glm::quat v) : x(v.x), y(v.y), z(v.z), w(v.w) {}
+	ZkInternal_Quat(zenkit::Quat v) : x(v.x), y(v.y), z(v.z), w(v.w) {}
 
-	operator glm::quat() const {
+	operator zenkit::Quat() const {
 		return {w, x, y, z};
 	}
 #endif
@@ -80,10 +77,10 @@ typedef struct ZkInternal_Color {
 
 #ifdef __cplusplus
 	ZkInternal_Color() : r(0), g(0), b(0), a(255) {}
-	ZkInternal_Color(glm::u8vec4 v) : r(v.r), g(v.g), b(v.b), a(v.a) {}
+	ZkInternal_Color(zenkit::Color v) : r(v.r), g(v.g), b(v.b), a(v.a) {}
 	ZkInternal_Color(zenkit::ColorARGB v) : r(v.r), g(v.g), b(v.b), a(v.a) {}
 
-	operator glm::u8vec4() const {
+	operator zenkit::Color() const {
 		return {r, g, b, a};
 	}
 #endif