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
Hurstel
CGoGN
Commits
ce36e5a4
Commit
ce36e5a4
authored
Feb 11, 2011
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mise a jour collapseEdge pour prendre en compte le cas des aretes pendantes
parent
10c7d948
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
src/Topology/gmap/gmap2.cpp
src/Topology/gmap/gmap2.cpp
+2
-2
src/Topology/map/map2.cpp
src/Topology/map/map2.cpp
+2
-2
No files found.
src/Topology/gmap/gmap2.cpp
View file @
ce36e5a4
...
...
@@ -97,11 +97,11 @@ Dart GMap2::collapseEdge(Dart d, bool delDegenerateFaces = true)
Dart
f
=
phi1
(
e
)
;
Dart
g
=
phi_1
(
e
)
;
if
(
!
isFaceTriangle
(
e
))
if
(
f
!=
d
&&
!
isFaceTriangle
(
e
))
resV
=
f
;
else
if
(
phi2
(
g
)
!=
g
)
resV
=
phi2
(
g
)
;
else
if
(
phi2
(
f
)
!=
f
)
else
if
(
f
!=
d
&&
phi2
(
f
)
!=
f
)
resV
=
phi1
(
phi2
(
f
))
;
if
(
f
!=
e
&&
delDegenerateFaces
)
...
...
src/Topology/map/map2.cpp
View file @
ce36e5a4
...
...
@@ -99,11 +99,11 @@ Dart Map2::collapseEdge(Dart d, bool delDegenerateFaces)
Dart
f
=
phi1
(
e
)
;
Dart
g
=
phi_1
(
e
)
;
if
(
!
isFaceTriangle
(
e
))
if
(
f
!=
d
&&
!
isFaceTriangle
(
e
))
resV
=
f
;
else
if
(
phi2
(
g
)
!=
g
)
resV
=
phi2
(
g
)
;
else
if
(
phi2
(
f
)
!=
f
)
else
if
(
f
!=
d
&&
phi2
(
f
)
!=
f
)
resV
=
phi1
(
phi2
(
f
))
;
if
(
f
!=
e
&&
delDegenerateFaces
)
...
...
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