From 6f7fce1910d045e0ac7e4b19f5e3c2a36190f2a8 Mon Sep 17 00:00:00 2001 From: gl91306 <75343148+gl91306@users.noreply.github.com> Date: Sat, 30 Jul 2022 23:08:25 -0700 Subject: [PATCH 1/3] update conversion type so it work for c++ :P --- vec3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vec3.c b/vec3.c index a59e29c..0241331 100644 --- a/vec3.c +++ b/vec3.c @@ -4,7 +4,7 @@ #include "gl-matrix.h" vec3_t vec3_create(vec3_t vec) { - vec3_t dest = calloc(sizeof(double_t), 3); + vec3_t dest = (vec3_t)calloc(sizeof(double_t), 3); if (vec) { dest[0] = vec[0]; From 7a6d0bcfae5eef24e5b83b80857157ced983bb14 Mon Sep 17 00:00:00 2001 From: gl91306 <75343148+gl91306@users.noreply.github.com> Date: Sat, 30 Jul 2022 23:10:10 -0700 Subject: [PATCH 2/3] conversion thing for c++ --- vec3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vec3.c b/vec3.c index a59e29c..229455f 100644 --- a/vec3.c +++ b/vec3.c @@ -181,7 +181,7 @@ vec3_t vec3_unproject(vec3_t vec, mat4_t view, mat4_t proj, vec4_t viewport, vec if (!dest) { dest = vec; } mat4_t m = mat4_create(NULL); - double *v = malloc(sizeof(double) * 4); + double *v = (double *)malloc(sizeof(double) * 4); v[0] = (vec[0] - viewport[0]) * 2.0 / viewport[2] - 1.0; v[1] = (vec[1] - viewport[1]) * 2.0 / viewport[3] - 1.0; From b8efbcdd23b6503410431a2607f0f249f4ff9353 Mon Sep 17 00:00:00 2001 From: gl91306 <75343148+gl91306@users.noreply.github.com> Date: Sat, 30 Jul 2022 23:10:46 -0700 Subject: [PATCH 3/3] c++++ --- mat4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mat4.c b/mat4.c index fffb53e..729931a 100644 --- a/mat4.c +++ b/mat4.c @@ -4,7 +4,7 @@ #include "gl-matrix.h" mat4_t mat4_create(mat4_t mat) { - mat4_t dest = calloc(sizeof(double), 16); + mat4_t dest = (mat4_t)calloc(sizeof(double), 16); if (mat) { dest[0] = mat[0];