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
3138f742
Commit
3138f742
authored
Dec 09, 2011
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge cgogn:~jund/CGoGN
parent
911bd5a6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
32 deletions
+19
-32
include/Algo/Modelisation/tetrahedralization.h
include/Algo/Modelisation/tetrahedralization.h
+6
-12
include/Algo/Modelisation/tetrahedralization.hpp
include/Algo/Modelisation/tetrahedralization.hpp
+13
-20
No files found.
include/Algo/Modelisation/tetrahedralization.h
View file @
3138f742
...
...
@@ -48,7 +48,6 @@ void hexahedronToTetrahedron(typename PFP::MAP& map, Dart d);
* Tetrahedron functions *
************************************************************************************************/
/**
* test if the volume is a tetrahedron
* @param map
...
...
@@ -57,7 +56,6 @@ void hexahedronToTetrahedron(typename PFP::MAP& map, Dart d);
template
<
typename
PFP
>
bool
isTetrahedron
(
typename
PFP
::
MAP
&
the_map
,
Dart
d
);
/************************************************************************************************
* Swap Functions *
************************************************************************************************/
...
...
@@ -101,7 +99,6 @@ Dart swap2To3(typename PFP::MAP& map, Dart d);
template
<
typename
PFP
>
void
swap5To4
(
typename
PFP
::
MAP
&
the_map
,
Dart
d
,
typename
PFP
::
TVEC3
&
positions
);
/************************************************************************************************
* Flip Functions *
************************************************************************************************/
...
...
@@ -112,23 +109,20 @@ void swap5To4(typename PFP::MAP& the_map, Dart d, typename PFP::TVEC3& positions
template
<
typename
PFP
>
void
flip1To4
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
typename
PFP
::
TVEC3
&
position
);
/**
*
*/
template
<
typename
PFP
>
void
edgeBisection
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
typename
PFP
::
TVEC3
&
position
);
}
// namespace Tetrahedralization
}
// namespace Modelisation
}
//end namespace Tetrahedralization
}
//end namespace Modelisation
}
//end namespace Algo
}
//end namespace CGoGN
}
// namespace Algo
}
// namespace CGoGN
#include "Algo/Modelisation/tetrahedralization.hpp"
#endif
include/Algo/Modelisation/tetrahedralization.hpp
View file @
3138f742
...
...
@@ -22,8 +22,6 @@
* *
*******************************************************************************/
#include <list>
namespace
CGoGN
{
...
...
@@ -59,16 +57,16 @@ bool isTetrahedron(typename PFP::MAP& the_map, Dart d)
{
DartMarkerStore
mark
(
the_map
);
// Lock a marker
std
::
list
<
Dart
>
visitedFaces
;
// Faces that are traversed
std
::
vector
<
Dart
>
visitedFaces
;
// Faces that are traversed
visitedFaces
.
reserve
(
64
)
;
visitedFaces
.
push_back
(
d
);
std
::
list
<
Dart
>::
iterator
faces
;
int
nbFaces
=
0
;
// Count the faces
unsigned
int
nbFaces
=
0
;
// Count the faces
//Test the number of faces end its valency
for
(
faces
=
visitedFaces
.
begin
()
;
faces
!=
visitedFaces
.
end
()
;
++
faces
)
for
(
unsigned
int
i
=
0
;
i
<
visitedFaces
.
size
();
++
i
)
{
Dart
dc
=
*
faces
;
Dart
dc
=
visitedFaces
[
i
]
;
//if this dart is not marked
if
(
!
mark
.
isMarked
(
dc
))
...
...
@@ -201,6 +199,7 @@ void insertFace(typename PFP::MAP& map, Dart d, Dart nF)
/***********************************************************************************************
* swap functions *
***********************************************************************************************/
//ok
template
<
typename
PFP
>
void
swap2To2
(
typename
PFP
::
MAP
&
map
,
Dart
d
)
...
...
@@ -335,8 +334,6 @@ void swap3To2(typename PFP::MAP& map, Dart d)
}
//[precond] le brin doit venir d'une face partagé par 2 tetraèdres
// renvoie un brin de l'ancienne couture entre les 2 tetras qui est devenu une arête
template
<
typename
PFP
>
...
...
@@ -404,7 +401,6 @@ void swap5To4(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& positions)
* Flip Functions *
************************************************************************************************/
template
<
typename
PFP
>
void
flip1To4
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
typename
PFP
::
TVEC3
&
position
)
{
...
...
@@ -488,8 +484,9 @@ void flip1To4(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
}
/************************************************************************************************
*
Bisection Functions
*
*
Bisection Functions
*
************************************************************************************************/
template
<
typename
PFP
>
void
edgeBisection
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
typename
PFP
::
TVEC3
&
position
)
{
...
...
@@ -558,7 +555,6 @@ void edgeBisection(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position
}
while
(
temp
!=
d
);
// if(map.phi3(d) == d)
// {
// map.splitFace(map.phi_1(d), map.phi1(d));
...
...
@@ -631,10 +627,9 @@ void edgeBisection(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position
// temp = map.alpha2(temp);
// }
// while(temp != d);
}
//
///**
// * create a tetra based on the two triangles that have a common dart and phi2(dart)
// * return a new dart inside the tetra
...
...
@@ -675,8 +670,6 @@ void edgeBisection(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position
// the_map.sewFaces(the_map.phi1(e),the_map.phi1(dd));
// the_map.sewFaces(ss2e,the_map.phi3(the_map.phi1(dd)));
//
//
//
// //embed the coords
// the_map.setVertexEmb(d,the_map.getVertexEmb(d));
// the_map.setVertexEmb(e,the_map.getVertexEmb(e));
...
...
@@ -876,10 +869,10 @@ void edgeBisection(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position
// return ret;
//}
}
// namespace Tetrahedralization
}
//end namespace Tetrahedralization
}
//end namespace Modelisation
}
//end namespace Algo
}
//end namespace CGoGN
}
// namespace Modelisation
}
// namespace Algo
}
// namespace CGoGN
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