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
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
CGoGN
CGoGN
Commits
49f3fe2c
Commit
49f3fe2c
authored
Sep 21, 2011
by
untereiner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correction d'un pb de reserve de vector
parent
51620456
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
56 additions
and
7 deletions
+56
-7
include/Algo/ImplicitHierarchicalMesh/subdivision3.hpp
include/Algo/ImplicitHierarchicalMesh/subdivision3.hpp
+2
-2
include/Topology/map/map2.h
include/Topology/map/map2.h
+14
-0
include/Topology/map/map3.h
include/Topology/map/map3.h
+0
-1
src/Algo/ImplicitHierarchicalMesh/ihm3.cpp
src/Algo/ImplicitHierarchicalMesh/ihm3.cpp
+6
-4
src/Topology/map/map2.cpp
src/Topology/map/map2.cpp
+34
-0
No files found.
include/Algo/ImplicitHierarchicalMesh/subdivision3.hpp
View file @
49f3fe2c
...
...
@@ -748,7 +748,7 @@ Dart subdivideVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& positi
//test si la face est triangulaire ou non
if(map.phi1(map.phi1(map.phi1(d))) == d)
{
std::cout << "trian" << std::endl;
//
std::cout << "trian" << std::endl;
Dart cf = map.phi2(map.phi1(d));
Dart e = cf;
do
...
...
@@ -759,7 +759,7 @@ Dart subdivideVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& positi
}
else
{
std::cout << "quad" << std::endl;
//
std::cout << "quad" << std::endl;
Dart cf = map.phi1(d);
Dart e = cf;
do
...
...
include/Topology/map/map2.h
View file @
49f3fe2c
...
...
@@ -236,6 +236,20 @@ public:
*/
void
insertTrianglePair
(
Dart
d
,
Dart
v1
,
Dart
v2
)
;
/**
* Unsew opposite edges from the faces around a vertex
* \warning Darts may have
* @param d a dart from the vertex
*/
void
unsewAroundVertex
(
Dart
d
)
;
/**
* Unsex the Umbrella aroud a vertex, close the hole and then
* create a symetric to construct a polyedron
* @param d a dart from the vertex
*/
void
explodPolyhedron
(
Dart
d
);
//! Merge two volumes along two faces.
/*! Works only if the two faces have the same number of edges.
* The faces adjacent to the two given faces are pairwise phi2-linked
...
...
include/Topology/map/map3.h
View file @
49f3fe2c
...
...
@@ -230,7 +230,6 @@ public:
*/
virtual
Dart
cutSpike
(
Dart
d
);
//!
/*
*
...
...
src/Algo/ImplicitHierarchicalMesh/ihm3.cpp
View file @
49f3fe2c
...
...
@@ -172,7 +172,6 @@ unsigned int ImplicitHierarchicalMap3::volumeLevel(Dart d)
{
assert
(
m_dartLevel
[
d
]
<=
m_curLevel
||
!
"Access to a dart introduced after current level"
)
;
if
(
m_curLevel
==
0
)
return
0
;
...
...
@@ -182,7 +181,7 @@ unsigned int ImplicitHierarchicalMap3::volumeLevel(Dart d)
DartMarkerStore
mark
(
*
this
);
// Lock a marker
std
::
vector
<
Dart
>
visitedFaces
;
// Faces that are traversed
visitedFaces
.
reserve
(
16
);
visitedFaces
.
reserve
(
512
);
visitedFaces
.
push_back
(
d
);
// Start with the face of d
std
::
vector
<
Dart
>::
iterator
face
;
...
...
@@ -265,6 +264,7 @@ unsigned int ImplicitHierarchicalMap3::volumeLevel(Dart d)
if
(
!
mark
.
isMarked
(
ee
))
// not already marked
{
visitedFaces
.
push_back
(
ee
)
;
std
::
cout
<<
"brin ajoute = "
<<
ee
<<
std
::
endl
;
mark
.
markOrbit
(
FACE
,
ee
)
;
}
e
=
phi1
(
e
)
;
...
...
@@ -541,9 +541,11 @@ bool ImplicitHierarchicalMap3::neighborhoodLevelDiffersByOne(Dart d)
{
// add all face neighbours to the table
if
(
phi3
(
e
)
!=
e
&&
(
abs
(
volumeLevel
(
phi3
(
e
))
-
vLevel
)
>
1
)
)
if
(
phi3
(
e
)
!=
e
)
{
found
=
true
;
Dart
old
=
volumeOldestDart
(
phi3
(
e
));
if
((
abs
(
volumeLevel
(
old
)
-
vLevel
)
>
1
))
found
=
true
;
}
Dart
ee
=
phi2
(
e
)
;
...
...
src/Topology/map/map2.cpp
View file @
49f3fe2c
...
...
@@ -298,6 +298,40 @@ void Map2::insertTrianglePair(Dart d, Dart v1, Dart v2)
phi2sew
(
phi1
(
d
),
vv1
)
;
}
void
Map2
::
unsewAroundVertex
(
Dart
d
)
{
Dart
e
=
d
;
do
{
Dart
temp
=
phi1
(
e
);
Dart
e_1
=
phi_1
(
e
);
do
{
unsewFaces
(
temp
);
temp
=
phi1
(
temp
);
}
while
(
temp
!=
e_1
);
e
=
alpha1
(
e
);
}
while
(
e
!=
d
);
}
void
Map2
::
explodPolyhedron
(
Dart
d
)
{
unsewAroundVertex
(
d
);
closeHole
(
phi1
(
d
));
//Recherche du (ou un des) sommet oppose
//tourner autour du sommet
//si quad alors sommet oppose
//
//si pas de quad alors un sommet du trian
//
}
bool
Map2
::
mergeVolumes
(
Dart
d
,
Dart
e
)
{
// First traversal of both faces to check the face sizes
...
...
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