Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Pitiot
CGoGN
Commits
2cb5349c
Commit
2cb5349c
authored
Nov 23, 2012
by
Thery Sylvain
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug missing newFace in GMap2
parent
917a9c5a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
55 additions
and
4 deletions
+55
-4
include/Topology/gmap/embeddedGMap2.h
include/Topology/gmap/embeddedGMap2.h
+5
-0
include/Topology/gmap/gmap0.hpp
include/Topology/gmap/gmap0.hpp
+2
-1
src/Topology/gmap/embeddedGMap2.cpp
src/Topology/gmap/embeddedGMap2.cpp
+47
-0
src/Topology/map/embeddedMap2.cpp
src/Topology/map/embeddedMap2.cpp
+1
-3
No files found.
include/Topology/gmap/embeddedGMap2.h
View file @
2cb5349c
...
...
@@ -39,6 +39,11 @@ class EmbeddedGMap2 : public GMap2
public:
typedef
GMap2
TOPO_MAP
;
/**
* create a new face with managed embeddings
*/
virtual
Dart
newFace
(
unsigned
int
nbEdges
,
bool
withBoundary
=
true
)
;
/**
* The attributes attached to the old vertex are duplicated on both resulting vertices
* No attribute is attached to the new edge
...
...
include/Topology/gmap/gmap0.hpp
View file @
2cb5349c
...
...
@@ -50,7 +50,8 @@ inline unsigned int GMap0::dimension() const
inline
void
GMap0
::
clear
(
bool
removeAttrib
)
{
AttribMap
::
clear
(
removeAttrib
)
;
init
()
;
if
(
removeAttrib
)
init
()
;
}
inline
void
GMap0
::
update_topo_shortcuts
()
...
...
src/Topology/gmap/embeddedGMap2.cpp
View file @
2cb5349c
...
...
@@ -30,6 +30,49 @@
namespace
CGoGN
{
Dart
EmbeddedGMap2
::
newFace
(
unsigned
int
nbEdges
,
bool
withBoundary
)
{
Dart
d
=
GMap2
::
newFace
(
nbEdges
,
withBoundary
);
if
(
withBoundary
)
{
if
(
isOrbitEmbedded
<
VERTEX
>
())
{
Traversor2FV
<
EmbeddedGMap2
>
t
(
*
this
,
d
);
for
(
Dart
it
=
t
.
begin
();
it
!=
t
.
end
();
it
=
t
.
next
())
initOrbitEmbeddingNewCell
<
VERTEX
>
(
it
)
;
}
if
(
isOrbitEmbedded
<
EDGE
>
())
{
Traversor2FE
<
EmbeddedGMap2
>
t
(
*
this
,
d
);
for
(
Dart
it
=
t
.
begin
();
it
!=
t
.
end
();
it
=
t
.
next
())
initOrbitEmbeddingNewCell
<
EDGE
>
(
it
)
;
}
if
(
isOrbitEmbedded
<
FACE
>
())
{
initOrbitEmbeddingNewCell
<
FACE
>
(
d
)
;
initOrbitEmbeddingNewCell
<
FACE
>
(
phi2
(
d
))
;
}
}
else
{
if
(
isOrbitEmbedded
<
VERTEX
>
())
{
Traversor2FV
<
EmbeddedGMap2
>
t
(
*
this
,
d
);
for
(
Dart
it
=
t
.
begin
();
it
!=
t
.
end
();
it
=
t
.
next
())
initOrbitEmbeddingNewCell
<
VERTEX
>
(
it
)
;
}
if
(
isOrbitEmbedded
<
FACE
>
())
initOrbitEmbeddingNewCell
<
FACE
>
(
d
)
;
}
return
d
;
}
void
EmbeddedGMap2
::
splitVertex
(
Dart
d
,
Dart
e
)
{
Dart
dd
=
phi2
(
d
)
;
...
...
@@ -306,6 +349,10 @@ void EmbeddedGMap2::sewFaces(Dart d, Dart e, bool withBoundary)
if
(
!
withBoundary
)
{
GMap2
::
sewFaces
(
d
,
e
,
false
)
;
if
(
isOrbitEmbedded
<
EDGE
>
())
{
initOrbitEmbeddingNewCell
<
EDGE
>
(
d
)
;
}
return
;
}
...
...
src/Topology/map/embeddedMap2.cpp
View file @
2cb5349c
...
...
@@ -319,9 +319,7 @@ void EmbeddedMap2::sewFaces(Dart d, Dart e, bool withBoundary)
if
(
isOrbitEmbedded
<
EDGE
>
())
{
/*
Traversor2FE<EmbeddedMap2> t(*this, d);
for(Dart it = t.begin(); it != t.end(); it = t.next())
initOrbitEmbeddingNewCell<EDGE>(it) ;
initOrbitEmbeddingNewCell<EDGE>(d) ;
*/
unsigned
int
emb
=
newCell
<
EDGE
>
();
initDartEmbedding
<
EDGE
>
(
d
,
emb
);
...
...
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