lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Patch maf.h so it can be included in C++ 

A C-only feature is used in one spot currently, which would be fine if maf.h were maf.c, but it's designed to be #included...
This commit is contained in:
mcc 2019-06-28 22:33:07 -04:00 committed by Bjorn
parent 38886f0dc4
commit 8bfc8683db
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/maf.h
View File

@ -510,12 +510,13 @@ MAF mat4 mat4_translate(mat4 m, float x, float y, float z) {
MAF mat4 mat4_rotateQuat(mat4 m, quat q) {
float x = q[0], y = q[1], z = q[2], w = q[3];
return mat4_multiply(m, (float[16]) {
float m2[16] = {
1 - 2 * y * y - 2 * z * z, 2 * x * y + 2 * w * z, 2 * x * z - 2 * w * y, 0,
2 * x * y - 2 * w * z, 1 - 2 * x * x - 2 * z * z, 2 * y * z + 2 * w * x, 0,
2 * x * z + 2 * w * y, 2 * y * z - 2 * w * x, 1 - 2 * x * x - 2 * y * y, 0,
0, 0, 0, 1
});
};
return mat4_multiply(m, m2);
}
MAF mat4 mat4_rotate(mat4 m, float angle, float x, float y, float z) {