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
4670bae0
Commit
4670bae0
authored
May 21, 2014
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no more virtual foreach_dart / no more MAP_IMPL parameter in AttributeHandler
parent
a3be313e
Changes
210
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
210 changed files
with
3122 additions
and
2940 deletions
+3122
-2940
Apps/Examples/clipping.cpp
Apps/Examples/clipping.cpp
+3
-4
Apps/Examples/clipping.h
Apps/Examples/clipping.h
+1
-2
Apps/Examples/concave_rendering.cpp
Apps/Examples/concave_rendering.cpp
+2
-3
Apps/Examples/extrusionView.cpp
Apps/Examples/extrusionView.cpp
+2
-3
Apps/Examples/mcmesh.cpp
Apps/Examples/mcmesh.cpp
+2
-2
Apps/Examples/mcmesh.h
Apps/Examples/mcmesh.h
+1
-2
Apps/Examples/simpleGMap2.cpp
Apps/Examples/simpleGMap2.cpp
+2
-2
Apps/Examples/simpleGMap2.h
Apps/Examples/simpleGMap2.h
+1
-3
Apps/Examples/simpleGMap3.cpp
Apps/Examples/simpleGMap3.cpp
+2
-2
Apps/Examples/simpleGMap3.h
Apps/Examples/simpleGMap3.h
+2
-3
Apps/Examples/simpleMap3.cpp
Apps/Examples/simpleMap3.cpp
+75
-76
Apps/Examples/simpleMap3.h
Apps/Examples/simpleMap3.h
+1
-2
Apps/Examples/texturesExample.cpp
Apps/Examples/texturesExample.cpp
+4
-4
Apps/Examples/texturesExample.h
Apps/Examples/texturesExample.h
+0
-1
Apps/Examples/viewer.cpp
Apps/Examples/viewer.cpp
+272
-273
Apps/Examples/viewer.h
Apps/Examples/viewer.h
+2
-3
Apps/Examples/viewerOBJ.cpp
Apps/Examples/viewerOBJ.cpp
+0
-4
Apps/Examples/viewerOBJ.h
Apps/Examples/viewerOBJ.h
+1
-4
Apps/Examples/volumeExplorer.cpp
Apps/Examples/volumeExplorer.cpp
+29
-34
Apps/Examples/volumeExplorer.h
Apps/Examples/volumeExplorer.h
+5
-5
Apps/SandBox/multi_att.cpp
Apps/SandBox/multi_att.cpp
+8
-9
Apps/SandBox/testPlaneCutting.cpp
Apps/SandBox/testPlaneCutting.cpp
+5
-5
Apps/SandBox/testPlaneCutting.h
Apps/SandBox/testPlaneCutting.h
+2
-3
Apps/SandBox/test_traversor2.cpp
Apps/SandBox/test_traversor2.cpp
+6
-6
Apps/SandBox/test_traversor2.h
Apps/SandBox/test_traversor2.h
+2
-3
Apps/SandBox/tilings.cpp
Apps/SandBox/tilings.cpp
+10
-11
Apps/Tuto/Attributes/multi_attribs.cpp
Apps/Tuto/Attributes/multi_attribs.cpp
+7
-9
Apps/Tuto/Attributes/simple_attribs.cpp
Apps/Tuto/Attributes/simple_attribs.cpp
+9
-11
Apps/Tuto/Boundary/boundaries.cpp
Apps/Tuto/Boundary/boundaries.cpp
+2
-3
Apps/Tuto/Markers/cellmarkers.cpp
Apps/Tuto/Markers/cellmarkers.cpp
+4
-6
Apps/Tuto/Markers/dartmarkers.cpp
Apps/Tuto/Markers/dartmarkers.cpp
+2
-4
Apps/Tuto/Modelling/basics.cpp
Apps/Tuto/Modelling/basics.cpp
+1
-2
Apps/Tuto/Modelling/tuto_oper2.cpp
Apps/Tuto/Modelling/tuto_oper2.cpp
+6
-6
Apps/Tuto/Modelling/tuto_oper2.h
Apps/Tuto/Modelling/tuto_oper2.h
+2
-3
Apps/Tuto/Modelling/tuto_oper3.cpp
Apps/Tuto/Modelling/tuto_oper3.cpp
+6
-7
Apps/Tuto/Modelling/tuto_oper3.h
Apps/Tuto/Modelling/tuto_oper3.h
+1
-2
Apps/Tuto/Traversals/show_traversors2.cpp
Apps/Tuto/Traversals/show_traversors2.cpp
+5
-8
Apps/Tuto/Traversals/show_traversors2.h
Apps/Tuto/Traversals/show_traversors2.h
+1
-2
Apps/Tuto/Traversals/show_traversors3.cpp
Apps/Tuto/Traversals/show_traversors3.cpp
+4
-5
Apps/Tuto/Traversals/show_traversors3.h
Apps/Tuto/Traversals/show_traversors3.h
+0
-1
Apps/Tuto/Traversals/traverse_attributes.cpp
Apps/Tuto/Traversals/traverse_attributes.cpp
+6
-10
Apps/Tuto/Traversals/traverse_cells.cpp
Apps/Tuto/Traversals/traverse_cells.cpp
+16
-24
Apps/Tuto/Traversals/traverse_neighbours.cpp
Apps/Tuto/Traversals/traverse_neighbours.cpp
+3
-5
Apps/Tuto/tuto1.cpp
Apps/Tuto/tuto1.cpp
+1
-1
Apps/Tuto/tuto1.h
Apps/Tuto/tuto1.h
+1
-2
Apps/Tuto/tuto2.cpp
Apps/Tuto/tuto2.cpp
+4
-4
Apps/Tuto/tuto2.h
Apps/Tuto/tuto2.h
+0
-1
Apps/Tuto/tuto3.cpp
Apps/Tuto/tuto3.cpp
+1
-1
Apps/Tuto/tuto3.h
Apps/Tuto/tuto3.h
+1
-2
Apps/Tuto/tuto4.cpp
Apps/Tuto/tuto4.cpp
+1
-1
Apps/Tuto/tuto4.h
Apps/Tuto/tuto4.h
+1
-2
Apps/Tuto/tuto5.cpp
Apps/Tuto/tuto5.cpp
+2
-3
Apps/Tuto/tuto5.h
Apps/Tuto/tuto5.h
+0
-1
Apps/Tuto/tuto_dual2.cpp
Apps/Tuto/tuto_dual2.cpp
+3
-4
Apps/Tuto/tuto_dual3.cpp
Apps/Tuto/tuto_dual3.cpp
+10
-11
Apps/Tuto/tuto_histo.cpp
Apps/Tuto/tuto_histo.cpp
+3
-3
Apps/Tuto/tuto_histo.h
Apps/Tuto/tuto_histo.h
+2
-3
Apps/Tuto/tuto_mt.cpp
Apps/Tuto/tuto_mt.cpp
+16
-17
Apps/Tuto/tuto_orbits.cpp
Apps/Tuto/tuto_orbits.cpp
+24
-24
Apps/Tuto/tuto_orbits.h
Apps/Tuto/tuto_orbits.h
+1
-2
Apps/Tuto/tuto_subdivision.cpp
Apps/Tuto/tuto_subdivision.cpp
+2
-3
include/Algo/Decimation/approximator.h
include/Algo/Decimation/approximator.h
+6
-7
include/Algo/Decimation/approximator.hpp
include/Algo/Decimation/approximator.hpp
+1
-1
include/Algo/Decimation/colorPerVertexApproximator.h
include/Algo/Decimation/colorPerVertexApproximator.h
+12
-15
include/Algo/Decimation/edgeSelector.h
include/Algo/Decimation/edgeSelector.h
+42
-54
include/Algo/Decimation/geometryApproximator.h
include/Algo/Decimation/geometryApproximator.h
+9
-15
include/Algo/Decimation/geometryPredictor.h
include/Algo/Decimation/geometryPredictor.h
+4
-8
include/Algo/Decimation/halfEdgeSelector.h
include/Algo/Decimation/halfEdgeSelector.h
+18
-22
include/Algo/Decimation/predictor.h
include/Algo/Decimation/predictor.h
+2
-4
include/Algo/Decimation/selector.h
include/Algo/Decimation/selector.h
+3
-4
include/Algo/Export/export.h
include/Algo/Export/export.h
+6
-6
include/Algo/Export/export.hpp
include/Algo/Export/export.hpp
+7
-8
include/Algo/Export/exportVol.h
include/Algo/Export/exportVol.h
+8
-8
include/Algo/Export/exportVol.hpp
include/Algo/Export/exportVol.hpp
+15
-22
include/Algo/Filtering/average_normals.h
include/Algo/Filtering/average_normals.h
+31
-32
include/Algo/Filtering/functors.h
include/Algo/Filtering/functors.h
+3
-4
include/Algo/Filtering/taubin.h
include/Algo/Filtering/taubin.h
+4
-5
include/Algo/Geometry/area.h
include/Algo/Geometry/area.h
+13
-13
include/Algo/Geometry/area.hpp
include/Algo/Geometry/area.hpp
+14
-14
include/Algo/Geometry/basic.h
include/Algo/Geometry/basic.h
+5
-5
include/Algo/Geometry/boundingbox.h
include/Algo/Geometry/boundingbox.h
+1
-1
include/Algo/Geometry/convexity.h
include/Algo/Geometry/convexity.h
+1
-1
include/Algo/Geometry/convexity.hpp
include/Algo/Geometry/convexity.hpp
+1
-1
include/Algo/Geometry/curvature.h
include/Algo/Geometry/curvature.h
+100
-100
include/Algo/Geometry/curvature.hpp
include/Algo/Geometry/curvature.hpp
+100
-100
include/Algo/Geometry/distances.h
include/Algo/Geometry/distances.h
+3
-3
include/Algo/Geometry/distances.hpp
include/Algo/Geometry/distances.hpp
+3
-3
include/Algo/Geometry/feature.h
include/Algo/Geometry/feature.h
+35
-35
include/Algo/Geometry/feature.hpp
include/Algo/Geometry/feature.hpp
+35
-36
include/Algo/Geometry/inclusion.h
include/Algo/Geometry/inclusion.h
+9
-9
include/Algo/Geometry/inclusion.hpp
include/Algo/Geometry/inclusion.hpp
+9
-9
include/Algo/Geometry/intersection.h
include/Algo/Geometry/intersection.h
+4
-4
include/Algo/Geometry/intersection.hpp
include/Algo/Geometry/intersection.hpp
+4
-4
include/Algo/Geometry/laplacian.h
include/Algo/Geometry/laplacian.h
+16
-16
include/Algo/Geometry/laplacian.hpp
include/Algo/Geometry/laplacian.hpp
+16
-16
include/Algo/Geometry/localFrame.h
include/Algo/Geometry/localFrame.h
+4
-4
include/Algo/Geometry/normalization.h
include/Algo/Geometry/normalization.h
+1
-1
include/Algo/Geometry/orientation.h
include/Algo/Geometry/orientation.h
+1
-1
include/Algo/Geometry/plane.h
include/Algo/Geometry/plane.h
+3
-3
include/Algo/Geometry/stats.h
include/Algo/Geometry/stats.h
+1
-1
include/Algo/Geometry/volume.h
include/Algo/Geometry/volume.h
+5
-5
include/Algo/Geometry/volume.hpp
include/Algo/Geometry/volume.hpp
+5
-5
include/Algo/Geometry/voronoiDiagrams.h
include/Algo/Geometry/voronoiDiagrams.h
+14
-15
include/Algo/Geometry/voronoiDiagrams.hpp
include/Algo/Geometry/voronoiDiagrams.hpp
+8
-8
include/Algo/ImplicitHierarchicalMesh/ihm3.h
include/Algo/ImplicitHierarchicalMesh/ihm3.h
+46
-25
include/Algo/ImplicitHierarchicalMesh/ihm3.hpp
include/Algo/ImplicitHierarchicalMesh/ihm3.hpp
+94
-34
include/Algo/Import/import.hpp
include/Algo/Import/import.hpp
+38
-43
include/Algo/Import/import2tables.h
include/Algo/Import/import2tables.h
+1
-3
include/Algo/Import/import2tablesSurface.hpp
include/Algo/Import/import2tablesSurface.hpp
+52
-52
include/Algo/Import/import2tablesVolume.hpp
include/Algo/Import/import2tablesVolume.hpp
+20
-20
include/Algo/Import/importObjTex.h
include/Algo/Import/importObjTex.h
+10
-11
include/Algo/Import/importObjTex.hpp
include/Algo/Import/importObjTex.hpp
+24
-30
include/Algo/MC/marchingcube.h
include/Algo/MC/marchingcube.h
+4
-5
include/Algo/MC/marchingcube.hpp
include/Algo/MC/marchingcube.hpp
+6
-6
include/Algo/Modelisation/boundEmb.h
include/Algo/Modelisation/boundEmb.h
+2
-2
include/Algo/Modelisation/extrusion.h
include/Algo/Modelisation/extrusion.h
+9
-9
include/Algo/Modelisation/extrusion.hpp
include/Algo/Modelisation/extrusion.hpp
+10
-10
include/Algo/Modelisation/planeCutting.h
include/Algo/Modelisation/planeCutting.h
+3
-3
include/Algo/Modelisation/planeCutting.hpp
include/Algo/Modelisation/planeCutting.hpp
+5
-6
include/Algo/Modelisation/polyhedron.h
include/Algo/Modelisation/polyhedron.h
+3
-3
include/Algo/Modelisation/polyhedron.hpp
include/Algo/Modelisation/polyhedron.hpp
+3
-4
include/Algo/Modelisation/subdivision.h
include/Algo/Modelisation/subdivision.h
+6
-6
include/Algo/Modelisation/subdivision.hpp
include/Algo/Modelisation/subdivision.hpp
+11
-12
include/Algo/Modelisation/subdivision3.h
include/Algo/Modelisation/subdivision3.h
+6
-6
include/Algo/Modelisation/subdivision3.hpp
include/Algo/Modelisation/subdivision3.hpp
+9
-13
include/Algo/Modelisation/tetrahedralization.h
include/Algo/Modelisation/tetrahedralization.h
+2
-3
include/Algo/Modelisation/triangulation.h
include/Algo/Modelisation/triangulation.h
+3
-4
include/Algo/MovingObjects/particle_cell_2D.h
include/Algo/MovingObjects/particle_cell_2D.h
+1
-2
include/Algo/MovingObjects/particle_cell_2D_memo.h
include/Algo/MovingObjects/particle_cell_2D_memo.h
+1
-2
include/Algo/MovingObjects/particle_cell_2D_secured.h
include/Algo/MovingObjects/particle_cell_2D_secured.h
+1
-2
include/Algo/MovingObjects/particle_cell_2DandHalf.h
include/Algo/MovingObjects/particle_cell_2DandHalf.h
+1
-2
include/Algo/MovingObjects/particle_cell_2DandHalf_memo.h
include/Algo/MovingObjects/particle_cell_2DandHalf_memo.h
+1
-2
include/Algo/MovingObjects/particle_cell_3D.h
include/Algo/MovingObjects/particle_cell_3D.h
+1
-2
include/Algo/Multiresolution/Map2MR/Filters/Dual/catmullClark.h
...e/Algo/Multiresolution/Map2MR/Filters/Dual/catmullClark.h
+2
-3
include/Algo/Multiresolution/Map2MR/Filters/Dual/dooSabin.h
include/Algo/Multiresolution/Map2MR/Filters/Dual/dooSabin.h
+2
-3
include/Algo/Multiresolution/Map2MR/Filters/bertram.h
include/Algo/Multiresolution/Map2MR/Filters/bertram.h
+12
-18
include/Algo/Multiresolution/Map2MR/Filters/catmullClark.h
include/Algo/Multiresolution/Map2MR/Filters/catmullClark.h
+20
-30
include/Algo/Multiresolution/Map2MR/Filters/lerp.h
include/Algo/Multiresolution/Map2MR/Filters/lerp.h
+8
-12
include/Algo/Multiresolution/Map2MR/Filters/loop.h
include/Algo/Multiresolution/Map2MR/Filters/loop.h
+12
-18
include/Algo/Multiresolution/Map2MR/Filters/sqrt2.h
include/Algo/Multiresolution/Map2MR/Filters/sqrt2.h
+2
-3
include/Algo/Multiresolution/Map2MR/Filters/sqrt3.h
include/Algo/Multiresolution/Map2MR/Filters/sqrt3.h
+8
-12
include/Algo/ProgressiveMesh/pmesh.h
include/Algo/ProgressiveMesh/pmesh.h
+2
-3
include/Algo/ProgressiveMesh/pmesh.hpp
include/Algo/ProgressiveMesh/pmesh.hpp
+2
-2
include/Algo/Remeshing/pliant.h
include/Algo/Remeshing/pliant.h
+2
-2
include/Algo/Remeshing/pliant.hpp
include/Algo/Remeshing/pliant.hpp
+3
-4
include/Algo/Render/GL1/topo_render.hpp
include/Algo/Render/GL1/topo_render.hpp
+19
-23
include/Algo/Render/GL2/drawerCells.h
include/Algo/Render/GL2/drawerCells.h
+14
-14
include/Algo/Render/GL2/drawerCells.hpp
include/Algo/Render/GL2/drawerCells.hpp
+14
-14
include/Algo/Render/GL2/explodeVolumeRender.hpp
include/Algo/Render/GL2/explodeVolumeRender.hpp
+4
-10
include/Algo/Render/GL2/mapRender.h
include/Algo/Render/GL2/mapRender.h
+7
-7
include/Algo/Render/GL2/mapRender.hpp
include/Algo/Render/GL2/mapRender.hpp
+8
-8
include/Algo/Render/GL2/topo3PrimalRender.h
include/Algo/Render/GL2/topo3PrimalRender.h
+4
-5
include/Algo/Render/GL2/topo3PrimalRender.hpp
include/Algo/Render/GL2/topo3PrimalRender.hpp
+6
-6
include/Algo/Render/GL2/topo3Render.h
include/Algo/Render/GL2/topo3Render.h
+8
-11
include/Algo/Render/GL2/topo3Render.hpp
include/Algo/Render/GL2/topo3Render.hpp
+18
-18
include/Algo/Render/GL2/topoPrimalRender.h
include/Algo/Render/GL2/topoPrimalRender.h
+4
-5
include/Algo/Render/GL2/topoPrimalRender.hpp
include/Algo/Render/GL2/topoPrimalRender.hpp
+4
-4
include/Algo/Render/GL2/topoRender.h
include/Algo/Render/GL2/topoRender.h
+5
-8
include/Algo/Render/GL2/topoRender.hpp
include/Algo/Render/GL2/topoRender.hpp
+19
-25
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
+4
-4
include/Algo/Selection/collector.h
include/Algo/Selection/collector.h
+34
-47
include/Algo/Selection/collector.hpp
include/Algo/Selection/collector.hpp
+9
-9
include/Algo/Selection/raySelectFunctor.hpp
include/Algo/Selection/raySelectFunctor.hpp
+6
-9
include/Algo/Selection/raySelector.h
include/Algo/Selection/raySelector.h
+17
-17
include/Algo/Tiling/Surface/hexagonal.h
include/Algo/Tiling/Surface/hexagonal.h
+4
-5
include/Algo/Tiling/Surface/hexagonal.hpp
include/Algo/Tiling/Surface/hexagonal.hpp
+1
-1
include/Algo/Tiling/Surface/square.h
include/Algo/Tiling/Surface/square.h
+12
-16
include/Algo/Tiling/Surface/square.hpp
include/Algo/Tiling/Surface/square.hpp
+8
-8
include/Algo/Tiling/Surface/triangular.h
include/Algo/Tiling/Surface/triangular.h
+11
-16
include/Algo/Tiling/Surface/triangular.hpp
include/Algo/Tiling/Surface/triangular.hpp
+8
-8
include/Algo/Tiling/Volume/cubic.h
include/Algo/Tiling/Volume/cubic.h
+4
-5
include/Algo/Tiling/Volume/cubic.hpp
include/Algo/Tiling/Volume/cubic.hpp
+4
-4
include/Algo/Tiling/tiling.h
include/Algo/Tiling/tiling.h
+4
-5
include/Algo/Tiling/tiling.hpp
include/Algo/Tiling/tiling.hpp
+3
-3
include/Algo/Topo/basic.h
include/Algo/Topo/basic.h
+4
-4
include/Topology/generic/attributeHandler.h
include/Topology/generic/attributeHandler.h
+46
-46
include/Topology/generic/attributeHandler.hpp
include/Topology/generic/attributeHandler.hpp
+55
-55
include/Topology/generic/autoAttributeHandler.h
include/Topology/generic/autoAttributeHandler.h
+20
-20
include/Topology/generic/cellmarker.h
include/Topology/generic/cellmarker.h
+10
-2
include/Topology/generic/dartmarker.h
include/Topology/generic/dartmarker.h
+1
-0
include/Topology/generic/genericmap.h
include/Topology/generic/genericmap.h
+11
-21
include/Topology/generic/genericmap.hpp
include/Topology/generic/genericmap.hpp
+0
-38
include/Topology/generic/mapCommon.h
include/Topology/generic/mapCommon.h
+30
-87
include/Topology/generic/mapCommon.hpp
include/Topology/generic/mapCommon.hpp
+46
-121
include/Topology/generic/multiAttribs.h
include/Topology/generic/multiAttribs.h
+16
-16
include/Topology/gmap/gmap0.h
include/Topology/gmap/gmap0.h
+14
-2
include/Topology/gmap/gmap0.hpp
include/Topology/gmap/gmap0.hpp
+30
-2
include/Topology/gmap/gmap1.h
include/Topology/gmap/gmap1.h
+17
-4
include/Topology/gmap/gmap1.hpp
include/Topology/gmap/gmap1.hpp
+34
-4
include/Topology/gmap/gmap2.h
include/Topology/gmap/gmap2.h
+43
-17
include/Topology/gmap/gmap2.hpp
include/Topology/gmap/gmap2.hpp
+80
-29
include/Topology/gmap/gmap3.h
include/Topology/gmap/gmap3.h
+49
-13
include/Topology/gmap/gmap3.hpp
include/Topology/gmap/gmap3.hpp
+104
-39
include/Topology/ihmap/ihm2.h
include/Topology/ihmap/ihm2.h
+36
-17
include/Topology/ihmap/ihm2.hpp
include/Topology/ihmap/ihm2.hpp
+65
-14
include/Topology/map/embeddedMap3.h
include/Topology/map/embeddedMap3.h
+2
-3
include/Topology/map/map1.h
include/Topology/map/map1.h
+16
-3
include/Topology/map/map1.hpp
include/Topology/map/map1.hpp
+32
-3
include/Topology/map/map2.h
include/Topology/map/map2.h
+30
-14
include/Topology/map/map2.hpp
include/Topology/map/map2.hpp
+76
-35
include/Topology/map/map3.h
include/Topology/map/map3.h
+41
-10
include/Topology/map/map3.hpp
include/Topology/map/map3.hpp
+101
-39
src/Algo/ImplicitHierarchicalMesh/ihm3.cpp
src/Algo/ImplicitHierarchicalMesh/ihm3.cpp
+15
-12
src/Topology/gmap/embeddedGMap2.cpp
src/Topology/gmap/embeddedGMap2.cpp
+29
-30
src/Topology/gmap/embeddedGMap3.cpp
src/Topology/gmap/embeddedGMap3.cpp
+29
-30
src/Topology/ihmap/ihm2.cpp
src/Topology/ihmap/ihm2.cpp
+4
-4
src/Topology/map/embeddedMap2.cpp
src/Topology/map/embeddedMap2.cpp
+42
-43
src/Topology/map/embeddedMap2_MR.cpp
src/Topology/map/embeddedMap2_MR.cpp
+65
-77
src/Topology/map/embeddedMap3.cpp
src/Topology/map/embeddedMap3.cpp
+44
-45
No files found.
Apps/Examples/clipping.cpp
View file @
4670bae0
...
...
@@ -798,7 +798,7 @@ void Clipping::importMesh(std::string& filename)
return
;
}
else
position
=
myMap
.
getAttribute
<
VEC3
,
VERTEX
>
(
"position"
)
;
position
=
myMap
.
getAttribute
<
VEC3
,
VERTEX
,
MAP
>
(
"position"
)
;
}
else
{
...
...
@@ -808,10 +808,9 @@ void Clipping::importMesh(std::string& filename)
return
;
}
else
position
=
myMap
.
getAttribute
<
PFP
::
VEC3
,
VERTEX
>
(
attrNames
[
0
])
;
position
=
myMap
.
getAttribute
<
VEC3
,
VERTEX
,
MAP
>
(
attrNames
[
0
])
;
}
updateVBOprimitives
(
Algo
::
Render
::
GL2
::
TRIANGLES
|
Algo
::
Render
::
GL2
::
LINES
|
Algo
::
Render
::
GL2
::
POINTS
)
;
m_render_topo
->
updateData
(
myMap
,
position
,
m_coeffTopoExplod
[
0
],
m_coeffTopoExplod
[
1
],
m_coeffTopoExplod
[
2
]);
...
...
@@ -1114,7 +1113,7 @@ int main(int argc, char** argv)
}
else
{
sqt
.
position
=
sqt
.
myMap
.
addAttribute
<
PFP
::
VEC3
,
VERTEX
>
(
"position"
);
sqt
.
position
=
sqt
.
myMap
.
addAttribute
<
VEC3
,
VERTEX
,
MAP
>
(
"position"
);
Algo
::
Volume
::
Tilings
::
Cubic
::
Grid
<
PFP
>
cubic
(
sqt
.
myMap
,
10
,
10
,
10
);
cubic
.
embedIntoGrid
(
sqt
.
position
,
1.0
f
,
1.0
f
,
1.0
f
);
...
...
Apps/Examples/clipping.h
View file @
4670bae0
...
...
@@ -71,7 +71,6 @@ struct PFP: public PFP_STANDARD
};
typedef
PFP
::
MAP
MAP
;
typedef
PFP
::
MAP
::
IMPL
MAP_IMPL
;
typedef
PFP
::
VEC3
VEC3
;
class
Clipping
:
public
Utils
::
QT
::
SimpleQT
...
...
@@ -81,7 +80,7 @@ class Clipping: public Utils::QT::SimpleQT
public:
//Manip Carte
MAP
myMap
;
VertexAttribute
<
VEC3
,
MAP
_IMPL
>
position
;
VertexAttribute
<
VEC3
,
MAP
>
position
;
Dart
dglobal
;
//Render
...
...
Apps/Examples/concave_rendering.cpp
View file @
4670bae0
...
...
@@ -128,13 +128,12 @@ struct PFP: public PFP_STANDARD
};
typedef
PFP
::
MAP
MAP
;
typedef
PFP
::
MAP
::
IMPL
MAP_IMPL
;
typedef
PFP
::
VEC3
VEC3
;
// declaration of the map
MAP
myMap
;
// and attribute of position
VertexAttribute
<
VEC3
,
MAP
_IMPL
>
position
;
VertexAttribute
<
VEC3
,
MAP
>
position
;
unsigned
int
nb_ears
;
...
...
@@ -245,7 +244,7 @@ void MyQT::cb_keyPress(int code)
int
main
(
int
argc
,
char
**
argv
)
{
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
>
(
"position"
);
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
,
MAP
>
(
"position"
);
Dart
d0
=
myMap
.
newFace
(
12
);
position
[
d0
]
=
PFP
::
VEC3
(
0
,
20
,
0
);
...
...
Apps/Examples/extrusionView.cpp
View file @
4670bae0
...
...
@@ -53,7 +53,6 @@ struct PFP: public PFP_STANDARD
};
typedef
PFP
::
MAP
MAP
;
typedef
PFP
::
MAP
::
IMPL
MAP_IMPL
;
typedef
PFP
::
VEC3
VEC3
;
MAP
myMap
;
...
...
@@ -104,7 +103,7 @@ int main(int argc, char **argv)
QApplication
app
(
argc
,
argv
);
MyQT
sqt
;
VertexAttribute
<
VEC3
,
MAP
_IMPL
>
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
>
(
"position"
)
;
VertexAttribute
<
VEC3
,
MAP
>
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
,
MAP
>
(
"position"
)
;
// define the face extruded (here a cross)
std
::
vector
<
PFP
::
VEC3
>
objV
;
...
...
@@ -134,7 +133,7 @@ int main(int argc, char **argv)
}
// extrusion
Algo
::
Surface
::
Modelisation
::
extrusion_scale
<
PFP
>
(
myMap
,
position
,
objV
,
PFP
::
VEC3
(
0.0
,
0.0
,
0.0
),
PFP
::
VEC3
(
0.0
,
1.0
,
0.0
),
true
,
pathV
,
false
,
pathRadius
);
Algo
::
Surface
::
Modelisation
::
extrusion_scale
<
PFP
>
(
myMap
,
position
,
objV
,
PFP
::
VEC3
(
0.0
,
0.0
,
0.0
),
PFP
::
VEC3
(
0.0
,
1.0
,
0.0
),
true
,
pathV
,
false
,
pathRadius
);
// bounding box
Geom
::
BoundingBox
<
PFP
::
VEC3
>
bb
=
Algo
::
Geometry
::
computeBoundingBox
<
PFP
>
(
myMap
,
position
);
...
...
Apps/Examples/mcmesh.cpp
View file @
4670bae0
...
...
@@ -138,9 +138,9 @@ void MCMesh::MC()
SAlgo
::
MC
::
WindowingGreater
<
DATATYPE
>
myWindFunc
;
myWindFunc
.
setIsoValue
(
DATATYPE
(
127
));
position
=
myMap
.
getAttribute
<
VEC3
,
VERTEX
>
(
"position"
);
position
=
myMap
.
getAttribute
<
VEC3
,
VERTEX
,
MAP
>
(
"position"
);
if
(
!
position
.
isValid
())
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
>
(
"position"
);
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
,
MAP
>
(
"position"
);
// instanciation du mc
SAlgo
::
MC
::
MarchingCube
<
DATATYPE
,
SAlgo
::
MC
::
WindowingGreater
,
PFP
>
mc
(
myImgFr
,
&
myMap
,
position
,
myWindFunc
,
false
);
...
...
Apps/Examples/mcmesh.h
View file @
4670bae0
...
...
@@ -54,7 +54,6 @@ struct PFP: public PFP_STANDARD
};
typedef
PFP
::
MAP
MAP
;
typedef
PFP
::
MAP
::
IMPL
MAP_IMPL
;
typedef
PFP
::
VEC3
VEC3
;
typedef
unsigned
char
DATATYPE
;
...
...
@@ -75,7 +74,7 @@ public:
bool
m_drawEdges
;
bool
m_drawFaces
;
VertexAttribute
<
VEC3
,
MAP
_IMPL
>
position
;
VertexAttribute
<
VEC3
,
MAP
>
position
;
Algo
::
Render
::
GL2
::
MapRender
*
m_render
;
...
...
Apps/Examples/simpleGMap2.cpp
View file @
4670bae0
...
...
@@ -30,7 +30,7 @@
SimpleGMap2
::
SimpleGMap2
()
{
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
>
(
"position"
);
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
,
MAP
>
(
"position"
);
Dart
d
=
Algo
::
Surface
::
Modelisation
::
createTetrahedron
<
PFP
>
(
myMap
);
position
[
d
]
=
VEC3
(
0
,
0
,
0
);
...
...
@@ -62,7 +62,7 @@ void SimpleGMap2::cb_initGL()
{
Utils
::
GLSLShader
::
setCurrentOGLVersion
(
1
)
;
Geom
::
BoundingBox
<
PFP
::
VEC3
>
bb
=
Algo
::
Geometry
::
computeBoundingBox
<
PFP
>
(
myMap
,
position
)
;
Geom
::
BoundingBox
<
VEC3
>
bb
=
Algo
::
Geometry
::
computeBoundingBox
<
PFP
>
(
myMap
,
position
)
;
VEC3
gPosObj
=
bb
.
center
()
;
float
tailleX
=
bb
.
size
(
0
)
;
float
tailleY
=
bb
.
size
(
1
)
;
...
...
Apps/Examples/simpleGMap2.h
View file @
4670bae0
...
...
@@ -42,7 +42,6 @@ struct PFP: public PFP_STANDARD
};
typedef
PFP
::
MAP
MAP
;
typedef
PFP
::
MAP
::
IMPL
MAP_IMPL
;
typedef
PFP
::
VEC3
VEC3
;
class
SimpleGMap2
:
public
Utils
::
QT
::
SimpleQT
...
...
@@ -52,7 +51,7 @@ class SimpleGMap2 : public Utils::QT::SimpleQT
public:
MAP
myMap
;
VertexAttribute
<
VEC3
,
MAP
_IMPL
>
position
;
VertexAttribute
<
VEC3
,
MAP
>
position
;
SimpleGMap2
()
;
...
...
@@ -61,4 +60,3 @@ public:
void
cb_initGL
()
;
void
cb_redraw
()
;
};
Apps/Examples/simpleGMap3.cpp
View file @
4670bae0
...
...
@@ -30,8 +30,8 @@
SimpleGMap3
::
SimpleGMap3
()
{
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
>
(
"position"
);
volume
=
myMap
.
addAttribute
<
VEC3
,
VOLUME
>
(
"volume"
);
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
,
MAP
>
(
"position"
);
volume
=
myMap
.
addAttribute
<
VEC3
,
VOLUME
,
MAP
>
(
"volume"
);
// CellMarker<EDGE> mE(myMap);
...
...
Apps/Examples/simpleGMap3.h
View file @
4670bae0
...
...
@@ -43,7 +43,6 @@ struct PFP: public PFP_STANDARD
};
typedef
PFP
::
MAP
MAP
;
typedef
PFP
::
MAP
::
IMPL
MAP_IMPL
;
typedef
PFP
::
VEC3
VEC3
;
class
SimpleGMap3
:
public
Utils
::
QT
::
SimpleQT
...
...
@@ -53,8 +52,8 @@ class SimpleGMap3 : public Utils::QT::SimpleQT
public:
MAP
myMap
;
VertexAttribute
<
VEC3
,
MAP
_IMPL
>
position
;
VolumeAttribute
<
VEC3
,
MAP
_IMPL
>
volume
;
VertexAttribute
<
VEC3
,
MAP
>
position
;
VolumeAttribute
<
VEC3
,
MAP
>
volume
;
Algo
::
Render
::
GL2
::
Topo3Render
<
PFP
>*
m_render_topo
;
...
...
Apps/Examples/simpleMap3.cpp
View file @
4670bae0
...
...
@@ -30,63 +30,62 @@
SimpleMap3
::
SimpleMap3
()
{
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
>
(
"position"
);
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
,
MAP
>
(
"position"
);
Algo
::
Volume
::
Tilings
::
Cubic
::
Grid
<
PFP
>
cubic
(
myMap
,
1
,
1
,
1
);
cubic
.
embedIntoGrid
(
position
,
1.0
f
,
1.0
f
,
1.0
f
);
myMap
.
check
();
Algo
::
Volume
::
Tilings
::
Cubic
::
Grid
<
PFP
>
cubic
(
myMap
,
1
,
1
,
1
);
cubic
.
embedIntoGrid
(
position
,
1.0
f
,
1.0
f
,
1.0
f
);
myMap
.
check
();
// Dart dp = Algo::Surface::Modelisation::createQuadrangularPyramid<PFP>(myMap);
// Dart dp = Algo::Surface::Modelisation::createQuadrangularPyramid<PFP>(myMap);
// position[dp] = typename PFP::VEC3(0.5,0.5,-0.5);
// position[myMap.phi1(dp)] = typename PFP::VEC3(0.5,0.5,0.5);
// position[myMap.phi1(myMap.phi1(dp))] = typename PFP::VEC3(0.5,-0.5,0.5);
// position[myMap.phi_1(dp)] = typename PFP::VEC3(0.5,-0.5,-0.5);
// position[myMap.phi_1(myMap.phi2(dp))] = typename PFP::VEC3(1.5f, 0.0f, 0.0f);
// position[dp] = typename PFP::VEC3(0.5,0.5,-0.5);
// position[myMap.phi1(dp)] = typename PFP::VEC3(0.5,0.5,0.5);
// position[myMap.phi1(myMap.phi1(dp))] = typename PFP::VEC3(0.5,-0.5,0.5);
// position[myMap.phi_1(dp)] = typename PFP::VEC3(0.5,-0.5,-0.5);
// position[myMap.phi_1(myMap.phi2(dp))] = typename PFP::VEC3(1.5f, 0.0f, 0.0f);
// Dart dtemp = myMap.phi_1(myMap.phi2(myMap.phi_1(myMap.phi_1(myMap.phi2(d)))));
// Dart dtemp = myMap.phi_1(myMap.phi2(myMap.phi_1(myMap.phi_1(myMap.phi2(d))))
);
// myMap.sewVolumes(dtemp,dp
);
// myMap.sewVolumes(dtemp,dp);
// Algo::Volume::Tilings::Cubic::Grid<PFP> cubic(myMap, 2, 1, 1);
// cubic.embedIntoGrid(position, 1.0f, 1.0f, 1.0f);
// myMap.check();
// Algo::Volume::Tilings::Cubic::Grid<PFP> cubic(myMap, 2, 1, 1)
;
// cubic.embedIntoGrid(position, 1.0f, 1.0f, 1.0f);
// myMap.check()
;
// unsigned int nb=0
;
// for(unsigned int i = position.begin(); i!=position.end(); position.next(i))
// nb++
;
// unsigned int nb=0;
// for(unsigned int i = position.begin(); i!=position.end(); position.next(i))
// nb++;
// std::cout << "Nb vertices (equals 12) : " << nb << std::endl;
// assert(nb==12);
// std::cout << "Nb vertices (equals 12) : " << nb << std::endl;
// assert(nb==12);
// d = myMap.phi2(myMap.phi1(myMap.phi1(myMap.phi2(d))));
// d = myMap.phi2(myMap.phi1(myMap.phi1(myMap.phi2(d)))
);
// Dart dd = myMap.phi3(d
);
// Dart dd = myMap.phi3
(d);
// myMap.unsewVolumes
(d);
// myMap.unsewVolumes(d
);
// myMap.check(
);
// myMap.check();
// nb=0;
// for(unsigned int i = position.begin(); i!=position.end(); position.next(i))
// nb++;
// nb=0;
// for(unsigned int i = position.begin(); i!=position.end(); position.next(i))
// nb++;
// std::cout << "Nb vertices after unsew (equals 16) : " << nb << std::endl;
// assert(nb==16);
// std::cout << "Nb vertices after unsew (equals 16) : " << nb << std::endl;
// assert(nb==16);
// myMap.sewVolumes(d,dd);
// myMap.sewVolumes(d,dd
);
// myMap.check(
);
// myMap.check();
// nb=0;
// for(unsigned int i = position.begin(); i!=position.end(); position.next(i))
// nb++;
// nb=0;
// for(unsigned int i = position.begin(); i!=position.end(); position.next(i))
// nb++;
// std::cout << "Nb vertices after resew (equals 12) : " << nb << std::endl;
// assert(nb==12);
// std::cout << "Nb vertices after resew (equals 12) : " << nb << std::endl;
// assert(nb==12);
}
...
...
@@ -117,46 +116,46 @@ void SimpleMap3::cb_initGL()
m_render_topo_boundary
->
updateDataBoundary
(
myMap
,
position
,
0.9
f
,
0.9
f
,
bb
.
maxSize
()
/
50.0
f
);
m_render_topo_primal
=
new
Algo
::
Render
::
GL2
::
Topo3PrimalRender
<
PFP
>
();
m_render_topo_primal
->
setDartWidth
(
2.0
f
);
m_render_topo_primal
->
setInitialDartsColor
(
1.0
f
,
1.0
f
,
1.0
f
);
m_render_topo_primal
->
setDartWidth
(
2.0
f
);
m_render_topo_primal
->
setInitialDartsColor
(
1.0
f
,
1.0
f
,
1.0
f
);
m_render_topo_primal
->
updateData
(
myMap
,
position
,
0.95
f
,
0.85
f
);
}
void
SimpleMap3
::
cb_keyPress
(
int
code
)
{
switch
(
code
)
{
case
'e'
:
{
time_t
rawtime
;
struct
tm
*
timeinfo
;
char
buffer
[
80
];
time
(
&
rawtime
);
timeinfo
=
localtime
(
&
rawtime
);
strftime
(
buffer
,
80
,
".%F.%H:%M:%S"
,
timeinfo
);
std
::
string
filename
=
std
::
string
(
"topo_screenshot"
)
+
std
::
string
(
buffer
)
+
std
::
string
(
".svg"
);
m_render_topo
->
svgout2D
(
filename
,
modelViewMatrix
(),
projectionMatrix
());
break
;
}
case
'E'
:
{
time_t
rawtime
;
struct
tm
*
timeinfo
;
char
buffer
[
80
];
time
(
&
rawtime
);
timeinfo
=
localtime
(
&
rawtime
);
strftime
(
buffer
,
80
,
".%F.%H:%M:%S"
,
timeinfo
);
std
::
string
filename
=
std
::
string
(
"topo_screenshot"
)
+
std
::
string
(
buffer
)
+
std
::
string
(
".svg"
);
m_render_topo_primal
->
svgout2D
(
filename
,
modelViewMatrix
(),
projectionMatrix
());
break
;
}
}
switch
(
code
)
{
case
'e'
:
{
time_t
rawtime
;
struct
tm
*
timeinfo
;
char
buffer
[
80
];
time
(
&
rawtime
);
timeinfo
=
localtime
(
&
rawtime
);
strftime
(
buffer
,
80
,
".%F.%H:%M:%S"
,
timeinfo
);
std
::
string
filename
=
std
::
string
(
"topo_screenshot"
)
+
std
::
string
(
buffer
)
+
std
::
string
(
".svg"
);
m_render_topo
->
svgout2D
(
filename
,
modelViewMatrix
(),
projectionMatrix
());
break
;
}
case
'E'
:
{
time_t
rawtime
;
struct
tm
*
timeinfo
;
char
buffer
[
80
];
time
(
&
rawtime
);
timeinfo
=
localtime
(
&
rawtime
);
strftime
(
buffer
,
80
,
".%F.%H:%M:%S"
,
timeinfo
);
std
::
string
filename
=
std
::
string
(
"topo_screenshot"
)
+
std
::
string
(
buffer
)
+
std
::
string
(
".svg"
);
m_render_topo_primal
->
svgout2D
(
filename
,
modelViewMatrix
(),
projectionMatrix
());
break
;
}
}
}
...
...
@@ -164,9 +163,9 @@ void SimpleMap3::cb_redraw()
{
glDisable
(
GL_LIGHTING
);
glLineWidth
(
1.0
f
);
m_render_topo
->
drawTopo
();
//m_render_topo_boundary->drawTopo();
//m_render_topo_primal->drawTopo();
m_render_topo
->
drawTopo
();
//m_render_topo_boundary->drawTopo();
//m_render_topo_primal->drawTopo();
}
/**********************************************************************************************
...
...
@@ -179,7 +178,7 @@ int main(int argc, char **argv)
SimpleMap3
sqt
;
sqt
.
setGeometry
(
0
,
0
,
1000
,
800
)
;
sqt
.
show
()
;
sqt
.
show
()
;
sqt
.
initGUI
()
;
...
...
Apps/Examples/simpleMap3.h
View file @
4670bae0
...
...
@@ -45,7 +45,6 @@ struct PFP: public PFP_STANDARD
};
typedef
PFP
::
MAP
MAP
;
typedef
PFP
::
MAP
::
IMPL
MAP_IMPL
;
typedef
PFP
::
VEC3
VEC3
;
class
SimpleMap3
:
public
Utils
::
QT
::
SimpleQT
...
...
@@ -56,7 +55,7 @@ public:
MAP
myMap
;
SelectorTrue
allDarts
;
VertexAttribute
<
VEC3
,
MAP
_IMPL
>
position
;
VertexAttribute
<
VEC3
,
MAP
>
position
;
Algo
::
Render
::
GL2
::
Topo3RenderMap
<
PFP
>*
m_render_topo
;
Algo
::
Render
::
GL2
::
TopoRenderMap
<
PFP
>*
m_render_topo_boundary
;
...
...
Apps/Examples/texturesExample.cpp
View file @
4670bae0
...
...
@@ -89,9 +89,9 @@ void TexView::cb_initGL()
if
(
!
m_obj
.
hasNormals
())
{
VertexAttribute
<
Geom
::
Vec3f
,
MAP
_IMPL
>
normal
=
myMap
.
getAttribute
<
VEC3
,
VERTEX
>
(
"normal"
)
;
VertexAttribute
<
Geom
::
Vec3f
,
MAP
>
normal
=
myMap
.
getAttribute
<
VEC3
,
VERTEX
,
MAP
>
(
"normal"
)
;
if
(
!
normal
.
isValid
())
normal
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
>
(
"normal"
)
;
normal
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
,
MAP
>
(
"normal"
)
;
Algo
::
Surface
::
Geometry
::
computeNormalVertices
<
PFP
>
(
myMap
,
m_obj
.
m_positions
,
normal
)
;
m_obj
.
setNormalAttribute
(
normal
);
...
...
@@ -206,8 +206,8 @@ void TexView::computeTore()
{
#define NB 96
VertexAttribute
<
VEC3
,
MAP
_IMPL
>
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
>
(
"position"
);
VertexAttribute
<
Geom
::
Vec2f
,
MAP
_IMPL
>
texcoord
=
myMap
.
addAttribute
<
Geom
::
Vec2f
,
VERTEX
>
(
"texcoord"
);
VertexAttribute
<
VEC3
,
MAP
>
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
,
MAP
>
(
"position"
);
VertexAttribute
<
Geom
::
Vec2f
,
MAP
>
texcoord
=
myMap
.
addAttribute
<
Geom
::
Vec2f
,
VERTEX
,
MAP
>
(
"texcoord"
);
//Algo::Surface::Modelisation::Polyhedron<PFP> prim(myMap, position);
Algo
::
Surface
::
Tilings
::
Square
::
Tore
<
PFP
>
prim
(
myMap
,
NB
,
NB
);
prim
.
embedIntoTore
(
position
,
40.0
f
,
20.0
f
);
...
...
Apps/Examples/texturesExample.h
View file @
4670bae0
...
...
@@ -50,7 +50,6 @@ struct PFP: public PFP_STANDARD
};
typedef
PFP
::
MAP
MAP
;
typedef
PFP
::
MAP
::
IMPL
MAP_IMPL
;
typedef
PFP
::
VEC3
VEC3
;
/**
...
...
Apps/Examples/viewer.cpp
View file @
4670bae0
This diff is collapsed.
Click to expand it.
Apps/Examples/viewer.h
View file @
4670bae0
...
...
@@ -64,7 +64,6 @@ struct PFP: public PFP_STANDARD
};
typedef
PFP
::
MAP
MAP
;
typedef
PFP
::
MAP
::
IMPL
MAP_IMPL
;
typedef
PFP
::
VEC3
VEC3
;
//class Viewer : public Utils::QT::SimpleQT
...
...
@@ -101,8 +100,8 @@ public:
bool
m_drawTopo
;
bool
m_drawBoundaryTopo
;
VertexAttribute
<
VEC3
,
MAP
_IMPL
>
position
;
VertexAttribute
<
VEC3
,
MAP
_IMPL
>
normal
;
VertexAttribute
<
VEC3
,
MAP
>
position
;
VertexAttribute
<
VEC3
,
MAP
>
normal
;
Algo
::
Render
::
GL2
::
MapRender
*
m_render
;
Algo
::
Render
::
GL2
::
TopoRenderMap
<
PFP
>*
m_topoRender
;
...
...
Apps/Examples/viewerOBJ.cpp
View file @
4670bae0
...
...
@@ -313,22 +313,18 @@ void ObjView::cb_redraw()
void
ObjView
::
init
(
const
std
::
string
&
fnm
)
{
std
::
vector
<
std
::
string
>
attrNames
;
m_obj
.
import
(
fnm
,
attrNames
);
Geom
::
BoundingBox
<
PFP
::
VEC3
>
bb
=
Algo
::
Geometry
::
computeBoundingBox
<
PFP
>
(
myMap
,
m_obj
.
m_positions
);
float
lWidthObj
=
std
::
max
<
PFP
::
REAL
>
(
std
::
max
<
PFP
::
REAL
>
(
bb
.
size
(
0
),
bb
.
size
(
1
)),
bb
.
size
(
2
));
Geom
::
Vec3f
lPosObj
=
(
bb
.
min
()
+
bb
.
max
())
/
PFP
::
REAL
(
2
);
// send BB info to interface for centering on GL screen
setParamObject
(
lWidthObj
,
lPosObj
.
data
());
}
int
main
(
int
argc
,
char
**
argv
)
{
// interface:
...
...
Apps/Examples/viewerOBJ.h
View file @
4670bae0
...
...
@@ -69,14 +69,13 @@ public:
Utils
::
Drawer
*
m_dr
;
unsigned
int
m_currentGroupDrawn
;
void
drawBB
(
const
Geom
::
BoundingBox
<
VEC3
>&
bb
);
void
drawBB
(
const
Geom
::
BoundingBox
<
VEC3
>&
bb
);
// VBO
Utils
::
VBO
*
m_positionVBO
;
Utils
::
VBO
*
m_normalVBO
;
Utils
::
VBO
*
m_texcoordVBO
;
// shader simple texture
Utils
::
ShaderSimpleTexture
*
m_shader
;
Utils
::
ShaderPhongTexture
*
m_shader2
;
...
...
@@ -96,8 +95,6 @@ public:
void
cb_initGL
();
void
cb_keyPress
(
int
k
);
};
#endif
Apps/Examples/volumeExplorer.cpp
View file @
4670bae0
...
...
@@ -36,8 +36,8 @@
#include "Algo/Export/exportVol.h"
MAP
myMap
;
VertexAttribute
<
VEC3
,
MAP
_IMPL
>
position
;
VolumeAttribute
<
VEC3
,
MAP
_IMPL
>
color
;
VertexAttribute
<
VEC3
,
MAP
>
position
;
VolumeAttribute
<
VEC3
,
MAP
>
color
;
void
MyQT
::
volumes_onoff
(
bool
/*x*/
)
{
...
...
@@ -56,7 +56,7 @@ void MyQT::topo_onoff(bool /*x*/)
render_topo
=
!
render_topo
;
if
(
render_topo
)
{
// SelectorDartNoBoundary<
PFP::
MAP> nb(myMap);
// SelectorDartNoBoundary<MAP> nb(myMap);
//TODO MapBrowser
m_topo_render
->
updateData
(
myMap
,
position
,
0.8
f
,
m_explode_factorf
-
0.05
f
,
m_explode_factor
);
}
...
...
@@ -121,7 +121,7 @@ void MyQT::slider_released()
render_topo
=
render_topoTemp
;
if
(
render_topo
)
{
// SelectorDartNoBoundary<
PFP::
MAP> nb(myMap);
// SelectorDartNoBoundary<MAP> nb(myMap);