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
9e0a96cf
Commit
9e0a96cf
authored
Feb 13, 2013
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
eradication of selector git diff | grep +++
parent
4f1ab1d0
Changes
104
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
104 changed files
with
976 additions
and
1089 deletions
+976
-1089
Apps/Examples/clipping.cpp
Apps/Examples/clipping.cpp
+7
-7
Apps/Examples/concave_rendering.cpp
Apps/Examples/concave_rendering.cpp
+5
-5
Apps/Examples/extrusionView.cpp
Apps/Examples/extrusionView.cpp
+2
-2
Apps/Examples/mcmesh.cpp
Apps/Examples/mcmesh.cpp
+3
-2
Apps/Examples/simpleMap3.cpp
Apps/Examples/simpleMap3.cpp
+1
-1
Apps/Examples/texturesExample.cpp
Apps/Examples/texturesExample.cpp
+1
-1
Apps/Examples/viewer.cpp
Apps/Examples/viewer.cpp
+5
-5
Apps/Examples/volumeExplorer.cpp
Apps/Examples/volumeExplorer.cpp
+10
-8
Apps/Tuto/show_traversors.cpp
Apps/Tuto/show_traversors.cpp
+9
-8
Apps/Tuto/tuto1.cpp
Apps/Tuto/tuto1.cpp
+2
-2
Apps/Tuto/tuto2.cpp
Apps/Tuto/tuto2.cpp
+3
-3
Apps/Tuto/tuto3.cpp
Apps/Tuto/tuto3.cpp
+4
-4
Apps/Tuto/tuto5.cpp
Apps/Tuto/tuto5.cpp
+11
-12
Apps/Tuto/tuto_dual3.cpp
Apps/Tuto/tuto_dual3.cpp
+1
-1
Apps/Tuto/tuto_histo.cpp
Apps/Tuto/tuto_histo.cpp
+1
-1
Apps/Tuto/tuto_mt.cpp
Apps/Tuto/tuto_mt.cpp
+2
-2
Apps/Tuto/tuto_oper2.cpp
Apps/Tuto/tuto_oper2.cpp
+3
-3
Apps/Tuto/tuto_oper3.cpp
Apps/Tuto/tuto_oper3.cpp
+8
-8
Apps/Tuto/tuto_orbits.cpp
Apps/Tuto/tuto_orbits.cpp
+3
-3
include/Algo/Decimation/decimation.h
include/Algo/Decimation/decimation.h
+0
-1
include/Algo/Decimation/decimation.hpp
include/Algo/Decimation/decimation.hpp
+18
-18
include/Algo/Decimation/edgeSelector.h
include/Algo/Decimation/edgeSelector.h
+24
-24
include/Algo/Decimation/edgeSelector.hpp
include/Algo/Decimation/edgeSelector.hpp
+3
-3
include/Algo/Decimation/halfEdgeSelector.h
include/Algo/Decimation/halfEdgeSelector.h
+10
-10
include/Algo/Decimation/halfEdgeSelector.hpp
include/Algo/Decimation/halfEdgeSelector.hpp
+1
-1
include/Algo/Decimation/selector.h
include/Algo/Decimation/selector.h
+2
-3
include/Algo/DecimationVolumes/decimator.h
include/Algo/DecimationVolumes/decimator.h
+1
-2
include/Algo/DecimationVolumes/decimator.hpp
include/Algo/DecimationVolumes/decimator.hpp
+4
-6
include/Algo/DecimationVolumes/edgeSelector.h
include/Algo/DecimationVolumes/edgeSelector.h
+8
-8
include/Algo/DecimationVolumes/edgeSelector.hpp
include/Algo/DecimationVolumes/edgeSelector.hpp
+2
-2
include/Algo/DecimationVolumes/selector.h
include/Algo/DecimationVolumes/selector.h
+2
-3
include/Algo/Export/export.h
include/Algo/Export/export.h
+10
-10
include/Algo/Export/export.hpp
include/Algo/Export/export.hpp
+17
-17
include/Algo/Export/exportPov.h
include/Algo/Export/exportPov.h
+30
-32
include/Algo/Filtering/average.h
include/Algo/Filtering/average.h
+8
-12
include/Algo/Filtering/average_normals.h
include/Algo/Filtering/average_normals.h
+27
-32
include/Algo/Filtering/bilateral.h
include/Algo/Filtering/bilateral.h
+8
-8
include/Algo/Filtering/taubin.h
include/Algo/Filtering/taubin.h
+6
-6
include/Algo/Filtering/tools.h
include/Algo/Filtering/tools.h
+4
-4
include/Algo/Geometry/area.h
include/Algo/Geometry/area.h
+5
-5
include/Algo/Geometry/area.hpp
include/Algo/Geometry/area.hpp
+16
-16
include/Algo/Geometry/boundingbox.h
include/Algo/Geometry/boundingbox.h
+2
-2
include/Algo/Geometry/centroid.h
include/Algo/Geometry/centroid.h
+12
-19
include/Algo/Geometry/centroid.hpp
include/Algo/Geometry/centroid.hpp
+22
-22
include/Algo/Geometry/curvature.h
include/Algo/Geometry/curvature.h
+1
-8
include/Algo/Geometry/curvature.hpp
include/Algo/Geometry/curvature.hpp
+8
-15
include/Algo/Geometry/feature.h
include/Algo/Geometry/feature.h
+0
-6
include/Algo/Geometry/feature.hpp
include/Algo/Geometry/feature.hpp
+6
-12
include/Algo/Geometry/laplacian.h
include/Algo/Geometry/laplacian.h
+3
-6
include/Algo/Geometry/laplacian.hpp
include/Algo/Geometry/laplacian.hpp
+6
-9
include/Algo/Geometry/normal.h
include/Algo/Geometry/normal.h
+5
-5
include/Algo/Geometry/normal.hpp
include/Algo/Geometry/normal.hpp
+12
-12
include/Algo/Geometry/normalization.h
include/Algo/Geometry/normalization.h
+2
-1
include/Algo/Geometry/volume.h
include/Algo/Geometry/volume.h
+2
-2
include/Algo/Geometry/volume.hpp
include/Algo/Geometry/volume.hpp
+4
-4
include/Algo/Modelisation/subdivision.h
include/Algo/Modelisation/subdivision.h
+12
-13
include/Algo/Modelisation/subdivision.hpp
include/Algo/Modelisation/subdivision.hpp
+44
-47
include/Algo/Modelisation/subdivision3.h
include/Algo/Modelisation/subdivision3.h
+4
-6
include/Algo/Modelisation/subdivision3.hpp
include/Algo/Modelisation/subdivision3.hpp
+8
-8
include/Algo/Modelisation/tetrahedralization.h
include/Algo/Modelisation/tetrahedralization.h
+1
-1
include/Algo/Modelisation/tetrahedralization.hpp
include/Algo/Modelisation/tetrahedralization.hpp
+2
-2
include/Algo/Modelisation/triangulation.h
include/Algo/Modelisation/triangulation.h
+1
-1
include/Algo/Modelisation/triangulation.hpp
include/Algo/Modelisation/triangulation.hpp
+3
-3
include/Algo/Multiresolution/Map2MR/map2MR_PM.h
include/Algo/Multiresolution/Map2MR/map2MR_PM.h
+1
-1
include/Algo/Multiresolution/Map2MR/map2MR_PM.hpp
include/Algo/Multiresolution/Map2MR/map2MR_PM.hpp
+7
-7
include/Algo/Parallel/parallel_foreach.h
include/Algo/Parallel/parallel_foreach.h
+11
-18
include/Algo/Parallel/parallel_foreach.hpp
include/Algo/Parallel/parallel_foreach.hpp
+38
-52
include/Algo/Render/Deprecated/gl3mapRender.h
include/Algo/Render/Deprecated/gl3mapRender.h
+7
-7
include/Algo/Render/Deprecated/gl3mapRender.hpp
include/Algo/Render/Deprecated/gl3mapRender.hpp
+20
-24
include/Algo/Render/GL1/map_glRender.h
include/Algo/Render/GL1/map_glRender.h
+4
-5
include/Algo/Render/GL1/map_glRender.hpp
include/Algo/Render/GL1/map_glRender.hpp
+20
-20
include/Algo/Render/GL1/renderFunctor.h
include/Algo/Render/GL1/renderFunctor.h
+4
-29
include/Algo/Render/GL1/renderFunctor.hpp
include/Algo/Render/GL1/renderFunctor.hpp
+11
-20
include/Algo/Render/GL1/topo_render.h
include/Algo/Render/GL1/topo_render.h
+1
-1
include/Algo/Render/GL1/topo_render.hpp
include/Algo/Render/GL1/topo_render.hpp
+31
-34
include/Algo/Render/GL2/colorPerEdgeRender.h
include/Algo/Render/GL2/colorPerEdgeRender.h
+1
-2
include/Algo/Render/GL2/colorPerEdgeRender.hpp
include/Algo/Render/GL2/colorPerEdgeRender.hpp
+2
-2
include/Algo/Render/GL2/colorPerFaceRender.h
include/Algo/Render/GL2/colorPerFaceRender.h
+2
-4
include/Algo/Render/GL2/colorPerFaceRender.hpp
include/Algo/Render/GL2/colorPerFaceRender.hpp
+4
-4
include/Algo/Render/GL2/dataPerFaceRender.h
include/Algo/Render/GL2/dataPerFaceRender.h
+1
-2
include/Algo/Render/GL2/dataPerFaceRender.hpp
include/Algo/Render/GL2/dataPerFaceRender.hpp
+2
-3
include/Algo/Render/GL2/explodeVolumeRender.h
include/Algo/Render/GL2/explodeVolumeRender.h
+4
-6
include/Algo/Render/GL2/explodeVolumeRender.hpp
include/Algo/Render/GL2/explodeVolumeRender.hpp
+18
-18
include/Algo/Render/GL2/mapRender.h
include/Algo/Render/GL2/mapRender.h
+8
-8
include/Algo/Render/GL2/mapRender.hpp
include/Algo/Render/GL2/mapRender.hpp
+23
-25
include/Algo/Render/GL2/topo3Render.h
include/Algo/Render/GL2/topo3Render.h
+11
-21
include/Algo/Render/GL2/topo3Render.hpp
include/Algo/Render/GL2/topo3Render.hpp
+64
-83
include/Algo/Render/GL2/topoRender.h
include/Algo/Render/GL2/topoRender.h
+7
-11
include/Algo/Render/GL2/topoRender.hpp
include/Algo/Render/GL2/topoRender.hpp
+31
-33
include/Algo/Render/SVG/mapSVGRender.h
include/Algo/Render/SVG/mapSVGRender.h
+4
-4
include/Algo/Render/SVG/mapSVGRender.hpp
include/Algo/Render/SVG/mapSVGRender.hpp
+8
-8
include/Algo/Selection/raySelector.h
include/Algo/Selection/raySelector.h
+12
-27
include/Algo/Selection/raySelector.hpp
include/Algo/Selection/raySelector.hpp
+25
-27
include/Topology/generic/genericFunc.hpp
include/Topology/generic/genericFunc.hpp
+1
-1
include/Topology/generic/genericmap.h
include/Topology/generic/genericmap.h
+24
-7
include/Topology/generic/genericmap.hpp
include/Topology/generic/genericmap.hpp
+60
-7
include/Topology/generic/mapBrowser.h
include/Topology/generic/mapBrowser.h
+22
-22
include/Topology/generic/traversorCell.h
include/Topology/generic/traversorCell.h
+6
-8
include/Topology/generic/traversorCell.hpp
include/Topology/generic/traversorCell.hpp
+10
-10
include/Topology/generic/traversorFactory.h
include/Topology/generic/traversorFactory.h
+1
-2
include/Topology/generic/traversorFactory.hpp
include/Topology/generic/traversorFactory.hpp
+11
-11
include/Topology/generic/traversorGen.h
include/Topology/generic/traversorGen.h
+1
-2
include/Utils/qem.hpp
include/Utils/qem.hpp
+6
-4
src/Topology/generic/genericmap.cpp
src/Topology/generic/genericmap.cpp
+5
-4
No files found.
Apps/Examples/clipping.cpp
View file @
9e0a96cf
...
...
@@ -138,21 +138,21 @@ void Clipping::slot_drawFaces(bool b)
void
Clipping
::
slot_explodTopoPhi1
(
double
c
)
{
m_coeffTopoExplod
[
0
]
=
(
float
)
c
;
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
m_coeffTopoExplod
[
0
],
m_coeffTopoExplod
[
1
],
m_coeffTopoExplod
[
2
]
,
allDarts
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
m_coeffTopoExplod
[
0
],
m_coeffTopoExplod
[
1
],
m_coeffTopoExplod
[
2
]);
updateGL
();
}
void
Clipping
::
slot_explodTopoPhi2
(
double
c
)
{
m_coeffTopoExplod
[
1
]
=
(
float
)
c
;
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
m_coeffTopoExplod
[
0
],
m_coeffTopoExplod
[
1
],
m_coeffTopoExplod
[
2
]
,
allDarts
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
m_coeffTopoExplod
[
0
],
m_coeffTopoExplod
[
1
],
m_coeffTopoExplod
[
2
]);
updateGL
();
}
void
Clipping
::
slot_explodTopoPhi3
(
double
c
)
{
m_coeffTopoExplod
[
2
]
=
(
float
)
c
;
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
m_coeffTopoExplod
[
0
],
m_coeffTopoExplod
[
1
],
m_coeffTopoExplod
[
2
]
,
allDarts
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
m_coeffTopoExplod
[
0
],
m_coeffTopoExplod
[
1
],
m_coeffTopoExplod
[
2
]);
updateGL
();
}
...
...
@@ -823,7 +823,7 @@ void Clipping::importMesh(std::string& filename)
updateVBOprimitives
(
Algo
::
Render
::
GL2
::
TRIANGLES
|
Algo
::
Render
::
GL2
::
LINES
|
Algo
::
Render
::
GL2
::
POINTS
)
;
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
m_coeffTopoExplod
[
0
],
m_coeffTopoExplod
[
1
],
m_coeffTopoExplod
[
2
]
,
allDarts
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
m_coeffTopoExplod
[
0
],
m_coeffTopoExplod
[
1
],
m_coeffTopoExplod
[
2
]);
m_bb
=
Algo
::
Geometry
::
computeBoundingBox
<
PFP
>
(
myMap
,
position
)
;
gPosObj
=
m_bb
.
center
()
;
...
...
@@ -883,13 +883,13 @@ void Clipping::cb_initGL()
void
Clipping
::
updateVBOprimitives
(
int
upType
)
{
if
(
upType
&
Algo
::
Render
::
GL2
::
TRIANGLES
)
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
TRIANGLES
)
;
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
TRIANGLES
)
;
if
(
upType
&
Algo
::
Render
::
GL2
::
LINES
)
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
LINES
,
false
)
;
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
LINES
,
false
)
;
if
(
upType
&
Algo
::
Render
::
GL2
::
POINTS
)
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
POINTS
)
;
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
POINTS
)
;
}
void
Clipping
::
cb_redraw
()
...
...
Apps/Examples/concave_rendering.cpp
View file @
9e0a96cf
...
...
@@ -216,8 +216,8 @@ void MyQT::cb_keyPress(int code)
Algo
::
Surface
::
Modelisation
::
EarTriangulation
<
PFP
>
triangulation
(
myMap
);
triangulation
.
triangule
();
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
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
LINES
);
updateGL
();
}
break
;
...
...
@@ -431,9 +431,9 @@ int main(int argc, char **argv)
sqt
.
m_positionVBO
->
updateData
(
position
);
// update des primitives du renderer
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
TRIANGLES
,
&
position
);
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
LINES
,
&
position
);
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
POINTS
,
&
position
);
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
TRIANGLES
,
&
position
);
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
LINES
,
&
position
);
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
POINTS
,
&
position
);
// show final pour premier redraw
sqt
.
show
();
...
...
Apps/Examples/extrusionView.cpp
View file @
9e0a96cf
...
...
@@ -150,8 +150,8 @@ int main(int argc, char **argv)
sqt
.
m_positionVBO
->
updateData
(
position
);
// update render primitives
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
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
LINES
);
sqt
.
show
();
return
app
.
exec
();
...
...
Apps/Examples/mcmesh.cpp
View file @
9e0a96cf
...
...
@@ -155,8 +155,9 @@ void MCMesh::MC()
void
MCMesh
::
updateRender
()
{
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
(
myMap
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
nb
,
Algo
::
Render
::
GL2
::
LINES
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
nb
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
//TODO add Browser for no border
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
LINES
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
m_positionVBO
->
updateData
(
position
);
...
...
Apps/Examples/simpleMap3.cpp
View file @
9e0a96cf
...
...
@@ -91,7 +91,7 @@ void SimpleMap3::cb_redraw()
{
glDisable
(
GL_LIGHTING
);
glLineWidth
(
1.0
f
);
Algo
::
Render
::
GL1
::
renderTopoMD3
<
PFP
>
(
myMap
,
position
,
true
,
true
,
true
,
0.9
f
,
0.9
f
,
0.9
f
,
allDarts
);
Algo
::
Render
::
GL1
::
renderTopoMD3
<
PFP
>
(
myMap
,
position
,
true
,
true
,
true
,
0.9
f
,
0.9
f
,
0.9
f
);
}
/**********************************************************************************************
...
...
Apps/Examples/texturesExample.cpp
View file @
9e0a96cf
...
...
@@ -83,7 +83,7 @@ void TexView::cb_initGL()
glEnable
(
GL_TEXTURE_2D
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
}
void
TexView
::
cb_redraw
()
...
...
Apps/Examples/viewer.cpp
View file @
9e0a96cf
...
...
@@ -229,9 +229,9 @@ void Viewer::importMesh(std::string& filename)
myMap
.
enableQuickTraversal
<
VERTEX
>
()
;
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
POINTS
)
;
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
LINES
)
;
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
TRIANGLES
)
;
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
POINTS
)
;
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
LINES
)
;
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
TRIANGLES
)
;
m_topoRender
->
updateData
<
PFP
>
(
myMap
,
position
,
0.85
f
,
0.85
f
)
;
...
...
@@ -258,7 +258,7 @@ void Viewer::exportMesh(std::string& filename, bool askExportMode)
std
::
string
extension
=
filename
.
substr
(
pos
)
;
if
(
extension
==
std
::
string
(
".off"
))
Algo
::
Surface
::
Export
::
exportOFF
<
PFP
>
(
myMap
,
position
,
filename
.
c_str
()
,
allDarts
)
;
Algo
::
Surface
::
Export
::
exportOFF
<
PFP
>
(
myMap
,
position
,
filename
.
c_str
())
;
else
if
(
extension
.
compare
(
0
,
4
,
std
::
string
(
".ply"
))
==
0
)
{
int
ascii
=
0
;
...
...
@@ -267,7 +267,7 @@ void Viewer::exportMesh(std::string& filename, bool askExportMode)
std
::
vector
<
VertexAttribute
<
VEC3
>*>
attributes
;
attributes
.
push_back
(
&
position
)
;
Algo
::
Surface
::
Export
::
exportPLYnew
<
PFP
>
(
myMap
,
attributes
,
filename
.
c_str
(),
!
ascii
,
allDarts
)
;
Algo
::
Surface
::
Export
::
exportPLYnew
<
PFP
>
(
myMap
,
attributes
,
filename
.
c_str
(),
!
ascii
)
;
}
else
if
(
extension
==
std
::
string
(
".map"
))
myMap
.
saveMapBin
(
filename
)
;
...
...
Apps/Examples/volumeExplorer.cpp
View file @
9e0a96cf
...
...
@@ -55,8 +55,9 @@ void MyQT::topo_onoff(bool x)
render_topo
=
!
render_topo
;
if
(
render_topo
)
{
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
(
myMap
);
m_topo_render
->
updateData
<
PFP
>
(
myMap
,
position
,
0.8
f
,
m_explode_factorf
-
0.05
f
,
m_explode_factor
,
nb
);
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
//TODO MapBrowser
m_topo_render
->
updateData
<
PFP
>
(
myMap
,
position
,
0.8
f
,
m_explode_factorf
-
0.05
f
,
m_explode_factor
);
}
updateGL
();
...
...
@@ -123,8 +124,9 @@ void MyQT::slider_released()
render_topo
=
render_topoTemp
;
if
(
render_topo
)
{
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
(
myMap
);
m_topo_render
->
updateData
<
PFP
>
(
myMap
,
position
,
0.8
f
,
m_explode_factorf
-
0.05
f
,
m_explode_factor
,
nb
);
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
//TODO MapBrowser
m_topo_render
->
updateData
<
PFP
>
(
myMap
,
position
,
0.8
f
,
m_explode_factorf
-
0.05
f
,
m_explode_factor
);
}
updateGL
();
}
...
...
@@ -185,8 +187,8 @@ void MyQT::cb_Open()
color
[
i
][
2
]
=
1.0
f
-
color
[
i
][
0
];
}
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
(
myMap
);
m_topo_render
->
updateData
<
PFP
>
(
myMap
,
position
,
0.8
f
,
0.8
f
,
0.8
f
,
nb
);
//
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_topo_render
->
updateData
<
PFP
>
(
myMap
,
position
,
0.8
f
,
0.8
f
,
0.8
f
);
m_explode_render
->
updateData
<
PFP
>
(
myMap
,
position
,
color
);
updateGL
()
;
...
...
@@ -202,8 +204,8 @@ void MyQT::cb_initGL()
m_topo_render
=
new
Algo
::
Render
::
GL2
::
Topo3Render
();
m_explode_render
=
new
Algo
::
Render
::
GL2
::
ExplodeVolumeRender
(
true
,
true
,
false
);
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
(
myMap
);
m_topo_render
->
updateData
<
PFP
>
(
myMap
,
position
,
0.8
f
,
0.8
f
,
0.8
f
,
nb
);
//
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_topo_render
->
updateData
<
PFP
>
(
myMap
,
position
,
0.8
f
,
0.8
f
,
0.8
f
);
m_explode_render
->
updateData
<
PFP
>
(
myMap
,
position
,
color
);
m_explode_render
->
setExplodeVolumes
(
0.8
f
);
m_explode_render
->
setExplodeFaces
(
0.9
f
);
...
...
Apps/Tuto/show_traversors.cpp
View file @
9e0a96cf
...
...
@@ -118,8 +118,8 @@ void MyQT::cb_initGL()
m_render_topo
=
new
Algo
::
Render
::
GL2
::
Topo3Render
();
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
(
myMap
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.95
f
,
0.9
f
,
0.8
f
,
nb
);
//
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.95
f
,
0.9
f
,
0.8
f
);
m_dm_topo
=
new
DartMarker
(
myMap
);
}
...
...
@@ -145,8 +145,8 @@ void MyQT::cb_mousePress(int button, int x, int y)
{
if
(
Shift
())
{
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
(
myMap
);
Dart
d
=
m_render_topo
->
picking
<
PFP
>
(
myMap
,
x
,
y
,
nb
);
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
Dart
d
=
m_render_topo
->
picking
<
PFP
>
(
myMap
,
x
,
y
);
if
(
d
!=
Dart
::
nil
())
{
CGoGNout
<<
"Dart "
<<
d
<<
" clicked"
<<
CGoGNendl
;
...
...
@@ -229,8 +229,8 @@ void MyQT::traverse2()
m_drawer
.
endList
();
SelectorMarked
sm
(
*
m_dm_topo
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.95
f
,
0.9
f
,
0.8
f
,
sm
);
//
SelectorMarked sm(*m_dm_topo);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.95
f
,
0.9
f
,
0.8
f
);
updateGL
();
}
...
...
@@ -293,7 +293,8 @@ void MyQT::traverse3()
Algo
::
Render
::
drawerCells
<
PFP
>
(
VERTEX
+
m_first3
,
m_drawer
,
myMap
,
m_affDarts
,
position
,
m_expl
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.95
f
,
0.9
f
,
0.8
f
,
sm
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.95
f
,
0.9
f
,
0.8
f
);
//sm
for
(
std
::
vector
<
Dart
>::
iterator
id
=
m_affDarts
.
begin
();
id
!=
m_affDarts
.
end
();
++
id
)
m_render_topo
->
setDartColor
(
*
id
,
0.7
f
,
0.0
f
,
0.0
f
);
m_render_topo
->
setDartColor
(
m_selected
,
0.0
f
,
0.7
f
,
0.0
f
);
...
...
@@ -313,7 +314,7 @@ void MyQT::traverse3()
Algo
::
Render
::
drawerCells
<
PFP
>
(
VERTEX
+
m_first3
,
m_drawer
,
myMap
,
m_affDarts
,
position
,
m_expl
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.95
f
,
0.9
f
,
0.8
f
,
sm
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.95
f
,
0.9
f
,
0.8
f
);
//sm
for
(
std
::
vector
<
Dart
>::
iterator
id
=
m_affDarts
.
begin
();
id
!=
m_affDarts
.
end
();
++
id
)
m_render_topo
->
setDartColor
(
*
id
,
0.7
f
,
0.0
f
,
0.0
f
);
m_render_topo
->
setDartColor
(
m_selected
,
0.0
f
,
0.7
f
,
0.0
f
);
...
...
Apps/Tuto/tuto1.cpp
View file @
9e0a96cf
...
...
@@ -24,6 +24,7 @@
#include "tuto1.h"
#include "Algo/Geometry/boundingbox.h"
#include "Topology/generic/mapBrowser.h"
using
namespace
CGoGN
;
...
...
@@ -76,8 +77,7 @@ void MyQT::createMap()
show
();
// render the topo of the map without boundary darts
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
(
myMap
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
nb
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
true
);
}
// initialization GL callback
...
...
Apps/Tuto/tuto2.cpp
View file @
9e0a96cf
...
...
@@ -101,9 +101,9 @@ void MyQT::createMap()
m_colorVBO2
->
updateData
(
colorE
);
// construct rendering primities
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
);
// special primitive for boundary edges
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
LINES
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
POINTS
);
// special primitive for boundary edges
// traverse of all dart of the map:
// and write informations
...
...
Apps/Tuto/tuto3.cpp
View file @
9e0a96cf
...
...
@@ -69,8 +69,8 @@ void MyQT::traverseMap()
m1
.
markOrbit
<
VOLUME
>
(
xd1
);
// render the topo of the map without boundary darts
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
(
myMap
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
nb
);
//
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
);
// nb
for
(
Dart
d
=
myMap
.
begin
();
d
!=
myMap
.
end
();
myMap
.
next
(
d
))
{
...
...
@@ -201,8 +201,8 @@ void MyQT::createMap()
show
();
// render the topo of the map without boundary darts
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
(
myMap
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
nb
);
//
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
);
// nb
}
// initialization GL callback
...
...
Apps/Tuto/tuto5.cpp
View file @
9e0a96cf
...
...
@@ -156,14 +156,13 @@ 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
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
LINES
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
POINTS
);
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
(
myMap
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
0.9
f
,
nb
);
//
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
0.9
f
);
// nb
// timer example for animation
m_timer
=
new
QTimer
(
this
);
...
...
@@ -217,8 +216,8 @@ void MyQT::cb_mousePress(int button, int x, int y)
{
if
(
Shift
())
{
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
(
myMap
);
Dart
d
=
m_render_topo
->
picking
<
PFP
>
(
myMap
,
x
,
y
,
nb
);
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
Dart
d
=
m_render_topo
->
picking
<
PFP
>
(
myMap
,
x
,
y
);
// nb
if
(
d
!=
Dart
::
nil
())
{
CGoGNout
<<
"Dart "
<<
d
<<
" clicked"
<<
CGoGNendl
;
...
...
@@ -262,11 +261,11 @@ void MyQT::cb_keyPress(int code)
Algo
::
Volume
::
Modelisation
::
catmullClarkVol
<
PFP
>
(
myMap
,
position
);
m_positionVBO
->
updateData
(
position
);
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
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
LINES
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
POINTS
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
0.9
f
,
allDarts
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
0.9
f
);
}
}
...
...
Apps/Tuto/tuto_dual3.cpp
View file @
9e0a96cf
...
...
@@ -84,7 +84,7 @@ int main(int argc, char **argv)
if
(
dsave
!=
NIL
)
positionV
[
dsave
]
=
PFP
::
VEC3
(
0.0
);
//Algo::Modelisation::computeDual3<PFP>(myMap
,allDarts
) ;
//Algo::Modelisation::computeDual3<PFP>(myMap) ;
myMap
.
computeDual
();
position
=
positionV
;
...
...
Apps/Tuto/tuto_histo.cpp
View file @
9e0a96cf
...
...
@@ -160,7 +160,7 @@ void MyQT::createMap(const std::string& filename)
l_histo
->
histoColorizeVBO
(
*
m_colorVBO2
);
// construct rendering primities
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
}
...
...
Apps/Tuto/tuto_mt.cpp
View file @
9e0a96cf
...
...
@@ -89,8 +89,8 @@ void MyQT::cb_initGL()
Algo
::
Surface
::
Geometry
::
computeNormalVertices
<
PFP
>
(
myMap
,
position
,
normal
)
;
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
,
Algo
::
Render
::
GL2
::
LINES
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
POINTS
);
registerShader
(
m_shader
);
registerShader
(
m_lines
);
...
...
Apps/Tuto/tuto_oper2.cpp
View file @
9e0a96cf
...
...
@@ -193,7 +193,7 @@ void MyQT::createMap(int n)
m_render_topo
->
setDartWidth
(
5.0
f
);
m_render_topo
->
setInitialDartsColor
(
0.0
f
,
0.0
f
,
0.0
f
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
nb
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
);
// nb
for
(
Dart
d
=
myMap
.
begin
();
d
!=
myMap
.
end
();
myMap
.
next
(
d
))
{
...
...
@@ -211,7 +211,7 @@ void MyQT::createMap(int n)
void
MyQT
::
updateMap
()
{
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
nb
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
);
// nb
for
(
Dart
d
=
myMap
.
begin
();
d
!=
myMap
.
end
();
myMap
.
next
(
d
))
{
if
(
dm
.
isMarked
(
d
)
&&
(
!
myMap
.
isBoundaryMarked2
(
d
)))
...
...
@@ -251,7 +251,7 @@ void MyQT::cb_mousePress(int button, int x, int y)
{
if
(
Shift
())
{
Dart
d
=
m_render_topo
->
picking
<
PFP
>
(
myMap
,
x
,
y
,
nb
);
Dart
d
=
m_render_topo
->
picking
<
PFP
>
(
myMap
,
x
,
y
);
// nb
if
(
button
==
Qt
::
LeftButton
)
{
if
(
d
!=
Dart
::
nil
())
...
...
Apps/Tuto/tuto_oper3.cpp
View file @
9e0a96cf
...
...
@@ -264,12 +264,12 @@ void MyQT::createMap(int n)
m_render_topo
->
setDartWidth
(
3.0
f
);
m_render_topo
->
setInitialDartsColor
(
0.0
f
,
0.0
f
,
0.0
f
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
m_ex1
,
m_ex2
,
m_ex3
,
nb
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
m_ex1
,
m_ex2
,
m_ex3
/*, nb*/
);
}
void
MyQT
::
updateMap
()
{
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
m_ex1
,
m_ex2
,
m_ex3
,
nb
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
m_ex1
,
m_ex2
,
m_ex3
/*, nb*/
);
}
// initialization GL callback
...
...
@@ -325,7 +325,7 @@ void MyQT::cb_mousePress(int button, int x, int y)
{
if
(
Shift
())
{
Dart
d
=
m_render_topo
->
picking
<
PFP
>
(
myMap
,
x
,
y
,
nb
);
Dart
d
=
m_render_topo
->
picking
<
PFP
>
(
myMap
,
x
,
y
/*,nb*/
);
if
(
button
==
Qt
::
LeftButton
)
{
if
(
d
!=
Dart
::
nil
())
...
...
@@ -365,7 +365,7 @@ void MyQT::cb_mousePress(int button, int x, int y)
if
(
Control
())
{
Dart
d
=
m_render_topo
->
picking
<
PFP
>
(
myMap
,
x
,
y
,
nb
);
Dart
d
=
m_render_topo
->
picking
<
PFP
>
(
myMap
,
x
,
y
/*, nb*/
);
if
(
button
==
Qt
::
LeftButton
)
{
if
(
d
!=
Dart
::
nil
())
...
...
@@ -507,13 +507,13 @@ void MyQT::cb_keyPress(int keycode)
case
'w'
:
m_ex1
=
0.99
f
;
m_ex2
=
0.99
f
;
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
m_ex1
,
m_ex2
,
m_ex3
,
nb
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
m_ex1
,
m_ex2
,
m_ex3
/*, nb*/
);
updateGL
();
break
;
case
'W'
:
m_ex1
=
0.9
f
;
m_ex2
=
0.9
f
;
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
m_ex1
,
m_ex2
,
m_ex3
,
nb
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
m_ex1
,
m_ex2
,
m_ex3
/*, nb*/
);
updateGL
();
break
;
...
...
@@ -630,7 +630,7 @@ void MyQT::importMesh(std::string& filename)
m_selected
=
NIL
;
m_selected2
=
NIL
;
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
m_ex1
,
m_ex2
,
m_ex3
,
nb
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
m_ex1
,
m_ex2
,
m_ex3
/*, nb*/
);
bb
=
Algo
::
Geometry
::
computeBoundingBox
<
PFP
>
(
myMap
,
position
)
;
setParamObject
(
bb
.
maxSize
(),
bb
.
center
().
data
())
;
...
...
@@ -645,6 +645,6 @@ void MyQT::importMesh(std::string& filename)
void
MyQT
::
width
(
int
w
)
{
m_ex3
=
0.9
f
-
0.025
f
*
w
;
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
m_ex1
,
m_ex2
,
m_ex3
,
nb
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
m_ex1
,
m_ex2
,
m_ex3
/*, nb*/
);
updateGL
();
}
Apps/Tuto/tuto_orbits.cpp
View file @
9e0a96cf
...
...
@@ -80,7 +80,7 @@ template< unsigned int ORBIT>
void
MyQT
::
storeVerticesInfo
(
const
AttributeHandler
<
int
,
ORBIT
>*
attrib
)
{
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
(
myMap
);
m_render_topo
->
computeDartMiddlePositions
<
PFP
>
(
myMap
,
middleDarts
,
nb
);
m_render_topo
->
computeDartMiddlePositions
<
PFP
>
(
myMap
,
middleDarts
/*, nb*/
);
m_strings
->
clear
();
for
(
Dart
d
=
myMap
.
begin
();
d
!=
myMap
.
end
();
myMap
.
next
(
d
))
...
...
@@ -143,7 +143,7 @@ void MyQT::cb_initGL()
m_render_topo
=
new
Algo
::
Render
::
GL2
::
Topo3Render
();
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
(
myMap
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.8
f
,
0.8
f
,
nb
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.8
f
,
0.8
f
/*, nb*/
);
m_strings
=
new
Utils
::
Strings3D
(
true
,
Geom
::
Vec3f
(
0.1
f
,
0.0
f
,
0.3
f
));
registerShader
(
m_strings
);
...
...
@@ -168,7 +168,7 @@ void MyQT::cb_mousePress(int button, int x, int y)
if
(
Shift
())
{
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
(
myMap
);
m_clicked
=
m_render_topo
->
picking
<
PFP
>
(
myMap
,
x
,
y
,
nb
);
m_clicked
=
m_render_topo
->
picking
<
PFP
>
(
myMap
,
x
,
y
/*, nb*/
);
if
(
m_clicked
!=
Dart
::
nil
())
{
unsigned
int
orbs
[
9
]
=
{
VERTEX
,
EDGE
,
FACE
,
VOLUME
,
PFP
::
MAP
::
VERTEX_OF_PARENT
,
PFP
::
MAP
::
EDGE_OF_PARENT
,
PFP
::
MAP
::
FACE_OF_PARENT
,
PFP
::
MAP
::
VERTEX_OF_PARENT2
,
PFP
::
MAP
::
EDGE_OF_PARENT2
};
...
...
include/Algo/Decimation/decimation.h
View file @
9e0a96cf
...
...
@@ -64,7 +64,6 @@ void decimate(
ApproximatorType
a
,
std
::
vector
<
VertexAttribute
<
typename
PFP
::
VEC3
>
*>&
position
,
unsigned
int
nbWantedVertices
,
const
FunctorSelect
&
selected
=
allDarts
,
EdgeAttribute
<
typename
PFP
::
REAL
>
*
edgeErrors
=
NULL
,
void
(
*
callback_wrapper
)(
void
*
,
const
void
*
)
=
NULL
,
void
*
callback_object
=
NULL
)
;
...
...
include/Algo/Decimation/decimation.hpp
View file @
9e0a96cf
...
...
@@ -37,7 +37,7 @@ namespace Decimation
template
<
typename
PFP
>
void
decimate
(
typename
PFP
::
MAP
&
map
,
SelectorType
s
,
ApproximatorType
a
,
std
::
vector
<
VertexAttribute
<
typename
PFP
::
VEC3
>*
>&
attribs
,
unsigned
int
nbWantedVertices
,
const
FunctorSelect
&
selected
,
std
::
vector
<
VertexAttribute
<
typename
PFP
::
VEC3
>*
>&
attribs
,
unsigned
int
nbWantedVertices
,
EdgeAttribute
<
typename
PFP
::
REAL
>
*
edgeErrors
,
void
(
*
callback_wrapper
)(
void
*
,
const
void
*
),
void
*
callback_object
)
...
...
@@ -146,55 +146,55 @@ void decimate(
switch
(
s
)
{
case
S_MapOrder
:
selector
=
new
EdgeSelector_MapOrder
<
PFP
>
(
map
,
position
,
approximators
,
selected
)
;
selector
=
new
EdgeSelector_MapOrder
<
PFP
>
(
map
,
position
,
approximators
)
;
break
;
case
S_Random
:
selector
=
new
EdgeSelector_Random
<
PFP
>
(
map
,
position
,
approximators
,
selected
)
;
selector
=
new
EdgeSelector_Random
<
PFP
>
(
map
,
position
,
approximators
)
;
break
;
case
S_EdgeLength
:
selector
=
new
EdgeSelector_Length
<
PFP
>
(
map
,
position
,
approximators
,
selected
)
;
selector
=
new
EdgeSelector_Length
<
PFP
>
(
map
,
position
,
approximators
)
;
break
;
case
S_QEMml
:
selector
=
new
EdgeSelector_QEMml
<
PFP
>
(
map
,
position
,
approximators
,
selected
)
;
selector
=
new
EdgeSelector_QEMml
<
PFP
>
(
map
,
position
,
approximators
)
;
break
;
case
S_QEM
:
selector
=
new
EdgeSelector_QEM
<
PFP
>
(
map
,
position
,
approximators
,
selected
)
;
selector
=
new
EdgeSelector_QEM
<
PFP
>
(
map
,
position
,
approximators
)
;
break
;
case
S_Curvature
:
selector
=
new
EdgeSelector_Curvature
<
PFP
>
(
map
,
position
,
approximators
,
selected
)
;
selector
=
new
EdgeSelector_Curvature
<
PFP
>
(
map
,
position
,
approximators
)
;
break
;
case
S_NormalArea
:
selector
=
new
EdgeSelector_NormalArea
<
PFP
>
(
map
,
position
,
approximators
,
selected
)
;
selector
=
new
EdgeSelector_NormalArea
<
PFP
>
(
map
,
position
,
approximators
)
;
break
;
case
S_CurvatureTensor
:
selector
=
new
EdgeSelector_CurvatureTensor
<
PFP
>
(
map
,
position
,
approximators
,
selected
)
;
selector
=
new
EdgeSelector_CurvatureTensor
<
PFP
>
(
map
,
position
,
approximators
)
;
break
;
case
S_MinDetail
:
selector
=
new
EdgeSelector_MinDetail
<
PFP
>
(
map
,
position
,
approximators
,
selected
)
;
selector
=
new
EdgeSelector_MinDetail
<
PFP
>
(
map
,
position
,
approximators
)
;
break
;
case
S_ColorNaive
:
selector
=
new
EdgeSelector_ColorNaive
<
PFP
>
(
map
,
position
,
approximators
,
selected
)
;
selector
=
new
EdgeSelector_ColorNaive
<
PFP
>
(
map
,
position
,
approximators
)
;
break
;
case
S_QEMextColor
:
selector
=
new
EdgeSelector_QEMextColor
<
PFP
>
(
map
,
position
,
approximators
,
selected
)
;
selector
=
new
EdgeSelector_QEMextColor
<
PFP
>
(
map
,
position
,
approximators
)
;
break
;
case
S_hQEMextColor
: