Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
David Cazier
CGoGN
Commits
4e02c829
Commit
4e02c829
authored
Jun 03, 2011
by
untereiner
Browse files
passage de CellMarker a CellMarkerGen dans particle_cell_3d
parent
bb0b8d09
Changes
4
Hide whitespace changes
Inline
Side-by-side
include/Algo/ImplicitHierarchicalMesh/subdivision3.hpp
View file @
4e02c829
...
...
@@ -673,7 +673,7 @@ void coarsenVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position
visitedFaces
.
reserve
(
20
);
visitedFaces
.
push_back
(
d
);
mf
.
markOrbit
(
FACE
_ORBIT
,
d
)
;
mf
.
markOrbit
(
FACE
,
d
)
;
for
(
std
::
vector
<
Dart
>::
iterator
face
=
visitedFaces
.
begin
();
face
!=
visitedFaces
.
end
();
++
face
)
{
...
...
@@ -685,7 +685,7 @@ void coarsenVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position
if
(
!
mf
.
isMarked
(
ee
))
// not already marked
{
visitedFaces
.
push_back
(
ee
)
;
mf
.
markOrbit
(
FACE
_ORBIT
,
ee
)
;
mf
.
markOrbit
(
FACE
,
ee
)
;
}
e
=
map
.
phi1
(
e
)
;
...
...
include/Algo/MovingObjects/particle_cell_3D.h
View file @
4e02c829
...
...
@@ -79,11 +79,11 @@ public :
bool
isRightDFace
(
VEC3
c
,
Dart
d
,
VEC3
base
,
VEC3
normal
);
Dart
nextDartOfVertexNotMarked
(
Dart
d
,
CellMarker
&
mark
);
Dart
nextDartOfVertexNotMarked
(
Dart
d
,
CellMarker
Gen
&
mark
);
Dart
nextNonPlanar
(
Dart
d
);
Dart
nextFaceNotMarked
(
Dart
d
,
CellMarker
&
mark
);
Dart
nextFaceNotMarked
(
Dart
d
,
CellMarker
Gen
&
mark
);
Geom
::
Orientation3D
whichSideOfEdge
(
VEC3
c
,
Dart
d
);
...
...
include/Algo/MovingObjects/particle_cell_3D.hpp
View file @
4e02c829
...
...
@@ -117,7 +117,7 @@ bool ParticleCell3D<PFP>::isRightDFace(VEC3 c, Dart d, VEC3 base, VEC3 normal)
template
<
typename
PFP
>
Dart
ParticleCell3D
<
PFP
>::
nextDartOfVertexNotMarked
(
Dart
d
,
CellMarker
&
mark
)
Dart
ParticleCell3D
<
PFP
>::
nextDartOfVertexNotMarked
(
Dart
d
,
CellMarker
Gen
&
mark
)
{
// lock a marker
Dart
d1
;
...
...
@@ -221,7 +221,7 @@ Dart ParticleCell3D<PFP>::nextNonPlanar(Dart d)
}
template
<
typename
PFP
>
Dart
ParticleCell3D
<
PFP
>::
nextFaceNotMarked
(
Dart
d
,
CellMarker
&
mark
)
Dart
ParticleCell3D
<
PFP
>::
nextFaceNotMarked
(
Dart
d
,
CellMarker
Gen
&
mark
)
{
// lock a marker
Dart
d1
;
...
...
src/Topology/map/map3.cpp
View file @
4e02c829
...
...
@@ -672,7 +672,7 @@ unsigned int Map3::vertexDegree(Dart d)
if
(
!
me
.
isMarked
(
*
darts
))
{
++
count
;
me
.
markOrbit
(
EDGE
_ORBIT
,
*
darts
);
me
.
markOrbit
(
EDGE
,
*
darts
);
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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