diff --git a/src/delaunay.c b/src/delaunay.c index f90cea1390af38664c533e85ed6902f8604e06c7..fcdcca87847be230d21ba3d3267377759a9124e8 100644 --- a/src/delaunay.c +++ b/src/delaunay.c @@ -94,6 +94,7 @@ double det2(double a, double b, double c, double d) { * https://de.wikipedia.org/wiki/Cramersche_Regel * https://de.wikipedia.org/wiki/Determinante */ +//TODO seperate radius from this function circle circleFrom3Points(vertex v1, vertex v2, vertex v3) { circle c; double ax = 2*(v1.x-v2.x); diff --git a/src/dwyer.c b/src/dwyer.c index 71c5e8eebc214567bdf1f37ddc9ca6c86386e27d..d030ff13baf064ff727709786c359b100f65e2cc 100644 --- a/src/dwyer.c +++ b/src/dwyer.c @@ -765,6 +765,7 @@ EDGE_PTR e; } } +//TODO replace other circle function with this? struct VEC2 circle_center(a,b,c) /* returns the center of the circle passing through A, B & C. */ struct VEC2 a,b,c; diff --git a/src/main.c b/src/main.c index da68a4f6ce79c6df41b8f6a6dca4f9ba81512a44..845c9411bdf29871d4dedecb4538fd4f6881e73b 100644 --- a/src/main.c +++ b/src/main.c @@ -26,10 +26,9 @@ int main(int argc, char *argv[]) { } - //vertex *points = malloc(numberOfPoints * sizeof(vertex)); - vertex points[numberOfPoints]; + vertex *points = malloc(numberOfPoints * sizeof(vertex)); generatePoints(points, numberOfPoints); - printf("%lu\n", sizeof(points)); + printf("%lu\n", numberOfPoints * sizeof(vertex)); //drawPoints(points, numberOfPoints); #ifdef OUTPUTFILE diff --git a/src/voronoi.c b/src/voronoi.c index 338bf89715362a7a82c003b5b23f6161b5f39738..250a769a3b6466fbee54a3d06eefcdaec7a70122 100644 --- a/src/voronoi.c +++ b/src/voronoi.c @@ -121,6 +121,7 @@ void voronoiCws(vertex* S, int size) { } } lastV = currentV; +#ifdef DEL if(i < j && i < k) { if(isTriangle == 2){ #ifdef OUTPUTFILE @@ -128,6 +129,7 @@ void voronoiCws(vertex* S, int size) { #endif } } +#endif j = k; } while(j != j0); }