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

specify Extrude->geo.Source for curves as well

parent 9f154450
No related branches found
No related tags found
No related merge requests found
...@@ -2613,6 +2613,7 @@ int ExtrudePoint(int type, int ip, double T0, double T1, double T2, double A0, ...@@ -2613,6 +2613,7 @@ int ExtrudePoint(int type, int ip, double T0, double T1, double T2, double A0,
c->Control_Points = List_Create(2, 1, sizeof(Vertex *)); c->Control_Points = List_Create(2, 1, sizeof(Vertex *));
c->Extrude = new ExtrudeParams; c->Extrude = new ExtrudeParams;
c->Extrude->fill(type, T0, T1, T2, A0, A1, A2, X0, X1, X2, alpha); c->Extrude->fill(type, T0, T1, T2, A0, A1, A2, X0, X1, X2, alpha);
c->Extrude->geo.Source = pv->Num;
if(e) c->Extrude->mesh = e->mesh; if(e) c->Extrude->mesh = e->mesh;
List_Add(c->Control_Points, &pv); List_Add(c->Control_Points, &pv);
List_Add(c->Control_Points, &chapeau); List_Add(c->Control_Points, &chapeau);
...@@ -2627,6 +2628,7 @@ int ExtrudePoint(int type, int ip, double T0, double T1, double T2, double A0, ...@@ -2627,6 +2628,7 @@ int ExtrudePoint(int type, int ip, double T0, double T1, double T2, double A0,
c->Control_Points = List_Create(2, 1, sizeof(Vertex *)); c->Control_Points = List_Create(2, 1, sizeof(Vertex *));
c->Extrude = new ExtrudeParams; c->Extrude = new ExtrudeParams;
c->Extrude->fill(type, T0, T1, T2, A0, A1, A2, X0, X1, X2, alpha); c->Extrude->fill(type, T0, T1, T2, A0, A1, A2, X0, X1, X2, alpha);
c->Extrude->geo.Source = pv->Num;
if(e) c->Extrude->mesh = e->mesh; if(e) c->Extrude->mesh = e->mesh;
List_Add(c->Control_Points, &pv); List_Add(c->Control_Points, &pv);
List_Add(c->Control_Points, &chapeau); List_Add(c->Control_Points, &chapeau);
...@@ -2659,6 +2661,7 @@ int ExtrudePoint(int type, int ip, double T0, double T1, double T2, double A0, ...@@ -2659,6 +2661,7 @@ int ExtrudePoint(int type, int ip, double T0, double T1, double T2, double A0,
c->Control_Points = List_Create(3, 1, sizeof(Vertex *)); c->Control_Points = List_Create(3, 1, sizeof(Vertex *));
c->Extrude = new ExtrudeParams; c->Extrude = new ExtrudeParams;
c->Extrude->fill(type, T0, T1, T2, A0, A1, A2, X0, X1, X2, alpha); c->Extrude->fill(type, T0, T1, T2, A0, A1, A2, X0, X1, X2, alpha);
c->Extrude->geo.Source = pv->Num;
if(e) c->Extrude->mesh = e->mesh; if(e) c->Extrude->mesh = e->mesh;
List_Add(c->Control_Points, &pv); List_Add(c->Control_Points, &pv);
// compute circle center // compute circle center
...@@ -2688,6 +2691,7 @@ int ExtrudePoint(int type, int ip, double T0, double T1, double T2, double A0, ...@@ -2688,6 +2691,7 @@ int ExtrudePoint(int type, int ip, double T0, double T1, double T2, double A0,
CTX::instance()->geom.extrudeSplinePoints + 1, 1, sizeof(Vertex *)); CTX::instance()->geom.extrudeSplinePoints + 1, 1, sizeof(Vertex *));
c->Extrude = new ExtrudeParams; c->Extrude = new ExtrudeParams;
c->Extrude->fill(type, T0, T1, T2, A0, A1, A2, X0, X1, X2, alpha); c->Extrude->fill(type, T0, T1, T2, A0, A1, A2, X0, X1, X2, alpha);
c->Extrude->geo.Source = pv->Num;
if(e) c->Extrude->mesh = e->mesh; if(e) c->Extrude->mesh = e->mesh;
List_Add(c->Control_Points, &pv); List_Add(c->Control_Points, &pv);
c->beg = pv; c->beg = pv;
...@@ -3017,7 +3021,6 @@ int ExtrudeSurface(int type, int is, double T0, double T1, double T2, double A0, ...@@ -3017,7 +3021,6 @@ int ExtrudeSurface(int type, int is, double T0, double T1, double T2, double A0,
List_Read(chapeau->Generatrices, i, &c); List_Read(chapeau->Generatrices, i, &c);
c->Extrude = new ExtrudeParams(COPIED_ENTITY); c->Extrude = new ExtrudeParams(COPIED_ENTITY);
c->Extrude->fill(type, T0, T1, T2, A0, A1, A2, X0, X1, X2, alpha); c->Extrude->fill(type, T0, T1, T2, A0, A1, A2, X0, X1, X2, alpha);
int c2num = 0; int c2num = 0;
if(ps) { if(ps) {
List_Read(ps->Generatrices, i, &c2); List_Read(ps->Generatrices, i, &c2);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment