0.3 Rotate axis
This commit is contained in:
16
src/matrix.c
16
src/matrix.c
@@ -1,6 +1,8 @@
|
||||
#include "main.h"
|
||||
#define inline
|
||||
#include <cglm/cglm.h>
|
||||
#include <cglm/mat4.h>
|
||||
#include <cglm/cam.h>
|
||||
#include <cglm/quat.h>
|
||||
|
||||
mat4 ortho[] =
|
||||
{
|
||||
@@ -42,15 +44,9 @@ void load_mdl_matrix( unsigned int shader, unsigned char i, unsigned char c )
|
||||
gload_mat4( shader, "mdl", (float*)ortho[i] );
|
||||
}
|
||||
|
||||
void load_rot_matrix( unsigned int shader, unsigned char * angle )
|
||||
void load_rot_matrix( unsigned int shader, float * q )
|
||||
{
|
||||
mat4 m, n;
|
||||
|
||||
glm_rotate_make( m, (float)angle[0]/0xff*2*GLM_PI, (vec3){1,0,0} );
|
||||
glm_rotate_make( n, (float)angle[1]/0xff*2*GLM_PI, (vec3){0,1,0} );
|
||||
glm_mat4_mul( n, m, m );
|
||||
glm_rotate_make( n, (float)angle[2]/0xff*2*GLM_PI, (vec3){0,0,1} );
|
||||
glm_mat4_mul( n, m, m );
|
||||
|
||||
mat4 m;
|
||||
glm_quat_mat4( q, m );
|
||||
gload_mat4( shader, "rot", (float*)m );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user