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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
KennethVanhoey
CGoGN
Commits
fff30f3b
Commit
fff30f3b
authored
May 30, 2011
by
untereiner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
implicit + embeddedMap3 sans lazy
parent
edc040c7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
53 additions
and
74 deletions
+53
-74
include/Algo/ImplicitHierarchicalMesh/subdivision3.hpp
include/Algo/ImplicitHierarchicalMesh/subdivision3.hpp
+0
-3
include/Topology/generic/embeddedMap3.h
include/Topology/generic/embeddedMap3.h
+3
-5
include/Topology/generic/embeddedMap3.hpp
include/Topology/generic/embeddedMap3.hpp
+45
-66
include/Topology/map/map3.h
include/Topology/map/map3.h
+5
-0
No files found.
include/Algo/ImplicitHierarchicalMesh/subdivision3.hpp
View file @
fff30f3b
...
...
@@ -173,8 +173,6 @@ Dart subdivideVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& positi
assert(map.getDartLevel(d) <= map.getCurrentLevel() || !"Access to a dart introduced after current level") ;
assert(!map.volumeIsSubdivided(d) || !"Trying to subdivide an already subdivided volume") ;
std::cout << "SUUUUUUB marine" << std::endl;
unsigned int vLevel = map.volumeLevel(d) ;
Dart old = map.volumeOldestDart(d) ;
...
...
@@ -295,7 +293,6 @@ Dart subdivideVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& positi
}
while(e != *edge);
map.closeHole(f1);
Dart old = map.phi2(map.phi1(e));
...
...
include/Topology/generic/embeddedMap3.h
View file @
fff30f3b
...
...
@@ -39,11 +39,6 @@ class EmbeddedMap3 : public MAP3
{
public:
//!
/*!
*
*/
virtual
void
deleteOrientedVolume
(
Dart
d
);
//!
/*!
...
...
@@ -100,6 +95,9 @@ public:
*/
virtual
void
collapseFace
(
Dart
d
,
bool
delDegenerateFaces
=
true
,
bool
delDegenerateVolumes
=
true
);
virtual
unsigned
int
closeHole
(
Dart
d
);
}
;
}
// namespace CGoGN
...
...
include/Topology/generic/embeddedMap3.hpp
View file @
fff30f3b
...
...
@@ -28,56 +28,16 @@
namespace
CGoGN
{
template
<
typename
MAP3
>
void
EmbeddedMap3
<
MAP3
>::
deleteOrientedVolume
(
Dart
d
)
{
// DartMarkerStore mark(*this); // Lock a marker
//
// std::vector<Dart> visitedFaces; // Faces that are traversed
// visitedFaces.reserve(16);
// visitedFaces.push_back(d); // Start with the face of d
// std::vector<Dart>::iterator face;
//
// //For every face added to the list
// for (face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
// {
// if (!mark.isMarked(*face)) // Face has not been visited yet
// {
// Dart dNext = *face ;
//
// do
// {
// mark.mark(dNext); // Mark
//
// unsigned int vEmb1 = EMBNULL; //Manage the embedding
// if(MAP3::isOrbitEmbedded(VERTEX_ORBIT))
// {
// vEmb1 = MAP3::getDartEmbedding(VERTEX_ORBIT, dNext);
// MAP3::embedOrbit(VERTEX_ORBIT, d, vEmb1) ; //alpha1 peut ne pas fonctionner
// }
//
// if(MAP3::isOrbitEmbedded(EDGE_ORBIT))
// {
// vEmb1 = MAP3::getDartEmbedding(EDGE_ORBIT, dNext);
// MAP3::setDartEmbedding(VERTEX_ORBIT, MAP3::alpha2(dNext), vEmb1);
// }
//
// Dart adj = MAP3::phi2(dNext); // Get adjacent face
// if (adj != dNext && !mark.isMarked(adj))
// visitedFaces.push_back(adj); // Add it
// dNext = MAP3::phi1(dNext);
// } while(dNext != *face);
// }
// }
MAP3
::
deleteOrientedVolume
(
d
);
}
template
<
typename
MAP3
>
void
EmbeddedMap3
<
MAP3
>::
sewVolumes
(
Dart
d
,
Dart
e
)
{
unsigned
int
vEmb1
=
EMBNULL
;
if
(
MAP3
::
isOrbitEmbedded
(
VERTEX_ORBIT
))
{
}
//topological sewing
MAP3
::
sewVolumes
(
d
,
e
);
...
...
@@ -102,6 +62,7 @@ void EmbeddedMap3<MAP3>::sewVolumes(Dart d, Dart e)
}
while
(
dd
!=
d
)
;
}
}
template
<
typename
MAP3
>
...
...
@@ -191,34 +152,32 @@ bool EmbeddedMap3<MAP3>::mergeVolumes(Dart d)
template
<
typename
MAP3
>
void
EmbeddedMap3
<
MAP3
>::
splitFace
(
Dart
d
,
Dart
e
)
{
MAP3
::
splitFace
(
d
,
e
);
if
(
MAP3
::
isOrbitEmbedded
(
VERTEX_ORBIT
))
{
MAP3
::
copyDartEmbedding
(
VERTEX_ORBIT
,
MAP3
::
phi2
(
MAP3
::
phi_1
(
d
)),
d
);
MAP3
::
copyDartEmbedding
(
VERTEX_ORBIT
,
MAP3
::
phi2
(
MAP3
::
phi_1
(
e
)),
e
);
if
(
MAP3
::
phi3
(
d
)
!=
d
)
{
Dart
d3
=
MAP3
::
phi3
(
d
);
Dart
e3
=
MAP3
::
phi3
(
e
);
MAP3
::
copyDartEmbedding
(
VERTEX_ORBIT
,
MAP3
::
phi1
(
d3
),
MAP3
::
phi1
(
MAP3
::
phi2
(
MAP3
::
phi1
(
d3
))));
MAP3
::
copyDartEmbedding
(
VERTEX_ORBIT
,
MAP3
::
phi1
(
e3
),
MAP3
::
phi1
(
MAP3
::
phi2
(
MAP3
::
phi1
(
e3
))));
}
}
}
template
<
typename
MAP3
>
void
EmbeddedMap3
<
MAP3
>::
cutEdge
(
Dart
d
)
{
// unsigned int dEmb = EMBNULL ;
// unsigned int fEmb = EMBNULL;
//
// if (MAP3::isOrbitEmbedded(VERTEX_ORBIT))
// {
// dEmb = MAP3::getEmbedding(d, VERTEX_ORBIT) ;
// }
//
// Dart f = MAP3::phi1(d) ;
MAP3
::
cutEdge
(
d
);
// Dart e = MAP3::phi1(d);
//
// if (MAP3::isOrbitEmbedded(VERTEX_ORBIT))
// {
// fEmb = MAP3::getEmbedding(f, VERTEX_ORBIT);
//
//
// MAP3::setDartEmbedding(EDGE_ORBIT, d, dEmb) ;
// MAP3::embedNewCell(EDGE_ORBIT, e) ;
// MAP3::copyCell(EDGE_ORBIT, e, d) ;
// }
}
...
...
@@ -288,6 +247,26 @@ Dart EmbeddedMap3<MAP3>::cutSpike(Dart d)
}
template
<
typename
MAP3
>
unsigned
int
EmbeddedMap3
<
MAP3
>::
closeHole
(
Dart
d
)
{
unsigned
int
nbE
=
MAP3
::
closeHole
(
d
);
Dart
dd
=
MAP3
::
phi2
(
d
);
Dart
f
=
dd
;
do
{
if
(
MAP3
::
isOrbitEmbedded
(
VERTEX_ORBIT
))
MAP3
::
copyDartEmbedding
(
VERTEX_ORBIT
,
f
,
MAP3
::
phi1
(
MAP3
::
phi2
(
f
)));
if
(
MAP3
::
isOrbitEmbedded
(
EDGE_ORBIT
))
MAP3
::
copyDartEmbedding
(
EDGE_ORBIT
,
f
,
MAP3
::
phi2
(
f
));
f
=
MAP3
::
phi1
(
f
);
}
while
(
dd
!=
f
);
return
nbE
;
}
}
// namespace CGoGN
include/Topology/map/map3.h
View file @
fff30f3b
...
...
@@ -143,6 +143,11 @@ public:
*/
virtual
void
cutEdge
(
Dart
d
);
//! Uncut the edge of d
/*! @param d a dart of the edge to cut
*/
//virtual void uncutEdge(Dart d);
//! Sew a face e in the edge d
/*! @param d dart from the edge
* @param e dart from the face
...
...
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