From 19ce5edd067c17b82ea2c10a14e96e66bb7232e7 Mon Sep 17 00:00:00 2001
From: JM <crewgan@pop-os.localdomain>
Date: Sat, 18 Jun 2022 23:14:20 +0200
Subject: [PATCH] Modificaiton Readme + ajout de fichiers d'exemples
---
README.md | 72 ++++++++++++++++++++++++++++++++++----
input_exemple/both.ply | 10 ++++++
input_exemple/negat.ply | 10 ++++++
input_exemple/pos.ply | 10 ++++++
input_exemple/pyramide.ply | 12 +++++++
input_exemple/random.ply | 14 ++++++++
result/result.stl | 43 ++++++++++++++++++++---
7 files changed, 160 insertions(+), 11 deletions(-)
create mode 100644 input_exemple/both.ply
create mode 100644 input_exemple/negat.ply
create mode 100644 input_exemple/pos.ply
create mode 100644 input_exemple/pyramide.ply
create mode 100644 input_exemple/random.ply
diff --git a/README.md b/README.md
index ec0df41..cd4ed17 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 0000000..c7c174a
--- /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 0000000..aa7bbe4
--- /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 0000000..95b43c1
--- /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 0000000..1c2c09b
--- /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 0000000..b444e27
--- /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 91598e4..2eabf05 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
--
GitLab