Merge: doc -> main

This commit is contained in:
PedroEdiaz
2024-10-02 13:10:08 -06:00
parent 3c9690a2a7
commit d22daff16d
17 changed files with 363 additions and 163 deletions

View File

@@ -26,7 +26,7 @@ mat4 ortho[] =
},
};
void load_fix_matrix( unsigned int shader, float ratio )
void load_fix_matrix( id_t shader, float ratio )
{
mat4 m, n;
const int d = 7;
@@ -35,18 +35,18 @@ void load_fix_matrix( unsigned int shader, float ratio )
glm_perspective( CGLM_PI/4, ratio, d-3, d+3, n );
glm_mat4_mul( n, m, m );
gload_mat4( shader, "fix", (float*)m );
gload_mat4( shader, "fix", (mat4_t) m );
}
void load_mdl_matrix( unsigned int shader, unsigned char i, unsigned char c )
void load_mdl_matrix( id_t shader, unsigned char i, unsigned char c )
{
gload_float( shader, "idx", c );
gload_mat4( shader, "mdl", (float*)ortho[i] );
gload_mat4( shader, "mdl", (mat4_t)ortho[i] );
}
void load_rot_matrix( unsigned int shader, float * q )
void load_rot_matrix( id_t shader, quat_t q )
{
mat4 m;
glm_quat_mat4( q, m );
gload_mat4( shader, "rot", (float*)m );
gload_mat4( shader, "rot", (mat4_t)m );
}