Clean code for MVP Release
This commit is contained in:
@@ -1,12 +1,14 @@
|
||||
#include <stdio.h>
|
||||
#include <math.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#define CGLM_ALL_UNALIGNED
|
||||
#include <cglm/vec3.h>
|
||||
#include <cglm/vec4.h>
|
||||
|
||||
#ifndef M_PI
|
||||
#define M_PI 3.14159265358979323846
|
||||
#endif
|
||||
|
||||
typedef void(*function_t)(float*,int, int, int);
|
||||
|
||||
void mobius(float *d_surface, int i, int j, int grid_size)
|
||||
{
|
||||
@@ -40,7 +42,9 @@ void klein(float *d_surface, int i, int j, int grid_size)
|
||||
d_surface[3] = sin(v)*sin(u/2);
|
||||
}
|
||||
|
||||
float * generate_surface(int grid_size, unsigned char *m )
|
||||
typedef void(*function_t)(float*,int, int, int);
|
||||
|
||||
float * generate_data_surface(int grid_size, unsigned char *m )
|
||||
{
|
||||
unsigned int i,j,k=0;
|
||||
long size;
|
||||
@@ -94,3 +98,88 @@ float * generate_surface(int grid_size, unsigned char *m )
|
||||
|
||||
return d_surface;
|
||||
}
|
||||
|
||||
static
|
||||
void __calculate_normal(float* p1, float* p2, float* p3,float* normal, unsigned char n)
|
||||
{
|
||||
float alpha;
|
||||
vec4 v1, v2, v3;
|
||||
vec4 u1, u2, u3;
|
||||
|
||||
switch (n)
|
||||
{
|
||||
case 3:
|
||||
|
||||
glm_vec3_sub(p2, p1, v1);
|
||||
glm_vec3_sub(p3, p1, v2);
|
||||
|
||||
glm_vec3_cross(v1, v2, normal);
|
||||
glm_vec3_normalize(normal);
|
||||
return;
|
||||
|
||||
case 4:
|
||||
|
||||
/*
|
||||
In Grant-Shmidth we need 3 linearly independian vector that forms a basis,
|
||||
so we can have a ortonormal version of that basis, since, we must have
|
||||
v1 = p3 - p1
|
||||
v2 = p2 - p1
|
||||
Then v3 = p1, will most certantly be linerly independiant to v1 and v2.
|
||||
*/
|
||||
glm_vec4_sub(p2, p1, v1);
|
||||
glm_vec4_sub(p3, p1, v2);
|
||||
glm_vec4_copy(p1, v3);
|
||||
|
||||
/* Setup U1 */
|
||||
{
|
||||
glm_vec4_copy(v1, u1);
|
||||
}
|
||||
|
||||
/* Setup U2 */
|
||||
{
|
||||
vec4 proj;
|
||||
|
||||
alpha = glm_vec4_dot(v2, u1) / glm_vec4_dot(u1, u1);
|
||||
glm_vec4_scale(u1, alpha, proj);
|
||||
|
||||
glm_vec4_sub(v2, proj, u2);
|
||||
}
|
||||
|
||||
/* Setup U3 */
|
||||
{
|
||||
vec4 proj1, proj2;
|
||||
|
||||
alpha = glm_vec4_dot(v3, u1) / glm_vec4_dot(u1, u1);
|
||||
glm_vec4_scale(u1, alpha, proj1);
|
||||
|
||||
alpha = glm_vec4_dot(v3, u2) / glm_vec4_dot(u2, u2);
|
||||
glm_vec4_scale(u2, alpha, proj2);
|
||||
|
||||
glm_vec4_sub(v3, proj1, u3);
|
||||
glm_vec4_sub(u3, proj2, u3);
|
||||
}
|
||||
|
||||
glm_vec4_copy(u3, normal);
|
||||
glm_vec4_normalize(normal);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
float * generate_normals_surface( float * d, unsigned char m )
|
||||
{
|
||||
float * n;
|
||||
n = malloc( (*d+1)*sizeof(float));
|
||||
*n = *d;
|
||||
for (int i = 0; i < *d; i += 3*m)
|
||||
{
|
||||
|
||||
vec4 norm_vec;
|
||||
|
||||
__calculate_normal((d+1)+i, (d+1)+i+m, (d+1)+i+2*m, norm_vec, m);
|
||||
glm_vec3_copy( norm_vec, (n+1)+i );
|
||||
glm_vec3_copy( norm_vec, (n+1)+i+m );
|
||||
glm_vec3_copy( norm_vec, (n+1)+i+2*m );
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user