Skip to content

update conversion type so it work for c++ :P #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gl91306 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

update conversion type so it work for c++ :P #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f7fce1
update conversion type so it work for c++ :P
gl91306 Jul 31, 2022
7a6d0bc
conversion thing for c++
gl91306 Jul 31, 2022
b8efbcd
c++++
gl91306 Jul 31, 2022
57c7d1a
Merge pull request #1 from gl91306/master
gl91306 Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mat4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
4 changes: 2 additions & 2 deletions vec3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -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;
Expand Down