diff --git a/geometry/geometry.c b/geometry/geometry.c index 9009e9535ffcc01be5af80d023b723282f76be90..f55c391315a35692e8333058b2086c15fda885a4 100644 --- a/geometry/geometry.c +++ b/geometry/geometry.c @@ -131,16 +131,6 @@ bool is_point_part_of_triangle(triangle* tri, position point){ * @return triangle* Triangle englobant toues les points. */ triangle* generate_super_triangle(position min, position max){ - //double min_x = 2 * min.x - EPSILON; - //double max_x = 2 * max.x + EPSILON; - // - //double min_y = 2 * min.y - EPSILON; - //double max_y = 2 * max.y + EPSILON; -// - //position a = (position){.x = min_x, .y = min_y, .z = 0}; - //position b = (position){.x = max_x, .y = min_y, .z = 0}; - //position c = (position){.x = min_x, .y = max_y, .z = 0}; - position center = (position){.x = 0, .y = 0, .z = 0}; double dst_min = distance(center, min); double dst_max = distance(center, max); @@ -152,10 +142,6 @@ triangle* generate_super_triangle(position min, position max){ position b = (position){.x = cos(225*M_PI/180) * dst, .y = sin(225*M_PI/180) * dst, .z = 0}; position c = (position){.x = cos(315*M_PI/180) * dst, .y = sin(315*M_PI/180) * dst, .z = 0}; - printf("%f %f\n", a.x, a.y); - printf("%f %f\n", b.x, b.y); - printf("%f %f\n\n", c.x, c.y); - triangle* s_t = create_triangle(a, b, c); return s_t; diff --git a/main.c b/main.c index 5ede0dd1040f2acaff8eebeb8f2f1342d295d3b5..ea7a68f5da383957aa392de4ae2766b081122e08 100644 --- a/main.c +++ b/main.c @@ -34,7 +34,7 @@ int main(int argc, char **argv){ // Lit le fichier d'entrée et récupère les valeurs stockée las_file* las_f = read_las_file(input); - + // Triangulation list* delaunay = DelaunayTriangulation(las_f->nb_element, las_f->elements, *las_f->min_element, *las_f->max_element); diff --git a/result/result.stl b/result/result.stl index 2eabf0545ee675806d7d53db252c13642cfbda3b..91598e4eee7cc0d27eca9fef31e7a89001dcd99d 100644 --- a/result/result.stl +++ b/result/result.stl @@ -1,44 +1,9 @@ solid result - facet normal -0.010000 -0.010000 0.010000 + facet normal 0.000000 0.000000 0.022500 outer loop - vertex 0.000000 0.100000 0.100000 - vertex 0.000000 0.000000 0.000000 - vertex 0.100000 0.000000 0.100000 - endloop - endfacet - facet normal -0.010000 -0.010000 0.010000 - outer loop - vertex 0.000000 0.100000 0.100000 - vertex 0.100000 0.000000 0.100000 - vertex 0.100000 0.100000 0.200000 - endloop - endfacet - facet normal 0.000000 0.000000 0.000000 - outer loop - vertex 0.100000 0.100000 0.200000 - vertex 0.100000 0.000000 0.100000 - vertex 0.150000 0.050000 0.100000 - endloop - endfacet - facet normal 0.000000 0.000000 0.005000 - outer loop - vertex 0.150000 0.050000 0.100000 - vertex 0.100000 0.000000 0.100000 - vertex 0.200000 0.000000 0.100000 - endloop - endfacet - facet normal 0.000000 0.000000 0.000000 - outer loop - vertex 0.100000 0.100000 0.200000 - vertex 0.150000 0.050000 0.100000 - vertex 0.250000 0.050000 0.200000 - endloop - endfacet - facet normal -0.005000 -0.005000 0.005000 - outer loop - vertex 0.150000 0.050000 0.100000 - vertex 0.200000 0.000000 0.100000 - vertex 0.250000 0.050000 0.200000 + vertex -0.050000 0.100000 0.100000 + vertex -0.050000 -0.050000 0.100000 + vertex 0.100000 -0.050000 0.100000 endloop endfacet endsolid result