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
9d22e7fe
Commit
9d22e7fe
authored
Nov 27, 2012
by
untereiner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qq modifs
parent
14faf2bb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
62 additions
and
51 deletions
+62
-51
include/Algo/Modelisation/polyhedron.hpp
include/Algo/Modelisation/polyhedron.hpp
+1
-1
include/Algo/Multiresolution/Map3MR/map3MR_PrimalRegular.hpp
include/Algo/Multiresolution/Map3MR/map3MR_PrimalRegular.hpp
+58
-50
src/Topology/map/embeddedMap3.cpp
src/Topology/map/embeddedMap3.cpp
+3
-0
No files found.
include/Algo/Modelisation/polyhedron.hpp
View file @
9d22e7fe
...
...
@@ -213,7 +213,7 @@ Dart createDiamond(typename PFP::MAP& map, unsigned int nbSides)
res
=
map
.
phi2
(
firstP
);
map
.
sewVolumes
(
firstP
,
secondP
);
//
map.mergeVolumes(firstP);
map
.
mergeVolumes
(
firstP
);
return
res
;
}
...
...
include/Algo/Multiresolution/Map3MR/map3MR_PrimalRegular.hpp
View file @
9d22e7fe
...
...
@@ -235,11 +235,15 @@ void Map3MR<PFP>::addNewLevelTetraOcta()
{
Traversor3WV
<
typename
PFP
::
MAP
>
traWV
(
m_map
,
dit
);
Dart
centralDart
=
NIL
;
for
(
Dart
ditWV
=
traWV
.
begin
();
ditWV
!=
traWV
.
end
();
ditWV
=
traWV
.
next
())
{
m_map
.
setCurrentLevel
(
m_map
.
getMaxLevel
())
;
Dart
x
=
m_map
.
phi_1
(
m_map
.
phi2
(
m_map
.
phi1
(
ditWV
)));
centralDart
=
x
;
if
(
!
Algo
::
Modelisation
::
Tetrahedralization
::
isTetrahedron
<
PFP
>
(
m_map
,
x
))
{
DartMarkerStore
me
(
m_map
);
...
...
@@ -263,9 +267,13 @@ void Map3MR<PFP>::addNewLevelTetraOcta()
f
=
m_map
.
phi2
(
m_map
.
phi_1
(
f
));
}
while
(
f
!=
x
);
}
m_map
.
setCurrentLevel
(
m_map
.
getMaxLevel
()
-
1
)
;
}
if
(
centralDart
!=
NIL
)
m_map
.
template
setOrbitEmbedding
<
VERTEX
>(
centralDart
,
m_map
.
template
getEmbedding
<
VERTEX
>(
centralDart
));
}
m_map
.
popLevel
()
;
...
...
@@ -358,63 +366,63 @@ void Map3MR<PFP>::addNewLevelHexa()
splitSurfaceInVolume
(
v
);
Dart
dd
=
m_map
.
phi2
(
m_map
.
phi1
(
ditWV
));
Dart
next
=
m_map
.
phi1
(
m_map
.
phi1
(
dd
))
;
m_map
.
PFP
::
MAP
::
ParentMap
::
splitFace
(
dd
,
next
)
;
Dart
ne
=
m_map
.
phi2
(
m_map
.
phi_1
(
dd
));
m_map
.
PFP
::
MAP
::
ParentMap
::
cutEdge
(
ne
)
;
centralDart
=
m_map
.
phi1
(
ne
);
dd
=
m_map
.
phi1
(
m_map
.
phi1
(
next
))
;
while
(
dd
!=
ne
)
{
Dart
tmp
=
m_map
.
phi1
(
ne
)
;
m_map
.
PFP
::
MAP
::
ParentMap
::
splitFace
(
tmp
,
dd
)
;
dd
=
m_map
.
phi1
(
m_map
.
phi1
(
dd
))
;
}
//
Dart dd = m_map.phi2(m_map.phi1(ditWV));
//
Dart next = m_map.phi1(m_map.phi1(dd)) ;
//
m_map.PFP::MAP::ParentMap::splitFace(dd, next) ;
//
//
Dart ne = m_map.phi2(m_map.phi_1(dd));
//
m_map.PFP::MAP::ParentMap::cutEdge(ne) ;
//
centralDart = m_map.phi1(ne);
//
//
dd = m_map.phi1(m_map.phi1(next)) ;
//
while(dd != ne)
//
{
//
Dart tmp = m_map.phi1(ne) ;
//
m_map.PFP::MAP::ParentMap::splitFace(tmp, dd) ;
//
dd = m_map.phi1(m_map.phi1(dd)) ;
//
}
m_map
.
setCurrentLevel
(
m_map
.
getMaxLevel
()
-
1
)
;
//Utile ?
}
m_map
.
setCurrentLevel
(
m_map
.
getMaxLevel
())
;
//4 couture des relations precedemment sauvegarde
for
(
std
::
vector
<
std
::
pair
<
Dart
,
Dart
>
>::
iterator
it
=
subdividedFaces
.
begin
();
it
!=
subdividedFaces
.
end
();
++
it
)
{
Dart
f1
=
m_map
.
phi2
((
*
it
).
first
);
Dart
f2
=
m_map
.
phi2
((
*
it
).
second
);
//if(isBoundaryFace(f1) && isBoundaryFace(f2))
if
(
m_map
.
phi3
(
f1
)
==
f1
&&
m_map
.
phi3
(
f2
)
==
f2
)
m_map
.
sewVolumes
(
f1
,
f2
,
false
);
}
m_map
.
template
setOrbitEmbedding
<
VERTEX
>(
centralDart
,
m_map
.
template
getEmbedding
<
VERTEX
>(
centralDart
));
//
m_map.setCurrentLevel(m_map.getMaxLevel()) ;
//
//4 couture des relations precedemment sauvegarde
//
for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedFaces.begin(); it != subdividedFaces.end(); ++it)
//
{
//
Dart f1 = m_map.phi2((*it).first);
//
Dart f2 = m_map.phi2((*it).second);
//
//
//if(isBoundaryFace(f1) && isBoundaryFace(f2))
//
if(m_map.phi3(f1) == f1 && m_map.phi3(f2) == f2)
//
m_map.sewVolumes(f1, f2, false);
//
}
//
m_map.template setOrbitEmbedding<VERTEX>(centralDart, m_map.template getEmbedding<VERTEX>(centralDart));
m_map
.
setCurrentLevel
(
m_map
.
getMaxLevel
()
-
1
)
;
}
//A optimiser
m_map
.
setCurrentLevel
(
m_map
.
getMaxLevel
()
-
1
)
;
TraversorE
<
typename
PFP
::
MAP
>
travE2
(
m_map
);
for
(
Dart
d
=
travE2
.
begin
();
d
!=
travE2
.
end
();
d
=
travE2
.
next
())
{
m_map
.
setCurrentLevel
(
m_map
.
getMaxLevel
())
;
m_map
.
template
setOrbitEmbedding
<
VERTEX
>(
m_map
.
phi1
(
d
),
m_map
.
template
getEmbedding
<
VERTEX
>(
m_map
.
phi1
(
d
)));
m_map
.
setCurrentLevel
(
m_map
.
getMaxLevel
()
-
1
)
;
}
m_map
.
setCurrentLevel
(
m_map
.
getMaxLevel
())
;
m_map
.
setCurrentLevel
(
m_map
.
getMaxLevel
()
-
1
)
;
TraversorF
<
typename
PFP
::
MAP
>
travF2
(
m_map
)
;
for
(
Dart
d
=
travF2
.
begin
();
d
!=
travF2
.
end
();
d
=
travF2
.
next
())
{
m_map
.
setCurrentLevel
(
m_map
.
getMaxLevel
())
;
m_map
.
template
setOrbitEmbedding
<
VERTEX
>(
m_map
.
phi2
(
m_map
.
phi1
(
d
)),
m_map
.
template
getEmbedding
<
VERTEX
>(
m_map
.
phi2
(
m_map
.
phi1
(
d
))));
m_map
.
setCurrentLevel
(
m_map
.
getMaxLevel
()
-
1
)
;
}
m_map
.
setCurrentLevel
(
m_map
.
getMaxLevel
())
;
m_map
.
popLevel
()
;
//
//
//A optimiser
//
m_map.setCurrentLevel(m_map.getMaxLevel()-1) ;
//
TraversorE<typename PFP::MAP> travE2(m_map);
//
for (Dart d = travE2.begin(); d != travE2.end(); d = travE2.next())
//
{
//
m_map.setCurrentLevel(m_map.getMaxLevel()) ;
//
m_map.template setOrbitEmbedding<VERTEX>(m_map.phi1(d), m_map.template getEmbedding<VERTEX>(m_map.phi1(d)));
//
m_map.setCurrentLevel(m_map.getMaxLevel()-1) ;
//
}
//
m_map.setCurrentLevel(m_map.getMaxLevel()) ;
//
//
m_map.setCurrentLevel(m_map.getMaxLevel()-1) ;
//
TraversorF<typename PFP::MAP> travF2(m_map) ;
//
for (Dart d = travF2.begin(); d != travF2.end(); d = travF2.next())
//
{
//
m_map.setCurrentLevel(m_map.getMaxLevel()) ;
//
m_map.template setOrbitEmbedding<VERTEX>(m_map.phi2(m_map.phi1(d)), m_map.template getEmbedding<VERTEX>(m_map.phi2(m_map.phi1(d))));
//
m_map.setCurrentLevel(m_map.getMaxLevel()-1) ;
//
}
//
m_map.setCurrentLevel(m_map.getMaxLevel()) ;
//
//
m_map.popLevel() ;
}
//void Map3MR_PrimalRegular::addNewLevel(bool embedNewVertices)
...
...
src/Topology/map/embeddedMap3.cpp
View file @
9d22e7fe
...
...
@@ -29,6 +29,7 @@
namespace
CGoGN
{
//TODO
Dart
EmbeddedMap3
::
splitVertex
(
std
::
vector
<
Dart
>&
vd
)
{
Dart
d
=
vd
.
front
();
...
...
@@ -59,6 +60,7 @@ Dart EmbeddedMap3::splitVertex(std::vector<Dart>& vd)
return
dres
;
}
//TODO
Dart
EmbeddedMap3
::
deleteVertex
(
Dart
d
)
{
Dart
v
=
Map3
::
deleteVertex
(
d
)
;
...
...
@@ -426,6 +428,7 @@ bool EmbeddedMap3::mergeVolumes(Dart d)
{
if
(
isOrbitEmbedded
<
VOLUME
>
())
{
std
::
cout
<<
"plop"
<<
std
::
endl
;
setOrbitEmbedding
<
VOLUME
>
(
d2
,
getEmbedding
<
VOLUME
>
(
d2
))
;
}
return
true
;
...
...
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