Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gmsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Romin Tomasetti
gmsh
Commits
c9afb68f
Commit
c9afb68f
authored
3 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
specify Extrude->geo.Source for curves as well
parent
9f154450
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/geo/Geo.cpp
+4
-1
4 additions, 1 deletion
src/geo/Geo.cpp
with
4 additions
and
1 deletion
src/geo/Geo.cpp
+
4
−
1
View file @
c9afb68f
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment