diff --git a/README.md b/README.md index ec0df413a314a1f57bd34fd512b2b707ed163ba9..cd4ed1766035f899a495d247e6fa74221bc69024 100644 --- a/README.md +++ b/README.md @@ -1,30 +1,88 @@ +# Structure +Le fichier de résulat se situe dans `result`. + +```bash +delaunay_prog_seq +│ README.md +│ main.c +│ Makefile +│ +| +└───las +│ │ las_reader.c +│ │ las_reader.h +│ │ las_tests.c +│ │ 'pyramid.ply' +│ │ 'test.ply' +│ +| +└───stl +│ │ stl_writer.c +│ │ stl_writer.h +│ │ stl_tests.c +| └───'result_tests' +| +| +└───triangulation +│ │ triangulation.c +│ │ triangulation.h +│ │ triangulation_tests.c +| +| +└───chained_list +│ │ chained_list.c +│ │ chained_list.h +│ +| +└───display +│ │ draw.c +│ │ draw.h +│ └───gfx +│ +| +└───geometry + │ geometry.c + │ geometry.h +``` + + # Lancer le programme (Il est nécessaire de clean entre un make et un make tests) +```bash make clean - make - ./main +``` ## Avec input +```bash ./main 'Emplacement Fichier' - +``` ## Avec Affichage +```bash ./main -gfx - ./main 'Emplacement Fichier' -gfx +``` + +## Avec fichiers fournis +```bash +./main ./input_exemple/random.ply -gfx +./main ./input_exemple/pos.ply -gfx +./main ./input_exemple/negat.ply -gfx +./main ./input_exemple/both.ply -gfx +./main ./input_exemple/pyramide.ply -gfx +``` ## Tests +```bash make clean - make tests ./las_tests - ./triangulation_tests - ./stl_tests +``` # Tests (Il est nécessaire de clean entre un make et un make tests) diff --git a/input_exemple/both.ply b/input_exemple/both.ply new file mode 100644 index 0000000000000000000000000000000000000000..c7c174add7928a4832a96ce6755cd6e7e819bce2 --- /dev/null +++ b/input_exemple/both.ply @@ -0,0 +1,10 @@ +ply +format ascii 1.0 +element vertex 3 +property float x +property float y +property float z +end_header +-0.050000 -0.050000 0.100000 +-0.050000 0.10000 0.10000 +0.10000 -0.05000 0.10000 diff --git a/input_exemple/negat.ply b/input_exemple/negat.ply new file mode 100644 index 0000000000000000000000000000000000000000..aa7bbe4574bcc82cd00512810d51aee8706aa2dc --- /dev/null +++ b/input_exemple/negat.ply @@ -0,0 +1,10 @@ +ply +format ascii 1.0 +element vertex 3 +property float x +property float y +property float z +end_header +0.000000 0.000000 0.000000 +0.000000 -0.10000 -0.10000 +-0.10000 0.00000 -0.10000 diff --git a/input_exemple/pos.ply b/input_exemple/pos.ply new file mode 100644 index 0000000000000000000000000000000000000000..95b43c1d82dd006ed94b93193dd257e706b61058 --- /dev/null +++ b/input_exemple/pos.ply @@ -0,0 +1,10 @@ +ply +format ascii 1.0 +element vertex 3 +property float x +property float y +property float z +end_header +0.000000 0.000000 0.000000 +0.000000 0.100000 0.000000 +0.100000 0.000000 0.000000 diff --git a/input_exemple/pyramide.ply b/input_exemple/pyramide.ply new file mode 100644 index 0000000000000000000000000000000000000000..1c2c09bd23ae844bfecf727a72bfa0caaf8d1dbd --- /dev/null +++ b/input_exemple/pyramide.ply @@ -0,0 +1,12 @@ +ply +format ascii 1.0 +element vertex 5 +property float x +property float y +property float z +end_header +0.300000 0.300000 0.300000 +0.800000 0.300000 0.300000 +0.300000 0.800000 0.300000 +0.800000 0.800000 0.300000 +0.550000 0.550000 0.800000 diff --git a/input_exemple/random.ply b/input_exemple/random.ply new file mode 100644 index 0000000000000000000000000000000000000000..b444e272527bc74a528266d98671c74e30b84007 --- /dev/null +++ b/input_exemple/random.ply @@ -0,0 +1,14 @@ +ply +format ascii 1.0 +element vertex 7 +property float x +property float y +property float z +end_header +0.000000 0.000000 0.000000 +0.000000 0.100000 0.100000 +0.100000 0.000000 0.100000 +0.100000 0.100000 0.200000 +0.150000 0.050000 0.100000 +0.200000 0.000000 0.100000 +0.250000 0.050000 0.200000 diff --git a/result/result.stl b/result/result.stl index 91598e4eee7cc0d27eca9fef31e7a89001dcd99d..2eabf0545ee675806d7d53db252c13642cfbda3b 100644 --- a/result/result.stl +++ b/result/result.stl @@ -1,9 +1,44 @@ solid result - facet normal 0.000000 0.000000 0.022500 + facet normal -0.010000 -0.010000 0.010000 outer loop - vertex -0.050000 0.100000 0.100000 - vertex -0.050000 -0.050000 0.100000 - vertex 0.100000 -0.050000 0.100000 + 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 endloop endfacet endsolid result