ax/manigraph
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Esfera y espacios lente agregados

Browse Source
This commit is contained in:
alan
2024-12-01 15:10:27 -06:00
parent 3e3c6e676e
commit 6d1223d79e
1 changed files with 4 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/surface.c
View File

@@ -146,17 +146,10 @@ float *generate_data_surface(unsigned char *s)
float *d_surface; float *d_surface;
int *cara; int *cara;
<<<<<<< HEAD
parm.f = lens; parm.f = lens;
parm.m = 4; parm.m = 4;
parm.n = 4; parm.n = 4;
parm.grid = 5; parm.grid = 5;
=======
parm.f = klein;
parm.m = 2;
parm.n = 4;
parm.grid = 16;
>>>>>>> b19100424dbeaf4a4ecc88ddfc633b0c34fd0010
#ifdef TEST #ifdef TEST
assert(numero_caras(2) == 1); assert(numero_caras(2) == 1);
@@ -164,10 +157,6 @@ float *generate_data_surface(unsigned char *s)
assert(numero_caras(4) == 24); assert(numero_caras(4) == 24);
#endif #endif
<<<<<<< HEAD
cara = malloc(parm.m * sizeof(int));
=======
>>>>>>> b19100424dbeaf4a4ecc88ddfc633b0c34fd0010
*s = parm.n; *s = parm.n;
cara = malloc(parm.m * sizeof(int)); cara = malloc(parm.m * sizeof(int));
@@ -199,23 +188,11 @@ float *generate_data_surface(unsigned char *s)
parm.f(&d_surface[q + 1], cara, parm.grid); parm.f(&d_surface[q + 1], cara, parm.grid);
q += parm.n; q += parm.n;
<<<<<<< HEAD cara[p]++;
cara[o] = i + 1;
cara[p] = j;
parm.f(&d_surface[q + 1], cara, parm.grid); parm.f(&d_surface[q + 1], cara, parm.grid);
q += parm.n; q += parm.n;
cara[o] = i + 1; cara[o]++;
cara[p] = j + 1;
=======
cara[p] = i + 1;
cara[o] = j;
parm.f(&d_surface[q + 1], cara, parm.grid);
q += parm.n;
cara[p] = i + 1;
cara[o] = j + 1;
>>>>>>> b19100424dbeaf4a4ecc88ddfc633b0c34fd0010
parm.f(&d_surface[q + 1], cara, parm.grid); parm.f(&d_surface[q + 1], cara, parm.grid);
q += parm.n; q += parm.n;
@@ -224,23 +201,11 @@ float *generate_data_surface(unsigned char *s)
parm.f(&d_surface[q + 1], cara, parm.grid); parm.f(&d_surface[q + 1], cara, parm.grid);
q += parm.n; q += parm.n;
<<<<<<< HEAD cara[o]++;
cara[o] = i;
cara[p] = j + 1;
parm.f(&d_surface[q + 1], cara, parm.grid); parm.f(&d_surface[q + 1], cara, parm.grid);
q += parm.n; q += parm.n;
cara[o] = i + 1; cara[p]++;
cara [p] = j + 1;
=======
cara[p] = i;
cara[o] = j + 1;
parm.f(&d_surface[q + 1], cara, parm.grid);
q += parm.n;
cara[p] = i + 1;
cara[o] = j + 1;
>>>>>>> b19100424dbeaf4a4ecc88ddfc633b0c34fd0010
parm.f(&d_surface[q + 1], cara, parm.grid); parm.f(&d_surface[q + 1], cara, parm.grid);
q += parm.n; q += parm.n;
} }