Skip to content
Snippets Groups Projects
Commit 0408a4fd authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix old bug relvealed by last commit (forgot to change verts in CircParam during RemoveDuplicates)

parent 55526345
No related branches found
No related tags found
No related merge requests found
......@@ -421,9 +421,6 @@ void End_Curve(Curve *c)
c->Circle.f1 = f1;
c->Circle.f2 = f2;
for(int i = 0; i < 4; i++)
c->Circle.v[i] = v[i];
if(!CTX::instance()->expertMode && c->Num > 0 && A3 - A1 > 1.01 * M_PI){
Msg::Error("Circle or ellipse arc %d greater than Pi (angle=%g)", c->Num, A3-A1);
Msg::Error("(If you understand what this implies, you can disable this error");
......
......@@ -105,7 +105,6 @@ class DrawingColor{
class CircParam{
public:
double t1, t2, f1, f2, incl;
Vertex *v[4];
double invmat[3][3];
double n[3];
};
......
......@@ -284,9 +284,10 @@ Vertex InterpolateCurve(Curve *c, double u, int derivee)
c->Circle.f2 * sin(theta) * cos(c->Circle.incl);
V.Pos.Z = 0.0;
Projette(&V, c->Circle.invmat);
V.Pos.X += c->Circle.v[1]->Pos.X;
V.Pos.Y += c->Circle.v[1]->Pos.Y;
V.Pos.Z += c->Circle.v[1]->Pos.Z;
List_Read(c->Control_Points, 1, &v[0]);
V.Pos.X += v[0]->Pos.X;
V.Pos.Y += v[0]->Pos.Y;
V.Pos.Z += v[0]->Pos.Z;
V.w = (1. - u) * c->beg->w + u * c->end->w;
V.lc = (1. - u) * c->beg->lc + u * c->end->lc;
break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment