Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
KennethVanhoey
CGoGN
Commits
7c1c5c11
Commit
7c1c5c11
authored
Nov 03, 2011
by
Sylvain Thery
Committed by
Pierre Kraemer
Nov 04, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modif import (sewOrientedFaces)
simplif collapseEdge
parent
a79af175
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
48 deletions
+19
-48
include/Algo/Import/importMesh.hpp
include/Algo/Import/importMesh.hpp
+1
-1
src/Topology/map/map2.cpp
src/Topology/map/map2.cpp
+18
-47
No files found.
include/Algo/Import/importMesh.hpp
View file @
7c1c5c11
...
...
@@ -108,7 +108,7 @@ bool importMesh(typename PFP::MAP& map, MeshTablesSurface<PFP>& mts)
{
if
(
good_dart
==
map
.
phi2
(
good_dart
))
{
map
.
sewFaces
(
d
,
good_dart
);
map
.
sew
Oriented
Faces
(
d
,
good_dart
);
m
.
unmarkOrbit
(
EDGE
,
d
);
}
}
...
...
src/Topology/map/map2.cpp
View file @
7c1c5c11
...
...
@@ -227,64 +227,35 @@ Dart Map2::collapseEdge(Dart d, bool delDegenerateFaces)
Dart
e
=
phi2
(
d
);
phi2unsew
(
d
);
// Unlink the opposite edges
if
(
isBoundaryMarked
(
e
))
Dart
f
=
phi1
(
e
)
;
Dart
h
=
alpha1
(
e
);
if
(
h
!=
e
)
resV
=
h
;
if
(
f
!=
e
&&
delDegenerateFaces
)
{
Dart
f
=
phi1
(
e
)
;
Map1
::
collapseEdge
(
e
)
;
// Collapse edge e
if
(
f
!=
e
)
collapseDegeneratedFace
(
f
)
;
// and collapse its face if degenerated
collapseDegeneratedFace
(
f
)
;
// and collapse its face if degenerated
}
else
{
Dart
f
=
phi1
(
e
)
;
Dart
g
=
phi_1
(
e
)
;
Map1
::
collapseEdge
(
e
)
;
// Just collapse edge e
if
(
f
!=
d
&&
!
isFaceTriangle
(
e
))
resV
=
f
;
else
if
(
phi2
(
g
)
!=
g
)
resV
=
phi2
(
g
)
;
else
if
(
f
!=
d
&&
phi2
(
f
)
!=
f
)
resV
=
phi1
(
phi2
(
f
))
;
if
(
f
!=
e
&&
delDegenerateFaces
)
{
Map1
::
collapseEdge
(
e
)
;
// Collapse edge e
collapseDegeneratedFace
(
f
)
;
// and collapse its face if degenerated
}
else
Map1
::
collapseEdge
(
e
)
;
// Just collapse edge e
f
=
phi1
(
d
)
;
if
(
resV
==
NIL
)
{
h
=
alpha1
(
d
);
if
(
h
!=
d
)
resV
=
h
;
}
if
(
isBoundaryMarked
(
d
)
)
if
(
f
!=
d
&&
delDegenerateFaces
)
{
Dart
f
=
phi1
(
d
)
;
Map1
::
collapseEdge
(
d
)
;
// Collapse edge d
if
(
f
!=
d
)
collapseDegeneratedFace
(
f
)
;
// and collapse its face if degenerated
collapseDegeneratedFace
(
f
)
;
// and collapse its face if degenerated
}
else
{
Dart
f
=
phi1
(
d
)
;
Dart
g
=
phi_1
(
d
)
;
if
(
resV
==
NIL
)
{
if
(
f
!=
e
&&
!
isFaceTriangle
(
d
))
resV
=
f
;
else
if
(
phi2
(
g
)
!=
g
)
resV
=
phi2
(
g
)
;
else
if
(
f
!=
e
&&
phi2
(
f
)
!=
f
)
resV
=
phi1
(
phi2
(
f
))
;
}
if
(
f
!=
d
&&
delDegenerateFaces
)
{
Map1
::
collapseEdge
(
d
)
;
// Collapse edge d
collapseDegeneratedFace
(
f
)
;
// and collapse its face if degenerated
}
else
Map1
::
collapseEdge
(
d
)
;
// Just collapse edge d
}
Map1
::
collapseEdge
(
d
)
;
// Just collapse edge d
return
resV
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment