Added straight skeleton 2 #29
Conversation
|
oh nice! will have a look... |
| @@ -0,0 +1,33 @@ | |||
| import numpy as np | |||
| from compas.geometry import normal_polygon | |||
| from compas.tolerance import Tolerance | |||
There was a problem hiding this comment.
currently you should do from compas.tolerance import TOL, which is the global instance of the Tolerance class.
i will replace this with a singleton in the future, but currently this would be better...
| If the normal of the polygon is not [0, 0, 1]. | ||
| """ | ||
| points = list(points) | ||
| tol = Tolerance() |
| """ | ||
| points = list(points) | ||
| tol = Tolerance() | ||
| if not tol.is_allclose(normal_polygon(points, True), [0, 0, 1]): |
src/straight_skeleton_2.cpp
Outdated
| { | ||
| poly.push_back(Point(V(i, 0), V(i, 1))); | ||
| } | ||
| assert(poly.is_counterclockwise_oriented()); |
There was a problem hiding this comment.
perhaps it is worth checking what happens with these assertions on the Python side
There was a problem hiding this comment.
i removed the assert, as the orientation check is anyway on python side
| @@ -0,0 +1,16 @@ | |||
| from compas_cgal.straight_skeleton_2 import create_interior_straight_skeleton | |||
There was a problem hiding this comment.
perhaps it would be worth adding a few tests of "known"/"predictable" skeletons?
|
the build on windows fails here |
src/straight_skeleton_2.cpp
Outdated
| } | ||
| assert(poly.is_counterclockwise_oriented()); | ||
| SsPtr iss = CGAL::create_interior_straight_skeleton_2(poly.vertices_begin(), poly.vertices_end()); | ||
| Edges edgelist; |
There was a problem hiding this comment.
perhaps this typedef conflicts with the one from skeletonization.h
src/straight_skeleton_2.cpp
Outdated
| if(&*v1 < &*v2){ | ||
| std::vector<double> s_vec = {v1->point().x(), v1->point().y(), 0}; | ||
| std::vector<double> t_vec = {v2->point().x(), v2->point().y(), 0}; | ||
| Edge edge = std::make_tuple(s_vec, t_vec); |
src/straight_skeleton_2.h
Outdated
| typedef std::tuple<std::vector<double>, std::vector<double>> Edge; | ||
| typedef std::list<Edge> Edges; |
There was a problem hiding this comment.
perhaps we can move these guys to the compas namespace?
There was a problem hiding this comment.
same for the definitions in skeletonization.h...
There was a problem hiding this comment.
i put the typedefs of Edge and Edges into the compas namespace and removed them from skeletonization and straight_skeleton_2.. still failing on windows 😒
There was a problem hiding this comment.
It finally builds! just forgot to add the "straight_skeleton_2.cpp" to the setup.py 😅
|
cool seems to work now 🎉 |
New feature:
Straight skeletons 2:
https://doc.cgal.org/latest/Straight_skeleton_2/index.html
Upcoming add ons: