Fix: compile
This commit is contained in:
10
src/main.c
10
src/main.c
@@ -18,7 +18,7 @@ unsigned char palette[] =
|
|||||||
0x7A,0x1C,0xAC,0xff,
|
0x7A,0x1C,0xAC,0xff,
|
||||||
};
|
};
|
||||||
|
|
||||||
void calc_normal(float* v1, float* v2, float* v3, , float* v4 ,float* normal, unsigned char n)
|
void calc_normal(float* v1, float* v2, float* v3,float* normal, unsigned char n)
|
||||||
{
|
{
|
||||||
vec4 lado1, lado2;
|
vec4 lado1, lado2;
|
||||||
vec4 u1, u2;
|
vec4 u1, u2;
|
||||||
@@ -53,7 +53,7 @@ void calc_normal(float* v1, float* v2, float* v3, , float* v4 ,float* normal, un
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
float * fill_normal( float * d )
|
float * fill_normal( float * d, unsigned char m )
|
||||||
{
|
{
|
||||||
float * n;
|
float * n;
|
||||||
n = malloc( (*d+1)*sizeof(float));
|
n = malloc( (*d+1)*sizeof(float));
|
||||||
@@ -62,7 +62,7 @@ float * fill_normal( float * d )
|
|||||||
{
|
{
|
||||||
|
|
||||||
vec3 norm_vec;
|
vec3 norm_vec;
|
||||||
calc_normal((d+1)+i, (d+1)+i+3, (d+1)+i+6, norm_vec);
|
calc_normal((d+1)+i, (d+1)+i+3, (d+1)+i+6, norm_vec, m);
|
||||||
glm_vec3_copy( norm_vec, (n+1)+i );
|
glm_vec3_copy( norm_vec, (n+1)+i );
|
||||||
glm_vec3_copy( norm_vec, (n+1)+i+3 );
|
glm_vec3_copy( norm_vec, (n+1)+i+3 );
|
||||||
glm_vec3_copy( norm_vec, (n+1)+i+6 );
|
glm_vec3_copy( norm_vec, (n+1)+i+6 );
|
||||||
@@ -96,8 +96,8 @@ int main( void )
|
|||||||
|
|
||||||
load_fix_matrix( shader, (float)WIDTH/HEIGHT );
|
load_fix_matrix( shader, (float)WIDTH/HEIGHT );
|
||||||
|
|
||||||
n_cube = fill_normal( d_cube );
|
n_cube = fill_normal( d_cube, 3 );
|
||||||
n_axis = fill_normal( d_axis );
|
n_axis = fill_normal( d_axis, 3 );
|
||||||
|
|
||||||
if( !( m_cube = create_mesh( d_cube, n_cube ) ) )
|
if( !( m_cube = create_mesh( d_cube, n_cube ) ) )
|
||||||
goto error_mesh_cube;
|
goto error_mesh_cube;
|
||||||
|
|||||||
Reference in New Issue
Block a user