diff --git a/DATA/Fragment1_ML3_Surface_diviseePar10.stl b/DATA/Fragment1_ML3_Surface_diviseePar10.stl new file mode 100644 index 0000000..43d88e8 --- /dev/null +++ b/DATA/Fragment1_ML3_Surface_diviseePar10.stl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:449dbee721bae7d563378bf83b10fdaf11275212849f026f2d377a3052778353 +size 26775083 diff --git a/DATA/Fragment1_ML3_Surface_full.stl b/DATA/Fragment1_ML3_Surface_full.stl new file mode 100644 index 0000000..91a93cb --- /dev/null +++ b/DATA/Fragment1_ML3_Surface_full.stl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f75d9f598120af3edecfcc4e86d787f68a571c9cf5de9fcc993a6f1267268c0 +size 268492683 diff --git a/DATA/Fragment1_full.txt b/DATA/Fragment1_full.txt new file mode 100644 index 0000000..63d9b59 --- /dev/null +++ b/DATA/Fragment1_full.txt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:913903dec50a76b5f487e94a2b0c1140372fe962687e7bafd76988a7a4bd1b0f +size 14834979 diff --git a/DATA/Fragment1_reduced.txt b/DATA/Fragment1_reduced.txt new file mode 100644 index 0000000..5bc64f9 --- /dev/null +++ b/DATA/Fragment1_reduced.txt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7217577bff619a8d137896e8206be3fd86a1eb0fde4ef0436ee986e0cc09c16 +size 1567942 diff --git a/DATA/Fragment2_MS3_full.stl b/DATA/Fragment2_MS3_full.stl new file mode 100644 index 0000000..bba2e0e --- /dev/null +++ b/DATA/Fragment2_MS3_full.stl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75e81a2964d23d2c49d0547c0defd2ad3a2ddaad54938813b00a8f2c93919425 +size 459684066 diff --git a/DATA/Fragment2_MS3_surface.diviseePar20.stl b/DATA/Fragment2_MS3_surface.diviseePar20.stl new file mode 100644 index 0000000..ed4bb6d --- /dev/null +++ b/DATA/Fragment2_MS3_surface.diviseePar20.stl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc9feb21687298b8d20c861a556ac8f4c0b48d1eadae7d162f58a09cabaf264b +size 23116989 diff --git a/DATA/Fragment2_full.txt b/DATA/Fragment2_full.txt new file mode 100644 index 0000000..1728f3e --- /dev/null +++ b/DATA/Fragment2_full.txt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72e38e85167a724f2563764f976a4191b568b15cc62609c2bee305dbbbd4be9b +size 25998672 diff --git a/DATA/Fragment2_reduced.txt b/DATA/Fragment2_reduced.txt new file mode 100644 index 0000000..3539f7a --- /dev/null +++ b/DATA/Fragment2_reduced.txt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0a993a8d32cb444451c557b46ca3d6548cd32d53ca0962ac09388ed56ef2ff1 +size 1307624 diff --git "a/Report and Presentation/Presentation_ProjetENAC_Roughness_Del\351vauxDavid.pdf" "b/Report and Presentation/Presentation_ProjetENAC_Roughness_Del\351vauxDavid.pdf" new file mode 100644 index 0000000..10a1564 Binary files /dev/null and "b/Report and Presentation/Presentation_ProjetENAC_Roughness_Del\351vauxDavid.pdf" differ diff --git "a/Report and Presentation/Presentation_ProjetENAC_Roughness_Del\351vauxDavid.pptx" "b/Report and Presentation/Presentation_ProjetENAC_Roughness_Del\351vauxDavid.pptx" new file mode 100644 index 0000000..ce75ee3 Binary files /dev/null and "b/Report and Presentation/Presentation_ProjetENAC_Roughness_Del\351vauxDavid.pptx" differ diff --git "a/Report and Presentation/Report_ProjetENAC_Roughness_Del\351vauxDavid.pdf" "b/Report and Presentation/Report_ProjetENAC_Roughness_Del\351vauxDavid.pdf" new file mode 100644 index 0000000..5e6d083 Binary files /dev/null and "b/Report and Presentation/Report_ProjetENAC_Roughness_Del\351vauxDavid.pdf" differ diff --git a/SMOOTHED FRAGMENTS/Blender Smoothing/.gitattributes b/SMOOTHED FRAGMENTS/Blender Smoothing/.gitattributes new file mode 100644 index 0000000..9921133 --- /dev/null +++ b/SMOOTHED FRAGMENTS/Blender Smoothing/.gitattributes @@ -0,0 +1,2 @@ +Fragment1_reduced_Factor1.txt filter=lfs diff=lfs merge=lfs -text +Fragment1_reduced_Factor2.txt filter=lfs diff=lfs merge=lfs -text diff --git a/SMOOTHED FRAGMENTS/Blender Smoothing/Explanations.txt b/SMOOTHED FRAGMENTS/Blender Smoothing/Explanations.txt new file mode 100644 index 0000000..9b7ad30 --- /dev/null +++ b/SMOOTHED FRAGMENTS/Blender Smoothing/Explanations.txt @@ -0,0 +1 @@ +Laplacian smoothing applied with Blender software. 10 iterations with factor 1 and 2 \ No newline at end of file diff --git a/SMOOTHED FRAGMENTS/Blender Smoothing/Fragment1_reduced_Factor1.txt b/SMOOTHED FRAGMENTS/Blender Smoothing/Fragment1_reduced_Factor1.txt new file mode 100644 index 0000000..cfb3550 --- /dev/null +++ b/SMOOTHED FRAGMENTS/Blender Smoothing/Fragment1_reduced_Factor1.txt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16626b9ef40c15edce220f28c354e45a5bf1373ebe6a98200a14333ec1ce2cd4 +size 1634967 diff --git a/SMOOTHED FRAGMENTS/Blender Smoothing/Fragment1_reduced_Factor2.txt b/SMOOTHED FRAGMENTS/Blender Smoothing/Fragment1_reduced_Factor2.txt new file mode 100644 index 0000000..124355f --- /dev/null +++ b/SMOOTHED FRAGMENTS/Blender Smoothing/Fragment1_reduced_Factor2.txt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eafcfe5b8d60bdf1273db95613306e925d24e346c58ef05860894658f8913ddc +size 1634966 diff --git a/SMOOTHED FRAGMENTS/Cone Smoothing 1 degree/.gitattributes b/SMOOTHED FRAGMENTS/Cone Smoothing 1 degree/.gitattributes new file mode 100644 index 0000000..14ad3ab --- /dev/null +++ b/SMOOTHED FRAGMENTS/Cone Smoothing 1 degree/.gitattributes @@ -0,0 +1,4 @@ +Fragment1_reduced_smoothed.txt filter=lfs diff=lfs merge=lfs -text +Fragment2_full_smoothed.txt filter=lfs diff=lfs merge=lfs -text +Fragment2_reduced_smoothed.txt filter=lfs diff=lfs merge=lfs -text +Fragment1_full_smoothed.txt filter=lfs diff=lfs merge=lfs -text diff --git a/SMOOTHED FRAGMENTS/Cone Smoothing 1 degree/Fragment1_full_smoothed.txt b/SMOOTHED FRAGMENTS/Cone Smoothing 1 degree/Fragment1_full_smoothed.txt new file mode 100644 index 0000000..0340385 --- /dev/null +++ b/SMOOTHED FRAGMENTS/Cone Smoothing 1 degree/Fragment1_full_smoothed.txt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd5cf234b926c0eecfac644d659d401917fa332e08fc7d280472bc6a48d21d95 +size 36931478 diff --git a/SMOOTHED FRAGMENTS/Cone Smoothing 1 degree/Fragment1_reduced_smoothed.txt b/SMOOTHED FRAGMENTS/Cone Smoothing 1 degree/Fragment1_reduced_smoothed.txt new file mode 100644 index 0000000..5e42712 --- /dev/null +++ b/SMOOTHED FRAGMENTS/Cone Smoothing 1 degree/Fragment1_reduced_smoothed.txt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df8c454d073b4a5f2b781e545d715536d1e8685070c99ec093fa9a50a3abb003 +size 3621615 diff --git a/SMOOTHED FRAGMENTS/Cone Smoothing 1 degree/Fragment2_full_smoothed.txt b/SMOOTHED FRAGMENTS/Cone Smoothing 1 degree/Fragment2_full_smoothed.txt new file mode 100644 index 0000000..e58b400 --- /dev/null +++ b/SMOOTHED FRAGMENTS/Cone Smoothing 1 degree/Fragment2_full_smoothed.txt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52a8634b59371d7cae573267feba24ddfffe7378b4fd450b06ca2f76ce73b03a +size 62650843 diff --git a/SMOOTHED FRAGMENTS/Cone Smoothing 1 degree/Fragment2_reduced_smoothed.txt b/SMOOTHED FRAGMENTS/Cone Smoothing 1 degree/Fragment2_reduced_smoothed.txt new file mode 100644 index 0000000..72706d0 --- /dev/null +++ b/SMOOTHED FRAGMENTS/Cone Smoothing 1 degree/Fragment2_reduced_smoothed.txt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1625e30002aa0ff0560e87534f365fb53e0cbc8b0e96241d61890a429a0b3ee2 +size 3086467 diff --git a/SMOOTHED FRAGMENTS/Cone Smoothing 1 degree/smoothing.cpp b/SMOOTHED FRAGMENTS/Cone Smoothing 1 degree/smoothing.cpp new file mode 100644 index 0000000..e08054e --- /dev/null +++ b/SMOOTHED FRAGMENTS/Cone Smoothing 1 degree/smoothing.cpp @@ -0,0 +1,98 @@ +#include +#include +#include +#include +#include +#include +using namespace std; +//Gianluca Costagliola + +main(int argc, char* argv[]){ + + + +ifstream infile("nfrag1bis.txt"); //file name input +FILE* co=fopen("newset1.txt","w"); //file name outpus + +double angle=1.0; //limit angle in degrees + + + +//read data and shift and centroid calculation +vector data_x; //rough data +vector data_y; // +vector data_z; // +double xc=0; //centroid +double yc=0; // +double zc=0; // +int np=0; //number of points + + +double a,b,c; +int i,j; +while(infile >> a >> b >> c){ + data_x.push_back(a); + data_y.push_back(b); + data_z.push_back(c); + + xc=xc+a; + yc=yc+b; + zc=zc+c; + np=np+1; + } +xc=xc/np; +yc=yc/np; +zc=zc/np; + +cout< x(np); //points rescaled with respect to the centroid +vector y(np); // +vector z(np); // +vector dist(np); //distance from the centroid + +for(i=0;i dist_smooth(np,0); +vector nro(np,0); +double px,py,pz,scal; +double cos_a=cos(M_PI*angle/180.0); +for(i=0;icos_a){ + dist_smooth[i]=dist_smooth[i]+dist[j]; + nro[i]=nro[i]+1; + } + } + + } + + dist_smooth[i]=dist_smooth[i]/nro[i]; + } + + + + +for(i=0;i