mirror of
https://github.com/NGSolve/netgen.git
synced 2024-12-25 05:20:34 +05:00
Merge branch 'fix_csg2d' into 'master'
Fix csg2d See merge request jschoeberl/netgen!374
This commit is contained in:
commit
57a4d03d23
@ -804,8 +804,8 @@ void ComputeIntersections(Edge edgeP , Loop & l2)
|
|||||||
{
|
{
|
||||||
for (Edge edgeQ : l2.Edges(SOURCE))
|
for (Edge edgeQ : l2.Edges(SOURCE))
|
||||||
{
|
{
|
||||||
double alpha = -1;
|
double alpha = -EPSILON;
|
||||||
double beta = -1;
|
double beta = -EPSILON;
|
||||||
IntersectionType i = intersect(edgeP, edgeQ, alpha, beta);
|
IntersectionType i = intersect(edgeP, edgeQ, alpha, beta);
|
||||||
AddIntersectionPoint(edgeP, edgeQ, i, alpha, beta);
|
AddIntersectionPoint(edgeP, edgeQ, i, alpha, beta);
|
||||||
if(i==X_INTERSECTION && (edgeP.v0->spline || edgeQ.v0->spline))
|
if(i==X_INTERSECTION && (edgeP.v0->spline || edgeQ.v0->spline))
|
||||||
@ -2216,6 +2216,8 @@ shared_ptr<netgen::SplineGeometry2d> CSG2d :: GenerateSplineGeometry()
|
|||||||
seg->reffak = 1;
|
seg->reffak = 1;
|
||||||
seg->copyfrom = -1;
|
seg->copyfrom = -1;
|
||||||
seg->hmax = ls.maxh;
|
seg->hmax = ls.maxh;
|
||||||
|
seg->hpref_left = 0.;
|
||||||
|
seg->hpref_right = 0.;
|
||||||
geo->AppendSegment(seg);
|
geo->AppendSegment(seg);
|
||||||
}
|
}
|
||||||
t_segments.Stop();
|
t_segments.Stop();
|
||||||
|
Loading…
Reference in New Issue
Block a user