Merge: roberto -> main

This commit is contained in:
PedroEdiaz
2024-10-22 19:26:10 -06:00
parent b50fbf9d2d
commit 7787daa2da
6 changed files with 122 additions and 49 deletions

View File

@@ -37,28 +37,28 @@ void klein(float *d_surface, int i, int j, int grid_size)
d_surface[0] = (0.5*cos(v) + 0.5) * cos(u);
d_surface[1] = (0.5*cos(v) + 0.5) * sin(u);
d_surface[2] = sin(v) * cos(u/2);
//d_surface[2] = sin(v)*sin(u/2);
d_surface[3] = sin(v)*sin(u/2);
}
float * generate_surface(int grid_size, unsigned char * m)
float * generate_surface(int grid_size, unsigned char *m )
{
float * d_surface;
function_t f;
int i,j,k=0;
unsigned int i,j,k=0;
long size;
function_t f;
float * d_surface;
*m = 3;
f = klein;
size = grid_size*grid_size*2*3*(*m);
*m = 4;
size = grid_size*grid_size*12*(*m);
d_surface = malloc((size+1)*sizeof(float));
d_surface[0] = size;
for( i = 0; i < grid_size; i++)
{
for( j = 0; j < grid_size; j++)
{
// triangle 1
// triangle 1, Front
f(&d_surface[k + 1], i, j, grid_size);
k+=*m;
f(&d_surface[k + 1], i + 1, j, grid_size);
@@ -66,13 +66,29 @@ float * generate_surface(int grid_size, unsigned char * m)
f(&d_surface[k + 1], i + 1, j + 1, grid_size);
k+=*m;
// triangle 2
// triangle 1, Back
f(&d_surface[k + 1], i + 1, j + 1, grid_size);
k+=*m;
f(&d_surface[k + 1], i + 1, j, grid_size);
k+=*m;
f(&d_surface[k + 1], i, j, grid_size);
k+=*m;
// triangle 2, Frontt
f(&d_surface[k + 1], i + 1, j + 1, grid_size);
k+=*m;
f(&d_surface[k + 1], i, j + 1, grid_size);
k+=*m;
f(&d_surface[k + 1], i, j, grid_size);
k+=*m;
// triangle 2, Back
f(&d_surface[k + 1], i, j, grid_size);
k+=*m;
f(&d_surface[k + 1], i, j + 1, grid_size);
k+=*m;
f(&d_surface[k + 1], i + 1, j + 1, grid_size);
k+=*m;
}
}