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
5054c589
Commit
5054c589
authored
Nov 10, 2011
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
global allDarts Selector
parent
72d6f882
Changes
56
Hide whitespace changes
Inline
Side-by-side
Showing
56 changed files
with
105 additions
and
140 deletions
+105
-140
Apps/Examples/Tests/concave_rendering.cpp
Apps/Examples/Tests/concave_rendering.cpp
+0
-2
Apps/Examples/clipping.h
Apps/Examples/clipping.h
+0
-1
Apps/Examples/decimationVolumique.h
Apps/Examples/decimationVolumique.h
+0
-1
Apps/Examples/extrusionView.cpp
Apps/Examples/extrusionView.cpp
+0
-1
Apps/Examples/miniTest.cpp
Apps/Examples/miniTest.cpp
+0
-1
Apps/Examples/polyhedronsView.cpp
Apps/Examples/polyhedronsView.cpp
+0
-1
Apps/Examples/scene.cpp
Apps/Examples/scene.cpp
+0
-2
Apps/Examples/simpleGMap2.h
Apps/Examples/simpleGMap2.h
+0
-1
Apps/Examples/simpleGMap3.h
Apps/Examples/simpleGMap3.h
+0
-1
Apps/Examples/squelette3carte.h
Apps/Examples/squelette3carte.h
+0
-1
Apps/Examples/ter_meshes.cpp
Apps/Examples/ter_meshes.cpp
+0
-4
Apps/Examples/texturesExample.h
Apps/Examples/texturesExample.h
+0
-1
Apps/Examples/triangulation.cpp
Apps/Examples/triangulation.cpp
+0
-3
Apps/Examples/viewer.cpp
Apps/Examples/viewer.cpp
+4
-0
Apps/Examples/viewer.h
Apps/Examples/viewer.h
+0
-1
Apps/Examples/volumeViewer.h
Apps/Examples/volumeViewer.h
+0
-1
Apps/Tuto/tp_master.cpp
Apps/Tuto/tp_master.cpp
+0
-4
Apps/Tuto/tuto1.cpp
Apps/Tuto/tuto1.cpp
+0
-1
Apps/Tuto/tuto2.cpp
Apps/Tuto/tuto2.cpp
+0
-3
Apps/Tuto/tuto3.cpp
Apps/Tuto/tuto3.cpp
+0
-1
Apps/Tuto/tuto4.cpp
Apps/Tuto/tuto4.cpp
+0
-2
Apps/Tuto/tuto5.cpp
Apps/Tuto/tuto5.cpp
+0
-3
Apps/Tuto/tuto_mt.cpp
Apps/Tuto/tuto_mt.cpp
+0
-2
Apps/Tuto/tuto_ogl3.cpp
Apps/Tuto/tuto_ogl3.cpp
+3
-4
include/Algo/Decimation/decimation.h
include/Algo/Decimation/decimation.h
+1
-1
include/Algo/Decimation/halfEdgeSelector.h
include/Algo/Decimation/halfEdgeSelector.h
+3
-3
include/Algo/DecimationVolumique/decimator.h
include/Algo/DecimationVolumique/decimator.h
+1
-1
include/Algo/Export/export.h
include/Algo/Export/export.h
+5
-5
include/Algo/Export/exportPov.h
include/Algo/Export/exportPov.h
+3
-3
include/Algo/Filtering/average.h
include/Algo/Filtering/average.h
+4
-4
include/Algo/Filtering/average_normals.h
include/Algo/Filtering/average_normals.h
+4
-4
include/Algo/Filtering/bilateral.h
include/Algo/Filtering/bilateral.h
+2
-2
include/Algo/Filtering/taubin.h
include/Algo/Filtering/taubin.h
+2
-2
include/Algo/Filtering/tools.h
include/Algo/Filtering/tools.h
+2
-2
include/Algo/Geometry/area.h
include/Algo/Geometry/area.h
+5
-5
include/Algo/Geometry/boundingbox.h
include/Algo/Geometry/boundingbox.h
+1
-1
include/Algo/Geometry/centroid.h
include/Algo/Geometry/centroid.h
+3
-3
include/Algo/Geometry/curvature.h
include/Algo/Geometry/curvature.h
+2
-2
include/Algo/Geometry/laplacian.h
include/Algo/Geometry/laplacian.h
+3
-3
include/Algo/Geometry/laplacian.hpp
include/Algo/Geometry/laplacian.hpp
+1
-1
include/Algo/Geometry/normal.h
include/Algo/Geometry/normal.h
+3
-3
include/Algo/Geometry/normalization.h
include/Algo/Geometry/normalization.h
+1
-1
include/Algo/Geometry/volume.h
include/Algo/Geometry/volume.h
+1
-1
include/Algo/Modelisation/subdivision.h
include/Algo/Modelisation/subdivision.h
+11
-11
include/Algo/Modelisation/subdivision3map.h
include/Algo/Modelisation/subdivision3map.h
+2
-2
include/Algo/Modelisation/triangulation.h
include/Algo/Modelisation/triangulation.h
+1
-1
include/Algo/Parallel/parallel_foreach.h
include/Algo/Parallel/parallel_foreach.h
+6
-6
include/Algo/Render/GL1/map_glRender.h
include/Algo/Render/GL1/map_glRender.h
+4
-4
include/Algo/Render/GL2/mapRender.h
include/Algo/Render/GL2/mapRender.h
+10
-10
include/Algo/Render/GL2/topoRender.h
include/Algo/Render/GL2/topoRender.h
+2
-2
include/Algo/Render/SVG/mapSVGRender.h
include/Algo/Render/SVG/mapSVGRender.h
+3
-3
include/Algo/Selection/raySelector.h
include/Algo/Selection/raySelector.h
+3
-3
include/Topology/generic/dart.h
include/Topology/generic/dart.h
+0
-1
include/Topology/generic/functor.h
include/Topology/generic/functor.h
+1
-0
include/Topology/generic/genericmap.h
include/Topology/generic/genericmap.h
+3
-3
include/Topology/generic/traversorCell.h
include/Topology/generic/traversorCell.h
+5
-5
No files found.
Apps/Examples/Tests/concave_rendering.cpp
View file @
5054c589
...
...
@@ -213,7 +213,6 @@ void MyQT::cb_keyPress(int code)
Algo
::
Modelisation
::
EarTriangulation
<
PFP
>
triangulation
(
myMap
);
triangulation
.
triangule
();
SelectorTrue
allDarts
;
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
LINES
);
updateGL
();
...
...
@@ -439,7 +438,6 @@ int main(int argc, char **argv)
sqt
.
m_positionVBO
->
updateData
(
position
);
// update des primitives du renderer
SelectorTrue
allDarts
;
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
LINES
);
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
POINTS
);
...
...
Apps/Examples/clipping.h
View file @
5054c589
...
...
@@ -79,7 +79,6 @@ public:
//Manip Carte
MAP
myMap
;
SelectorTrue
allDarts
;
TVEC3
position
;
Dart
dglobal
;
...
...
Apps/Examples/decimationVolumique.h
View file @
5054c589
...
...
@@ -55,7 +55,6 @@ struct PFP: public PFP_STANDARD
};
PFP
::
MAP
myMap
;
SelectorTrue
allDarts
;
PFP
::
TVEC3
position
;
PFP
::
TREAL
scalar
;
Dart
dglobal
;
...
...
Apps/Examples/extrusionView.cpp
View file @
5054c589
...
...
@@ -155,7 +155,6 @@ int main(int argc, char **argv)
sqt
.
m_positionVBO
->
updateData
(
position
);
// update des primitives du renderer
SelectorTrue
allDarts
;
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
LINES
);
...
...
Apps/Examples/miniTest.cpp
View file @
5054c589
...
...
@@ -56,7 +56,6 @@ struct PFP: public PFP_STANDARD
typedef
PFP
::
MAP
MAP
;
MAP
myMap
;
SelectorTrue
allDarts
;
class
MyGlutWin
:
public
Utils
::
GlutWin_ATB
{
...
...
Apps/Examples/polyhedronsView.cpp
View file @
5054c589
...
...
@@ -154,7 +154,6 @@ int main(int argc, char **argv)
sqt
.
m_positionVBO
->
updateData
(
position
);
// update des primitives du renderer
SelectorTrue
allDarts
;
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
LINES
);
...
...
Apps/Examples/scene.cpp
View file @
5054c589
...
...
@@ -140,8 +140,6 @@ void myGlutWin::init()
void
myGlutWin
::
updateRender
()
{
SelectorTrue
allDarts
;
// create the renderer (first call only)
if
(
m_render
==
NULL
)
m_render
=
new
Algo
::
Render
::
GL2
::
MapRender_VBO
()
;
...
...
Apps/Examples/simpleGMap2.h
View file @
5054c589
...
...
@@ -50,7 +50,6 @@ class SimpleGMap2 : public Utils::QT::SimpleQT
public:
MAP
myMap
;
SelectorTrue
allDarts
;
PFP
::
TVEC3
position
;
...
...
Apps/Examples/simpleGMap3.h
View file @
5054c589
...
...
@@ -50,7 +50,6 @@ class SimpleGMap3 : public Utils::QT::SimpleQT
public:
MAP
myMap
;
SelectorTrue
allDarts
;
PFP
::
TVEC3
position
;
...
...
Apps/Examples/squelette3carte.h
View file @
5054c589
...
...
@@ -55,7 +55,6 @@ struct PFP: public PFP_STANDARD
PFP
::
MAP
myMap
;
SelectorTrue
allDarts
;
PFP
::
TVEC3
position
;
Dart
dglobal
;
...
...
Apps/Examples/ter_meshes.cpp
View file @
5054c589
...
...
@@ -119,10 +119,6 @@ int main(int argc, char **argv)
// declaration of the map
PFP
::
MAP
myMap
;
// this selector is going to select all the darts
SelectorTrue
allDarts
;
std
::
vector
<
std
::
string
>
attrNames
;
if
(
!
Algo
::
Import
::
importMesh
<
PFP
>
(
myMap
,
argv
[
1
],
attrNames
))
{
...
...
Apps/Examples/texturesExample.h
View file @
5054c589
...
...
@@ -63,7 +63,6 @@ protected:
public:
MAP
myMap
;
SelectorTrue
allDarts
;
// render
Algo
::
Render
::
GL2
::
MapRender
*
m_render
;
...
...
Apps/Examples/triangulation.cpp
View file @
5054c589
...
...
@@ -144,9 +144,6 @@ int main(int argc, char **argv)
// declaration of the map
PFP
::
MAP
myMap
;
// this selector is going to select all the darts
SelectorTrue
allDarts
;
// creation of a new attribute on vertices of type 3D vector
// a handler to this attribute is returned
AttributeHandler
<
PFP
::
VEC3
>
position
=
myMap
.
addAttribute
<
PFP
::
VEC3
>
(
VERTEX
,
"position"
);
...
...
Apps/Examples/viewer.cpp
View file @
5054c589
...
...
@@ -210,6 +210,10 @@ void Viewer::importMesh(std::string& filename)
setParamObject
(
bb
.
maxSize
(),
bb
.
center
().
data
())
;
updateGLMatrices
()
;
TraversorCell
<
MAP
>
t
(
myMap
,
VERTEX
)
;
for
(
Dart
d
=
t
.
begin
();
d
!=
t
.
end
();
d
=
t
.
next
())
std
::
cout
<<
"pos -> "
<<
position
[
d
]
<<
std
::
endl
;
}
void
Viewer
::
slot_drawVertices
(
bool
b
)
...
...
Apps/Examples/viewer.h
View file @
5054c589
...
...
@@ -64,7 +64,6 @@ class Viewer : public Utils::QT::SimpleQT
public:
MAP
myMap
;
SelectorTrue
allDarts
;
Utils
::
QT
::
uiDockInterface
dock
;
...
...
Apps/Examples/volumeViewer.h
View file @
5054c589
...
...
@@ -48,7 +48,6 @@ struct PFP: public PFP_STANDARD
PFP
::
MAP
myMap
;
SelectorTrue
allDarts
;
PFP
::
TVEC3
position
;
...
...
Apps/Tuto/tp_master.cpp
View file @
5054c589
...
...
@@ -69,9 +69,6 @@ AttributeHandler<PFP::VEC3> position;
// handler d'attribut de normale par sommet
AttributeHandler
<
PFP
::
VEC3
>
normal
;
/// fonction qui renvoit vrai (appliquée à un brin)
//SelectorTrue allDarts;
/// encore 1 typedef pour simplifier l'ecriture du code
typedef
PFP
::
VEC3
Point3D
;
...
...
@@ -615,7 +612,6 @@ int main(int argc, char **argv)
sqt
.
m_normalVBO
->
updateData
(
normal
);
// update des primitives du renderer
SelectorTrue
allDarts
;
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
LINES
);
...
...
Apps/Tuto/tuto1.cpp
View file @
5054c589
...
...
@@ -173,7 +173,6 @@ int main(int argc, char **argv)
sqt
.
m_positionVBO
->
updateData
(
position
);
// update des primitives du renderer
SelectorTrue
allDarts
;
SelectorEdgeNoBoundary
<
PFP
::
MAP
>
insideEdges
(
myMap
);
// just to draw only inside edges
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
insideEdges
,
Algo
::
Render
::
GL2
::
LINES
);
...
...
Apps/Tuto/tuto2.cpp
View file @
5054c589
...
...
@@ -46,8 +46,6 @@ struct PFP: public PFP_STANDARD
PFP
::
MAP
myMap
;
SelectorTrue
allDarts
;
PFP
::
TVEC3
position
;
PFP
::
TVEC3
normal
;
AttributeHandler
<
Geom
::
Vec4f
>
color
;
...
...
@@ -251,7 +249,6 @@ int main(int argc, char **argv)
sqt
.
m_positionVBO
->
updateData
(
position
);
// update des primitives du renderer
SelectorTrue
allDarts
;
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
LINES
);
...
...
Apps/Tuto/tuto3.cpp
View file @
5054c589
...
...
@@ -103,7 +103,6 @@ void MyQT::cb_keyPress(int code)
int
main
(
int
argc
,
char
**
argv
)
{
PFP
::
MAP
myMap
;
SelectorTrue
allDarts
;
PFP
::
TVEC3
position
;
PFP
::
TVEC3
normal
;
...
...
Apps/Tuto/tuto4.cpp
View file @
5054c589
...
...
@@ -51,7 +51,6 @@ struct PFP: public PFP_STANDARD
};
PFP
::
MAP
myMap
;
SelectorTrue
allDarts
;
PFP
::
TVEC3
position
;
PFP
::
TVEC3
normal
;
...
...
@@ -218,7 +217,6 @@ int main(int argc, char **argv)
sqt
.
m_positionVBO
->
updateData
(
position
);
// update des primitives du renderer
SelectorTrue
allDarts
;
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
LINES
);
...
...
Apps/Tuto/tuto5.cpp
View file @
5054c589
...
...
@@ -60,7 +60,6 @@ struct PFP: public PFP_STANDARD
};
PFP
::
MAP
myMap
;
SelectorTrue
allDarts
;
PFP
::
TVEC3
position
;
Dart
dglobal
;
...
...
@@ -185,8 +184,6 @@ void MyQT::cb_initGL()
registerShader
(
m_sprite
);
registerShader
(
m_lines
);
SelectorTrue
allDarts
;
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
LINES
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
POINTS
);
...
...
Apps/Tuto/tuto_mt.cpp
View file @
5054c589
...
...
@@ -58,8 +58,6 @@ struct PFP: public PFP_STANDARD
// declaration of the map
PFP
::
MAP
myMap
;
// this selector is going to select all the darts
SelectorTrue
allDarts
;
// attribute handlers
AttributeHandler
<
PFP
::
VEC3
>
position
;
...
...
Apps/Tuto/tuto_ogl3.cpp
View file @
5054c589
...
...
@@ -99,10 +99,9 @@ void MyQT::cb_initGL()
colorVBO
->
releasePtr
();
// update the renderer (primitives and geometry)
SelectorTrue
allDarts
;
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
LINES
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
POINTS
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
LINES
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
POINTS
);
shader1
=
new
Utils
::
ShaderPhong
();
shader1
->
setAttributePosition
(
positionVBO
);
...
...
include/Algo/Decimation/decimation.h
View file @
5054c589
...
...
@@ -46,7 +46,7 @@ void decimate(
ApproximatorType
a
,
typename
PFP
::
TVEC3
&
position
,
unsigned
int
nbWantedVertices
,
const
FunctorSelect
&
selected
=
SelectorTrue
()
const
FunctorSelect
&
selected
=
allDarts
)
;
}
//namespace Decimation
...
...
include/Algo/Decimation/halfEdgeSelector.h
View file @
5054c589
...
...
@@ -67,7 +67,7 @@ private:
void
recomputeQuadric
(
const
Dart
d
,
const
bool
recomputeNeighbors
=
false
)
;
public:
HalfEdgeSelector_QEMml
(
MAP
&
m
,
typename
PFP
::
TVEC3
&
pos
,
std
::
vector
<
ApproximatorGen
<
PFP
>*>&
approx
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
:
HalfEdgeSelector_QEMml
(
MAP
&
m
,
typename
PFP
::
TVEC3
&
pos
,
std
::
vector
<
ApproximatorGen
<
PFP
>*>&
approx
,
const
FunctorSelect
&
select
=
allDarts
)
:
EdgeSelector
<
PFP
>
(
m
,
pos
,
approx
,
select
)
{
halfEdgeInfo
=
m
.
template
addAttribute
<
HalfEdgeInfo
>(
DART
,
"halfEdgeInfo"
)
;
...
...
@@ -124,7 +124,7 @@ private:
void
recomputeQuadric
(
const
Dart
d
,
const
bool
recomputeNeighbors
)
;
public:
HalfEdgeSelector_Lightfield
(
MAP
&
m
,
typename
PFP
::
TVEC3
&
pos
,
std
::
vector
<
ApproximatorGen
<
PFP
>*>&
approx
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
:
HalfEdgeSelector_Lightfield
(
MAP
&
m
,
typename
PFP
::
TVEC3
&
pos
,
std
::
vector
<
ApproximatorGen
<
PFP
>*>&
approx
,
const
FunctorSelect
&
select
=
allDarts
)
:
EdgeSelector
<
PFP
>
(
m
,
pos
,
approx
,
select
)
{
m_frame
=
m
.
template
getAttribute
<
MATRIX33
>(
VERTEX
,
"frame"
)
;
...
...
@@ -188,7 +188,7 @@ private:
void computeEdgeInfo(Dart d, EdgeInfo& einfo) ;
public:
EdgeSelector_Lightfield(MAP& m, typename PFP::TVEC3& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select =
SelectorTrue()
) :
EdgeSelector_Lightfield(MAP& m, typename PFP::TVEC3& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select =
allDarts
) :
EdgeSelector<PFP>(m, pos, approx, select)
{
m_frame = m.template getAttribute<FRAME>(VERTEX, "frame") ;
...
...
include/Algo/DecimationVolumique/decimator.h
View file @
5054c589
...
...
@@ -23,7 +23,7 @@ void decimate(
typename
PFP
::
TVEC3
&
position
,
double
nbWanted
);
// const FunctorSelect& selected =
SelectorTrue()
// const FunctorSelect& selected =
allDarts
//) ;
}
//namespace DecimationVolumique
...
...
include/Algo/Export/export.h
View file @
5054c589
...
...
@@ -43,7 +43,7 @@ namespace Export
* @return true
*/
template
<
typename
PFP
>
bool
exportPLY
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
const
char
*
filename
,
const
FunctorSelect
&
good
=
SelectorTrue
()
)
;
bool
exportPLY
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
const
char
*
filename
,
const
FunctorSelect
&
good
=
allDarts
)
;
/**
* export the map into a OFF file
...
...
@@ -52,7 +52,7 @@ bool exportPLY(typename PFP::MAP& map, const typename PFP::TVEC3& position, cons
* @return true
*/
template
<
typename
PFP
>
bool
exportOFF
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
const
char
*
filename
,
const
FunctorSelect
&
good
=
SelectorTrue
()
)
;
bool
exportOFF
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
const
char
*
filename
,
const
FunctorSelect
&
good
=
allDarts
)
;
/**
* export the map into a Trian file
...
...
@@ -61,7 +61,7 @@ bool exportOFF(typename PFP::MAP& map, const typename PFP::TVEC3& position, cons
* @return true
*/
template
<
typename
PFP
>
bool
exportTrian
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
char
*
filename
,
const
FunctorSelect
&
good
=
SelectorTrue
()
)
;
bool
exportTrian
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
char
*
filename
,
const
FunctorSelect
&
good
=
allDarts
)
;
/**
* export the map into a Trian file
...
...
@@ -70,7 +70,7 @@ bool exportTrian(typename PFP::MAP& map, const typename PFP::TVEC3& position, ch
* @return true
*/
template
<
typename
PFP
>
bool
exportCTM
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
const
std
::
string
&
filename
,
const
FunctorSelect
&
good
=
SelectorTrue
()
)
;
bool
exportCTM
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
const
std
::
string
&
filename
,
const
FunctorSelect
&
good
=
allDarts
)
;
/**
* export the map into a PLYPTMgeneric file (K. Vanhoey generic format).
...
...
@@ -85,7 +85,7 @@ bool exportCTM(typename PFP::MAP& map, const typename PFP::TVEC3& position, cons
* @return true
*/
template
<
typename
PFP
>
bool
exportPlyPTMgeneric
(
typename
PFP
::
MAP
&
map
,
const
char
*
filename
,
const
typename
PFP
::
TVEC3
&
position
,
const
FunctorSelect
&
good
=
SelectorTrue
()
)
;
bool
exportPlyPTMgeneric
(
typename
PFP
::
MAP
&
map
,
const
char
*
filename
,
const
typename
PFP
::
TVEC3
&
position
,
const
FunctorSelect
&
good
=
allDarts
)
;
/**
* export the map into a PLYPTMgeneric file (K. Vanhoey generic format)
...
...
include/Algo/Export/exportPov.h
View file @
5054c589
...
...
@@ -34,7 +34,7 @@ void exportTrianglePlain(std::ofstream& out,typename PFP::VEC3& p1,typename PFP:
}
template
<
typename
PFP
>
void
exportMeshPlain
(
std
::
ofstream
&
out
,
typename
PFP
::
MAP
&
map
,
typename
PFP
::
TVEC3
&
position
,
const
std
::
string
&
meshName
,
const
FunctorSelect
&
good
=
SelectorTrue
()
)
void
exportMeshPlain
(
std
::
ofstream
&
out
,
typename
PFP
::
MAP
&
map
,
typename
PFP
::
TVEC3
&
position
,
const
std
::
string
&
meshName
,
const
FunctorSelect
&
good
=
allDarts
)
{
out
<<
"#declare "
<<
meshName
<<
"= union {"
<<
std
::
endl
;
...
...
@@ -74,7 +74,7 @@ void exportMeshPlain(std::ofstream& out, typename PFP::MAP& map, typename PFP::T
}
template
<
typename
PFP
>
void
exportMeshWire
(
std
::
ofstream
&
out
,
typename
PFP
::
MAP
&
map
,
typename
PFP
::
TVEC3
&
position
,
const
std
::
string
&
meshName
,
const
FunctorSelect
&
good
=
SelectorTrue
()
)
void
exportMeshWire
(
std
::
ofstream
&
out
,
typename
PFP
::
MAP
&
map
,
typename
PFP
::
TVEC3
&
position
,
const
std
::
string
&
meshName
,
const
FunctorSelect
&
good
=
allDarts
)
{
out
<<
"#declare "
<<
meshName
<<
"= union {"
<<
std
::
endl
;
...
...
@@ -117,7 +117,7 @@ void exportMeshWire(std::ofstream& out, typename PFP::MAP& map, typename PFP::TV
}
template
<
typename
PFP
>
bool
exportScenePov
(
typename
PFP
::
MAP
&
map
,
typename
PFP
::
TVEC3
&
position
,
const
std
::
string
&
filename
,
typename
PFP
::
VEC3
cameraPos
,
typename
PFP
::
VEC3
cameraLook
,
typename
PFP
::
VEC3
translate
,
float
angle_X
,
float
angle_Y
,
float
angle_Z
,
const
FunctorSelect
&
good
=
SelectorTrue
()
)
bool
exportScenePov
(
typename
PFP
::
MAP
&
map
,
typename
PFP
::
TVEC3
&
position
,
const
std
::
string
&
filename
,
typename
PFP
::
VEC3
cameraPos
,
typename
PFP
::
VEC3
cameraLook
,
typename
PFP
::
VEC3
translate
,
float
angle_X
,
float
angle_Y
,
float
angle_Z
,
const
FunctorSelect
&
good
=
allDarts
)
{
std
::
ofstream
out
(
filename
.
c_str
(),
std
::
ios
::
out
);
if
(
!
out
.
good
())
...
...
include/Algo/Filtering/average.h
View file @
5054c589
...
...
@@ -43,7 +43,7 @@ void filterAverageAttribute_OneRing(
const
AttributeHandler
<
T
>&
attIn
,
AttributeHandler
<
T
>&
attOut
,
int
neigh
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
const
FunctorSelect
&
select
=
allDarts
)
{
FunctorAverage
<
T
>
fa
(
attIn
)
;
Algo
::
Selection
::
Collector_OneRing
<
PFP
>
col
(
map
)
;
...
...
@@ -86,7 +86,7 @@ void filterAverageVertexAttribute_WithinSphere(
int
neigh
,
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
REAL
radius
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
const
FunctorSelect
&
select
=
allDarts
)
{
FunctorAverage
<
T
>
faInside
(
attIn
)
;
FunctorAverageOnSphereBorder
<
PFP
,
T
>
faBorder
(
map
,
attIn
,
position
)
;
...
...
@@ -123,7 +123,7 @@ void filterAverageEdgeAttribute_WithinSphere(
int
neigh
,
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
REAL
radius
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
const
FunctorSelect
&
select
=
allDarts
)
{
FunctorAverage
<
T
>
fa
(
attIn
)
;
Algo
::
Selection
::
Collector_WithinSphere
<
PFP
>
col
(
map
,
position
,
radius
)
;
...
...
@@ -151,7 +151,7 @@ void filterAverageFaceAttribute_WithinSphere(
int
neigh
,
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
REAL
radius
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
const
FunctorSelect
&
select
=
allDarts
)
{
FunctorAverage
<
T
>
fa
(
attIn
)
;
Algo
::
Selection
::
Collector_WithinSphere
<
PFP
>
col
(
map
,
position
,
radius
)
;
...
...
include/Algo/Filtering/average_normals.h
View file @
5054c589
...
...
@@ -75,7 +75,7 @@ void computeNewPositionsFromFaceNormals(
}
template
<
typename
PFP
>
void
filterAverageNormals
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
position2
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
void
filterAverageNormals
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
position2
,
const
FunctorSelect
&
select
=
allDarts
)
{
typedef
typename
PFP
::
VEC3
VEC3
;
typedef
typename
PFP
::
REAL
REAL
;
...
...
@@ -119,7 +119,7 @@ void filterAverageNormals(typename PFP::MAP& map, const typename PFP::TVEC3& pos
}
template
<
typename
PFP
>
void
filterMMSE
(
typename
PFP
::
MAP
&
map
,
float
sigmaN2
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
position2
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
void
filterMMSE
(
typename
PFP
::
MAP
&
map
,
float
sigmaN2
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
position2
,
const
FunctorSelect
&
select
=
allDarts
)
{
typedef
typename
PFP
::
VEC3
VEC3
;
typedef
typename
PFP
::
REAL
REAL
;
...
...
@@ -204,7 +204,7 @@ void filterMMSE(typename PFP::MAP& map, float sigmaN2, const typename PFP::TVEC3
}
template
<
typename
PFP
>
void
filterTNBA
(
typename
PFP
::
MAP
&
map
,
float
sigmaN2
,
float
SUSANthreshold
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
position2
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
void
filterTNBA
(
typename
PFP
::
MAP
&
map
,
float
sigmaN2
,
float
SUSANthreshold
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
position2
,
const
FunctorSelect
&
select
=
allDarts
)
{
typedef
typename
PFP
::
VEC3
VEC3
;
typedef
typename
PFP
::
REAL
REAL
;
...
...
@@ -323,7 +323,7 @@ void filterTNBA(typename PFP::MAP& map, float sigmaN2, float SUSANthreshold, con
}
template
<
typename
PFP
>
void
filterVNBA
(
typename
PFP
::
MAP
&
map
,
float
sigmaN2
,
float
SUSANthreshold
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
position2
,
const
typename
PFP
::
TVEC3
&
normal
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
void
filterVNBA
(
typename
PFP
::
MAP
&
map
,
float
sigmaN2
,
float
SUSANthreshold
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
position2
,
const
typename
PFP
::
TVEC3
&
normal
,
const
FunctorSelect
&
select
=
allDarts
)
{
typedef
typename
PFP
::
VEC3
VEC3
;
typedef
typename
PFP
::
REAL
REAL
;
...
...
include/Algo/Filtering/bilateral.h
View file @
5054c589
...
...
@@ -57,7 +57,7 @@ void sigmaBilateral(typename PFP::MAP& map, const typename PFP::TVEC3& position,
}
template
<
typename
PFP
>
void
filterBilateral
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
position2
,
const
typename
PFP
::
TVEC3
&
normal
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
void
filterBilateral
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
position2
,
const
typename
PFP
::
TVEC3
&
normal
,
const
FunctorSelect
&
select
=
allDarts
)
{
typedef
typename
PFP
::
VEC3
VEC3
;
...
...
@@ -89,7 +89,7 @@ void filterBilateral(typename PFP::MAP& map, const typename PFP::TVEC3& position
}
template
<
typename
PFP
>
void
filterSUSAN
(
typename
PFP
::
MAP
&
map
,
float
SUSANthreshold
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
position2
,
const
typename
PFP
::
TVEC3
&
normal
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
void
filterSUSAN
(
typename
PFP
::
MAP
&
map
,
float
SUSANthreshold
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
position2
,
const
typename
PFP
::
TVEC3
&
normal
,
const
FunctorSelect
&
select
=
allDarts
)
{
typedef
typename
PFP
::
VEC3
VEC3
;
...
...
include/Algo/Filtering/taubin.h
View file @
5054c589
...
...
@@ -35,7 +35,7 @@ namespace Filtering
{
template
<
typename
PFP
>
void
filterTaubin
(
typename
PFP
::
MAP
&
map
,
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
position2
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
void
filterTaubin
(
typename
PFP
::
MAP
&
map
,
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
position2
,
const
FunctorSelect
&
select
=
allDarts
)
{
typedef
typename
PFP
::
VEC3
VEC3
;
...
...
@@ -86,7 +86,7 @@ void filterTaubin(typename PFP::MAP& map, typename PFP::TVEC3& position, typenam
* Taubin filter modified as proposed by [Lav09]
*/
template
<
typename
PFP
>
void
filterTaubin_modified
(
typename
PFP
::
MAP
&
map
,
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
position2
,
typename
PFP
::
REAL
radius
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
void
filterTaubin_modified
(
typename
PFP
::
MAP
&
map
,
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
position2
,
typename
PFP
::
REAL
radius
,
const
FunctorSelect
&
select
=
allDarts
)
{
typedef
typename
PFP
::
VEC3
VEC3
;
...
...
include/Algo/Filtering/tools.h
View file @
5054c589
...
...
@@ -38,7 +38,7 @@ namespace Filtering
{
template
<
typename
PFP
>
float
computeHaussdorf
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
originalPosition
,
const
typename
PFP
::
TVEC3
&
position2
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
float
computeHaussdorf
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
originalPosition
,
const
typename
PFP
::
TVEC3
&
position2
,
const
FunctorSelect
&
select
=
allDarts
)
{
typedef
typename
PFP
::
VEC3
VEC3
;
...
...
@@ -92,7 +92,7 @@ float computeHaussdorf(typename PFP::MAP& map, const typename PFP::TVEC3& origin
}
template
<
typename
PFP
>
void
computeNoise
(
typename
PFP
::
MAP
&
map
,
long
amount
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
position2
,
const
typename
PFP
::
TVEC3
&
normal
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
void
computeNoise
(
typename
PFP
::
MAP
&
map
,
long
amount
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
position2
,
const
typename
PFP
::
TVEC3
&
normal
,
const
FunctorSelect
&
select
=
allDarts
)
{
typedef
typename
PFP
::
VEC3
VEC3
;
...
...
include/Algo/Geometry/area.h
View file @
5054c589
...
...
@@ -41,7 +41,7 @@ template <typename PFP>
typename
PFP
::
REAL
convexFaceArea
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
const
typename
PFP
::
TVEC3
&
position
)
;
template
<
typename
PFP
>
typename
PFP
::
REAL
totalArea
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
const
FunctorSelect
&
select
=
SelectorTrue
()
,
unsigned
int
thread
=
0
)
;
typename
PFP
::
REAL
totalArea
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
const
FunctorSelect
&
select
=
allDarts
,
unsigned
int
thread
=
0
)
;
template
<
typename
PFP
>
typename
PFP
::
REAL
vertexOneRingArea
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
const
typename
PFP
::
TVEC3
&
position
)
;
...
...
@@ -53,16 +53,16 @@ template <typename PFP>
typename
PFP
::
REAL
vertexVoronoiArea
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
const
typename
PFP
::
TVEC3
&
position
)
;
template
<
typename
PFP
>
void
computeAreaFaces
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TREAL
&
face_area
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
;
void
computeAreaFaces
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TREAL
&
face_area
,
const
FunctorSelect
&
select
=
allDarts
)
;
template
<
typename
PFP
>
void
computeOneRingAreaVertices
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TREAL
&
vertex_area
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
;
void
computeOneRingAreaVertices
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TREAL
&
vertex_area
,
const
FunctorSelect
&
select
=
allDarts
)
;
template
<
typename
PFP
>
void
computeBarycentricAreaVertices
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TREAL
&
vertex_area
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
;
void
computeBarycentricAreaVertices
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TREAL
&
vertex_area
,
const
FunctorSelect
&
select
=
allDarts
)
;
template
<
typename
PFP
>
void
computeVoronoiAreaVertices
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TREAL
&
vertex_area
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
;
void
computeVoronoiAreaVertices
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TREAL
&
vertex_area
,
const
FunctorSelect
&
select
=
allDarts
)
;
}
// namespace Geometry
...
...
include/Algo/Geometry/boundingbox.h
View file @
5054c589
...
...
@@ -39,7 +39,7 @@ namespace Geometry
{
template
<
typename
PFP
>
Geom
::
BoundingBox
<
typename
PFP
::
VEC3
>
computeBoundingBox
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
Geom
::
BoundingBox
<
typename
PFP
::
VEC3
>
computeBoundingBox
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
const
FunctorSelect
&
select
=
allDarts
)
{
Geom
::
BoundingBox
<
typename
PFP
::
VEC3
>
bb
;
TraversorV
<
typename
PFP
::
MAP
>
t
(
map
,
select
)
;
...
...
include/Algo/Geometry/centroid.h
View file @
5054c589
...
...
@@ -116,13 +116,13 @@ typename PFP::VEC3 vertexNeighborhoodCentroid(typename PFP::MAP& map, Dart d, co
}
template
<
typename
PFP
>
void
computeCentroidVolumes
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
vol_centroid
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
;
void
computeCentroidVolumes
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
vol_centroid
,
const
FunctorSelect
&
select
=
allDarts
)
;
template
<
typename
PFP
>
void
computeCentroidFaces
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
face_centroid
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
;
void
computeCentroidFaces
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
face_centroid
,
const
FunctorSelect
&
select
=
allDarts
)
;
template
<
typename
PFP
>
void
computeNeighborhoodCentroidVertices
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
vertex_centroid
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
;
void
computeNeighborhoodCentroidVertices
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
vertex_centroid
,
const
FunctorSelect
&
select
=
allDarts
)
;
}
// namespace Geometry
...
...
include/Algo/Geometry/curvature.h
View file @
5054c589
...
...
@@ -51,7 +51,7 @@ void computeCurvatureVertices_QuadraticFitting(
typename
PFP
::
TREAL
&
kmin
,
typename
PFP
::
TVEC3
&
Kmax
,
typename
PFP
::
TVEC3
&
Kmin
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
;
const
FunctorSelect
&
select
=
allDarts
)
;
template
<
typename
PFP
>
void
computeCurvatureVertex_QuadraticFitting
(
...
...
@@ -101,7 +101,7 @@ void computeCurvatureVertices_NormalCycles(
typename
PFP
::
TVEC3
&
Kmax
,
typename
PFP
::
TVEC3
&
Kmin
,
typename
PFP
::
TVEC3
&
Knormal
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
;
const
FunctorSelect
&
select
=
allDarts
)
;
template
<
typename
PFP
>
void
computeCurvatureVertex_NormalCycles
(
...
...
include/Algo/Geometry/laplacian.h
View file @
5054c589
...
...
@@ -55,7 +55,7 @@ void computeLaplacianTopoVertices(
typename
PFP
::
MAP
&
map
,
const
AttributeHandler
<
ATTR_TYPE
>&
attr
,