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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Pitiot
CGoGN
Commits
d19ee728
Commit
d19ee728
authored
Apr 03, 2014
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Plain Diff
Merge cgogn:~kraemer/CGoGN
Conflicts: include/Algo/Modelisation/planeCutting.hpp include/Topology/generic/genericmap.hpp
parents
bf64b2f8
f1dab8f5
Changes
306
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
306 changed files
with
15466 additions
and
16935 deletions
+15466
-16935
Apps/Examples/Debug/CMakeLists.txt
Apps/Examples/Debug/CMakeLists.txt
+7
-9
Apps/Examples/Release/CMakeLists.txt
Apps/Examples/Release/CMakeLists.txt
+9
-6
Apps/Examples/clipping.cpp
Apps/Examples/clipping.cpp
+5
-5
Apps/Examples/clipping.h
Apps/Examples/clipping.h
+5
-5
Apps/Examples/concave_rendering.cpp
Apps/Examples/concave_rendering.cpp
+2
-1
Apps/Examples/extrusionView.cpp
Apps/Examples/extrusionView.cpp
+2
-1
Apps/Examples/mcmesh.cpp
Apps/Examples/mcmesh.cpp
+1
-2
Apps/Examples/mcmesh.h
Apps/Examples/mcmesh.h
+4
-5
Apps/Examples/simpleGMap2.h
Apps/Examples/simpleGMap2.h
+2
-1
Apps/Examples/simpleGMap3.cpp
Apps/Examples/simpleGMap3.cpp
+2
-2
Apps/Examples/simpleGMap3.h
Apps/Examples/simpleGMap3.h
+4
-3
Apps/Examples/simpleMap3.cpp
Apps/Examples/simpleMap3.cpp
+6
-6
Apps/Examples/simpleMap3.h
Apps/Examples/simpleMap3.h
+5
-5
Apps/Examples/texturesExample.cpp
Apps/Examples/texturesExample.cpp
+3
-15
Apps/Examples/texturesExample.h
Apps/Examples/texturesExample.h
+2
-0
Apps/Examples/viewer.cpp
Apps/Examples/viewer.cpp
+3
-3
Apps/Examples/viewer.h
Apps/Examples/viewer.h
+4
-3
Apps/Examples/volumeExplorer.cpp
Apps/Examples/volumeExplorer.cpp
+8
-16
Apps/Examples/volumeExplorer.h
Apps/Examples/volumeExplorer.h
+5
-15
Apps/SandBox/multi_att.cpp
Apps/SandBox/multi_att.cpp
+17
-20
Apps/SandBox/testPlaneCutting.cpp
Apps/SandBox/testPlaneCutting.cpp
+8
-13
Apps/SandBox/testPlaneCutting.h
Apps/SandBox/testPlaneCutting.h
+4
-3
Apps/SandBox/test_traversor2.cpp
Apps/SandBox/test_traversor2.cpp
+19
-25
Apps/SandBox/test_traversor2.h
Apps/SandBox/test_traversor2.h
+17
-7
Apps/SandBox/tilings.cpp
Apps/SandBox/tilings.cpp
+7
-8
Apps/SandBox/tilings.h
Apps/SandBox/tilings.h
+0
-7
Apps/Tuto/show_traversors.cpp
Apps/Tuto/show_traversors.cpp
+9
-18
Apps/Tuto/show_traversors.h
Apps/Tuto/show_traversors.h
+4
-16
Apps/Tuto/tuto1.cpp
Apps/Tuto/tuto1.cpp
+2
-2
Apps/Tuto/tuto1.h
Apps/Tuto/tuto1.h
+5
-13
Apps/Tuto/tuto2.cpp
Apps/Tuto/tuto2.cpp
+4
-5
Apps/Tuto/tuto2.h
Apps/Tuto/tuto2.h
+1
-2
Apps/Tuto/tuto3.cpp
Apps/Tuto/tuto3.cpp
+9
-13
Apps/Tuto/tuto3.h
Apps/Tuto/tuto3.h
+6
-17
Apps/Tuto/tuto4.cpp
Apps/Tuto/tuto4.cpp
+3
-4
Apps/Tuto/tuto4.h
Apps/Tuto/tuto4.h
+4
-4
Apps/Tuto/tuto5.cpp
Apps/Tuto/tuto5.cpp
+7
-7
Apps/Tuto/tuto5.h
Apps/Tuto/tuto5.h
+3
-17
Apps/Tuto/tuto_dual2.cpp
Apps/Tuto/tuto_dual2.cpp
+8
-5
Apps/Tuto/tuto_dual3.cpp
Apps/Tuto/tuto_dual3.cpp
+19
-16
Apps/Tuto/tuto_histo.cpp
Apps/Tuto/tuto_histo.cpp
+12
-16
Apps/Tuto/tuto_histo.h
Apps/Tuto/tuto_histo.h
+17
-16
Apps/Tuto/tuto_mt.cpp
Apps/Tuto/tuto_mt.cpp
+50
-43
Apps/Tuto/tuto_oper2.cpp
Apps/Tuto/tuto_oper2.cpp
+15
-21
Apps/Tuto/tuto_oper2.h
Apps/Tuto/tuto_oper2.h
+19
-23
Apps/Tuto/tuto_oper3.cpp
Apps/Tuto/tuto_oper3.cpp
+21
-23
Apps/Tuto/tuto_oper3.h
Apps/Tuto/tuto_oper3.h
+25
-28
Apps/Tuto/tuto_orbits.cpp
Apps/Tuto/tuto_orbits.cpp
+44
-55
Apps/Tuto/tuto_orbits.h
Apps/Tuto/tuto_orbits.h
+5
-17
Apps/Tuto/tuto_subdivision.cpp
Apps/Tuto/tuto_subdivision.cpp
+6
-2
SCHNApps/CMakeLists.txt
SCHNApps/CMakeLists.txt
+7
-0
SCHNApps/Plugins/surface_deformation/include/surface_deformation.h
...Plugins/surface_deformation/include/surface_deformation.h
+8
-8
SCHNApps/Plugins/surface_deformation/src/surface_deformation.cpp
...s/Plugins/surface_deformation/src/surface_deformation.cpp
+11
-6
SCHNApps/Plugins/surface_deformation/src/surface_deformation_dockTab.cpp
...s/surface_deformation/src/surface_deformation_dockTab.cpp
+12
-3
SCHNApps/Plugins/surface_differentialProperties/src/surface_differentialProperties.cpp
...erentialProperties/src/surface_differentialProperties.cpp
+12
-12
SCHNApps/Plugins/surface_import/src/surface_import.cpp
SCHNApps/Plugins/surface_import/src/surface_import.cpp
+1
-1
SCHNApps/Plugins/surface_modelisation/include/surface_modelisation.h
...ugins/surface_modelisation/include/surface_modelisation.h
+4
-4
SCHNApps/Plugins/surface_modelisation/src/surface_modelisation.cpp
...Plugins/surface_modelisation/src/surface_modelisation.cpp
+17
-15
SCHNApps/Plugins/surface_modelisation/src/surface_modelisation_dockTab.cpp
...surface_modelisation/src/surface_modelisation_dockTab.cpp
+16
-4
SCHNApps/Plugins/surface_renderScalar/src/surface_renderScalar.cpp
...Plugins/surface_renderScalar/src/surface_renderScalar.cpp
+4
-2
SCHNApps/Plugins/surface_renderScalar/src/surface_renderScalar_dockTab.cpp
...surface_renderScalar/src/surface_renderScalar_dockTab.cpp
+2
-1
SCHNApps/Plugins/surface_renderTopo/include/surface_renderTopo.h
...s/Plugins/surface_renderTopo/include/surface_renderTopo.h
+1
-1
SCHNApps/Plugins/surface_renderTopo/src/surface_renderTopo_dockTab.cpp
...ins/surface_renderTopo/src/surface_renderTopo_dockTab.cpp
+4
-4
SCHNApps/Plugins/surface_selection/include/surface_selection.h
...pps/Plugins/surface_selection/include/surface_selection.h
+2
-2
SCHNApps/Plugins/surface_selection/src/surface_selection.cpp
SCHNApps/Plugins/surface_selection/src/surface_selection.cpp
+4
-2
SCHNApps/Plugins/surface_selection/src/surface_selection_dockTab.cpp
...ugins/surface_selection/src/surface_selection_dockTab.cpp
+8
-2
SCHNApps/Plugins/surface_subdivision/src/surface_subdivision.cpp
...s/Plugins/surface_subdivision/src/surface_subdivision.cpp
+3
-3
SCHNApps/Plugins/volume_import/src/volume_import.cpp
SCHNApps/Plugins/volume_import/src/volume_import.cpp
+1
-1
SCHNApps/include/camera.h
SCHNApps/include/camera.h
+2
-1
SCHNApps/include/cellSelector.h
SCHNApps/include/cellSelector.h
+8
-8
SCHNApps/include/mapHandler.h
SCHNApps/include/mapHandler.h
+30
-15
SCHNApps/include/mapHandler.hpp
SCHNApps/include/mapHandler.hpp
+67
-35
SCHNApps/include/view.h
SCHNApps/include/view.h
+1
-0
SCHNApps/src/controlDock_mapTab.cpp
SCHNApps/src/controlDock_mapTab.cpp
+4
-4
SCHNApps/src/mapHandler.cpp
SCHNApps/src/mapHandler.cpp
+2
-29
include/Algo/BooleanOperator/mergeVertices.h
include/Algo/BooleanOperator/mergeVertices.h
+3
-3
include/Algo/BooleanOperator/mergeVertices.hpp
include/Algo/BooleanOperator/mergeVertices.hpp
+5
-5
include/Algo/Decimation/approximator.h
include/Algo/Decimation/approximator.h
+7
-9
include/Algo/Decimation/approximator.hpp
include/Algo/Decimation/approximator.hpp
+7
-7
include/Algo/Decimation/colorPerVertexApproximator.h
include/Algo/Decimation/colorPerVertexApproximator.h
+18
-15
include/Algo/Decimation/decimation.h
include/Algo/Decimation/decimation.h
+9
-9
include/Algo/Decimation/decimation.hpp
include/Algo/Decimation/decimation.hpp
+8
-7
include/Algo/Decimation/edgeSelector.h
include/Algo/Decimation/edgeSelector.h
+70
-58
include/Algo/Decimation/edgeSelector.hpp
include/Algo/Decimation/edgeSelector.hpp
+132
-113
include/Algo/Decimation/geometryApproximator.h
include/Algo/Decimation/geometryApproximator.h
+18
-13
include/Algo/Decimation/geometryPredictor.h
include/Algo/Decimation/geometryPredictor.h
+12
-8
include/Algo/Decimation/geometryPredictor.hpp
include/Algo/Decimation/geometryPredictor.hpp
+4
-4
include/Algo/Decimation/halfEdgeSelector.h
include/Algo/Decimation/halfEdgeSelector.h
+30
-29
include/Algo/Decimation/halfEdgeSelector.hpp
include/Algo/Decimation/halfEdgeSelector.hpp
+9
-8
include/Algo/Decimation/predictor.h
include/Algo/Decimation/predictor.h
+8
-6
include/Algo/Decimation/selector.h
include/Algo/Decimation/selector.h
+4
-3
include/Algo/Export/export.h
include/Algo/Export/export.h
+7
-7
include/Algo/Export/export.hpp
include/Algo/Export/export.hpp
+16
-17
include/Algo/Export/exportVol.h
include/Algo/Export/exportVol.h
+9
-9
include/Algo/Export/exportVol.hpp
include/Algo/Export/exportVol.hpp
+24
-38
include/Algo/Filtering/average.h
include/Algo/Filtering/average.h
+16
-16
include/Algo/Filtering/average_normals.h
include/Algo/Filtering/average_normals.h
+36
-32
include/Algo/Filtering/bilateral.h
include/Algo/Filtering/bilateral.h
+3
-3
include/Algo/Filtering/functors.h
include/Algo/Filtering/functors.h
+10
-7
include/Algo/Filtering/taubin.h
include/Algo/Filtering/taubin.h
+10
-7
include/Algo/Filtering/tools.h
include/Algo/Filtering/tools.h
+6
-6
include/Algo/Geometry/area.h
include/Algo/Geometry/area.h
+10
-10
include/Algo/Geometry/area.hpp
include/Algo/Geometry/area.hpp
+27
-33
include/Algo/Geometry/basic.h
include/Algo/Geometry/basic.h
+4
-4
include/Algo/Geometry/boundingbox.h
include/Algo/Geometry/boundingbox.h
+1
-1
include/Algo/Geometry/centroid.h
include/Algo/Geometry/centroid.h
+16
-16
include/Algo/Geometry/centroid.hpp
include/Algo/Geometry/centroid.hpp
+17
-40
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
+111
-99
include/Algo/Geometry/curvature.hpp
include/Algo/Geometry/curvature.hpp
+148
-137
include/Algo/Geometry/distances.h
include/Algo/Geometry/distances.h
+4
-4
include/Algo/Geometry/distances.hpp
include/Algo/Geometry/distances.hpp
+4
-11
include/Algo/Geometry/feature.h
include/Algo/Geometry/feature.h
+48
-42
include/Algo/Geometry/feature.hpp
include/Algo/Geometry/feature.hpp
+50
-45
include/Algo/Geometry/inclusion.h
include/Algo/Geometry/inclusion.h
+10
-10
include/Algo/Geometry/inclusion.hpp
include/Algo/Geometry/inclusion.hpp
+12
-12
include/Algo/Geometry/intersection.h
include/Algo/Geometry/intersection.h
+4
-4
include/Algo/Geometry/intersection.hpp
include/Algo/Geometry/intersection.hpp
+11
-9
include/Algo/Geometry/laplacian.h
include/Algo/Geometry/laplacian.h
+21
-19
include/Algo/Geometry/laplacian.hpp
include/Algo/Geometry/laplacian.hpp
+39
-31
include/Algo/Geometry/localFrame.h
include/Algo/Geometry/localFrame.h
+4
-4
include/Algo/Geometry/normal.h
include/Algo/Geometry/normal.h
+1
-4
include/Algo/Geometry/normal.hpp
include/Algo/Geometry/normal.hpp
+1
-3
include/Algo/Geometry/normalization.h
include/Algo/Geometry/normalization.h
+3
-3
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
+2
-2
include/Algo/Geometry/volume.h
include/Algo/Geometry/volume.h
+6
-6
include/Algo/Geometry/volume.hpp
include/Algo/Geometry/volume.hpp
+30
-27
include/Algo/Geometry/voronoiDiagrams.h
include/Algo/Geometry/voronoiDiagrams.h
+38
-31
include/Algo/Geometry/voronoiDiagrams.hpp
include/Algo/Geometry/voronoiDiagrams.hpp
+64
-37
include/Algo/Histogram/histogram.h
include/Algo/Histogram/histogram.h
+177
-184
include/Algo/Histogram/histogram.hpp
include/Algo/Histogram/histogram.hpp
+4
-29
include/Algo/ImplicitHierarchicalMesh/ihm3.h
include/Algo/ImplicitHierarchicalMesh/ihm3.h
+19
-18
include/Algo/ImplicitHierarchicalMesh/ihm3.hpp
include/Algo/ImplicitHierarchicalMesh/ihm3.hpp
+6
-7
include/Algo/Import/import.hpp
include/Algo/Import/import.hpp
+38
-24
include/Algo/Import/import2tables.h
include/Algo/Import/import2tables.h
+11
-5
include/Algo/Import/import2tablesSurface.hpp
include/Algo/Import/import2tablesSurface.hpp
+55
-64
include/Algo/Import/import2tablesVolume.hpp
include/Algo/Import/import2tablesVolume.hpp
+7
-8
include/Algo/Import/importMRDAT.hpp
include/Algo/Import/importMRDAT.hpp
+4
-4
include/Algo/Import/importMSH.hpp
include/Algo/Import/importMSH.hpp
+6
-11
include/Algo/Import/importNAS.hpp
include/Algo/Import/importNAS.hpp
+19
-28
include/Algo/Import/importObjTex.h
include/Algo/Import/importObjTex.h
+33
-37
include/Algo/Import/importObjTex.hpp
include/Algo/Import/importObjTex.hpp
+25
-106
include/Algo/Import/importVBGZ.hpp
include/Algo/Import/importVBGZ.hpp
+9
-12
include/Algo/Import/importVTU.hpp
include/Algo/Import/importVTU.hpp
+13
-19
include/Algo/LinearSolving/basic.h
include/Algo/LinearSolving/basic.h
+40
-40
include/Algo/LinearSolving/matrixSetup.h
include/Algo/LinearSolving/matrixSetup.h
+90
-76
include/Algo/LinearSolving/variablesSetup.h
include/Algo/LinearSolving/variablesSetup.h
+32
-20
include/Algo/MC/marchingcube.h
include/Algo/MC/marchingcube.h
+8
-8
include/Algo/MC/marchingcube.hpp
include/Algo/MC/marchingcube.hpp
+60
-65
include/Algo/Modelisation/boundEmb.h
include/Algo/Modelisation/boundEmb.h
+6
-3
include/Algo/Modelisation/extrusion.h
include/Algo/Modelisation/extrusion.h
+33
-12
include/Algo/Modelisation/extrusion.hpp
include/Algo/Modelisation/extrusion.hpp
+93
-55
include/Algo/Modelisation/planeCutting.h
include/Algo/Modelisation/planeCutting.h
+23
-6
include/Algo/Modelisation/planeCutting.hpp
include/Algo/Modelisation/planeCutting.hpp
+58
-40
include/Algo/Modelisation/polyhedron.h
include/Algo/Modelisation/polyhedron.h
+3
-3
include/Algo/Modelisation/polyhedron.hpp
include/Algo/Modelisation/polyhedron.hpp
+44
-56
include/Algo/Modelisation/subdivision.h
include/Algo/Modelisation/subdivision.h
+7
-9
include/Algo/Modelisation/subdivision.hpp
include/Algo/Modelisation/subdivision.hpp
+91
-72
include/Algo/Modelisation/subdivision3.h
include/Algo/Modelisation/subdivision3.h
+6
-10
include/Algo/Modelisation/subdivision3.hpp
include/Algo/Modelisation/subdivision3.hpp
+79
-59
include/Algo/Modelisation/tetrahedralization.h
include/Algo/Modelisation/tetrahedralization.h
+1
-6
include/Algo/Modelisation/tetrahedralization.hpp
include/Algo/Modelisation/tetrahedralization.hpp
+6
-48
include/Algo/Modelisation/triangulation.h
include/Algo/Modelisation/triangulation.h
+5
-4
include/Algo/Modelisation/triangulation.hpp
include/Algo/Modelisation/triangulation.hpp
+23
-19
include/Algo/Modelisation/voxellisation.h
include/Algo/Modelisation/voxellisation.h
+479
-463
include/Algo/MovingObjects/particle_base.h
include/Algo/MovingObjects/particle_base.h
+0
-2
include/Algo/MovingObjects/particle_cell_2D.h
include/Algo/MovingObjects/particle_cell_2D.h
+10
-6
include/Algo/MovingObjects/particle_cell_2D.hpp
include/Algo/MovingObjects/particle_cell_2D.hpp
+10
-5
include/Algo/MovingObjects/particle_cell_2D_memo.h
include/Algo/MovingObjects/particle_cell_2D_memo.h
+21
-14
include/Algo/MovingObjects/particle_cell_2D_memo.hpp
include/Algo/MovingObjects/particle_cell_2D_memo.hpp
+12
-9
include/Algo/MovingObjects/particle_cell_2D_secured.h
include/Algo/MovingObjects/particle_cell_2D_secured.h
+19
-16
include/Algo/MovingObjects/particle_cell_2D_secured.hpp
include/Algo/MovingObjects/particle_cell_2D_secured.hpp
+11
-7
include/Algo/MovingObjects/particle_cell_2DandHalf.h
include/Algo/MovingObjects/particle_cell_2DandHalf.h
+17
-8
include/Algo/MovingObjects/particle_cell_2DandHalf_memo.h
include/Algo/MovingObjects/particle_cell_2DandHalf_memo.h
+19
-16
include/Algo/MovingObjects/particle_cell_2DandHalf_memo.hpp
include/Algo/MovingObjects/particle_cell_2DandHalf_memo.hpp
+12
-10
include/Algo/MovingObjects/particle_cell_3D.h
include/Algo/MovingObjects/particle_cell_3D.h
+19
-16
include/Algo/MovingObjects/particle_cell_3D.hpp
include/Algo/MovingObjects/particle_cell_3D.hpp
+24
-27
include/Algo/Multiresolution/Map2MR/Filters/Dual/catmullClark.h
...e/Algo/Multiresolution/Map2MR/Filters/Dual/catmullClark.h
+15
-12
include/Algo/Multiresolution/Map2MR/Filters/Dual/dooSabin.h
include/Algo/Multiresolution/Map2MR/Filters/Dual/dooSabin.h
+11
-8
include/Algo/Multiresolution/Map2MR/Filters/bertram.h
include/Algo/Multiresolution/Map2MR/Filters/bertram.h
+78
-58
include/Algo/Multiresolution/Map2MR/Filters/catmullClark.h
include/Algo/Multiresolution/Map2MR/Filters/catmullClark.h
+98
-59
include/Algo/Multiresolution/Map2MR/Filters/lerp.h
include/Algo/Multiresolution/Map2MR/Filters/lerp.h
+52
-36
include/Algo/Multiresolution/Map2MR/Filters/loop.h
include/Algo/Multiresolution/Map2MR/Filters/loop.h
+60
-30
include/Algo/Multiresolution/Map2MR/Filters/sqrt2.h
include/Algo/Multiresolution/Map2MR/Filters/sqrt2.h
+9
-8
include/Algo/Multiresolution/Map2MR/Filters/sqrt3.h
include/Algo/Multiresolution/Map2MR/Filters/sqrt3.h
+50
-34
include/Algo/Multiresolution/Map2MR/map2MR_PrimalRegular.hpp
include/Algo/Multiresolution/Map2MR/map2MR_PrimalRegular.hpp
+6
-8
include/Algo/Multiresolution/filter.h
include/Algo/Multiresolution/filter.h
+4
-11
include/Algo/Parallel/parallel_foreach.h
include/Algo/Parallel/parallel_foreach.h
+1
-11
include/Algo/Parallel/parallel_foreach.hpp
include/Algo/Parallel/parallel_foreach.hpp
+11
-32
include/Algo/ProgressiveMesh/pmesh.h
include/Algo/ProgressiveMesh/pmesh.h
+8
-5
include/Algo/ProgressiveMesh/pmesh.hpp
include/Algo/ProgressiveMesh/pmesh.hpp
+27
-20
include/Algo/Remeshing/pliant.h
include/Algo/Remeshing/pliant.h
+5
-2
include/Algo/Remeshing/pliant.hpp
include/Algo/Remeshing/pliant.hpp
+24
-19
include/Algo/Render/GL1/topo_render.h
include/Algo/Render/GL1/topo_render.h
+4
-5
include/Algo/Render/GL1/topo_render.hpp
include/Algo/Render/GL1/topo_render.hpp
+37
-30
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.h
include/Algo/Render/GL2/explodeVolumeRender.h
+0
-1
include/Algo/Render/GL2/explodeVolumeRender.hpp
include/Algo/Render/GL2/explodeVolumeRender.hpp
+16
-11
include/Algo/Render/GL2/mapRender.h
include/Algo/Render/GL2/mapRender.h
+7
-8
include/Algo/Render/GL2/mapRender.hpp
include/Algo/Render/GL2/mapRender.hpp
+43
-39
include/Algo/Render/GL2/topo3PrimalRender.h
include/Algo/Render/GL2/topo3PrimalRender.h
+19
-34
include/Algo/Render/GL2/topo3PrimalRender.hpp
include/Algo/Render/GL2/topo3PrimalRender.hpp
+353
-57
include/Algo/Render/GL2/topo3Render.h
include/Algo/Render/GL2/topo3Render.h
+59
-54
include/Algo/Render/GL2/topo3Render.hpp
include/Algo/Render/GL2/topo3Render.hpp
+629
-226
include/Algo/Render/GL2/topoPrimalRender.h
include/Algo/Render/GL2/topoPrimalRender.h
+22
-33
include/Algo/Render/GL2/topoPrimalRender.hpp
include/Algo/Render/GL2/topoPrimalRender.hpp
+340
-44
include/Algo/Render/GL2/topoRender.h
include/Algo/Render/GL2/topoRender.h
+40
-30
include/Algo/Render/GL2/topoRender.hpp
include/Algo/Render/GL2/topoRender.hpp
+504
-140
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
+143
-97
include/Algo/Selection/collector.hpp
include/Algo/Selection/collector.hpp
+83
-131
include/Algo/Selection/raySelectFunctor.hpp
include/Algo/Selection/raySelectFunctor.hpp
+56
-49
include/Algo/Selection/raySelector.h
include/Algo/Selection/raySelector.h
+71
-37
include/Algo/Selection/raySelector.hpp
include/Algo/Selection/raySelector.hpp
+18
-18
include/Algo/Tiling/Surface/hexagonal.h
include/Algo/Tiling/Surface/hexagonal.h
+8
-8
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
+18
-14
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
+8
-7
include/Algo/Tiling/Surface/triangular.hpp
include/Algo/Tiling/Surface/triangular.hpp
+1
-1
include/Algo/Tiling/Volume/cubic.h
include/Algo/Tiling/Volume/cubic.h
+6
-11
include/Algo/Tiling/Volume/cubic.hpp
include/Algo/Tiling/Volume/cubic.hpp
+3
-5
include/Algo/Tiling/tiling.h
include/Algo/Tiling/tiling.h
+9
-10
include/Algo/Tiling/tiling.hpp
include/Algo/Tiling/tiling.hpp
+9
-12
include/Algo/Topo/Map2/uniformOrientation.hpp
include/Algo/Topo/Map2/uniformOrientation.hpp
+1
-1
include/Container/containerBrowser.h
include/Container/containerBrowser.h
+9
-6
include/Container/containerBrowser.hpp
include/Container/containerBrowser.hpp
+96
-98
include/Geometry/vector_gen.h
include/Geometry/vector_gen.h
+3
-3
include/Geometry/vector_gen.hpp
include/Geometry/vector_gen.hpp
+2
-2
include/Topology/generic/attributeHandler.h
include/Topology/generic/attributeHandler.h
+58
-56
include/Topology/generic/attributeHandler.hpp
include/Topology/generic/attributeHandler.hpp
+74
-71
include/Topology/generic/autoAttributeHandler.h
include/Topology/generic/autoAttributeHandler.h
+30
-33
include/Topology/generic/cellmarker.h
include/Topology/generic/cellmarker.h
+117
-83
include/Topology/generic/dartmarker.h
include/Topology/generic/dartmarker.h
+137
-149
include/Topology/generic/ecell.h
include/Topology/generic/ecell.h
+0
-185
include/Topology/generic/ecell.hpp
include/Topology/generic/ecell.hpp
+0
-160
include/Topology/generic/genericFunc.h
include/Topology/generic/genericFunc.h
+0
-114
include/Topology/generic/genericFunc.hpp
include/Topology/generic/genericFunc.hpp
+0
-108
include/Topology/generic/genericmap.h
include/Topology/generic/genericmap.h
+64
-539
include/Topology/generic/genericmap.hpp
include/Topology/generic/genericmap.hpp
+13
-877
include/Topology/generic/mapCommon.h
include/Topology/generic/mapCommon.h
+316
-0
include/Topology/generic/mapCommon.hpp
include/Topology/generic/mapCommon.hpp
+618
-0
include/Topology/generic/mapMono.h
include/Topology/generic/mapMono.h
+150
-0
include/Topology/generic/mapMono.hpp
include/Topology/generic/mapMono.hpp
+241
-0
include/Topology/generic/mapMulti.h
include/Topology/generic/mapMulti.h
+304
-0
include/Topology/generic/mapMulti.hpp
include/Topology/generic/mapMulti.hpp
+449
-0
include/Topology/generic/multiAttribs.h
include/Topology/generic/multiAttribs.h
+16
-34
include/Topology/generic/parameters.h
include/Topology/generic/parameters.h
+3
-3
include/Topology/generic/traversor2.hpp
include/Topology/generic/traversor2.hpp
+14
-14
include/Topology/generic/traversor2Virt.hpp
include/Topology/generic/traversor2Virt.hpp
+12
-12
include/Topology/generic/traversor3.h
include/Topology/generic/traversor3.h
+7
-10
include/Topology/generic/traversor3.hpp
include/Topology/generic/traversor3.hpp
+17
-17
include/Topology/generic/traversor3Virt.h
include/Topology/generic/traversor3Virt.h
+8
-8
include/Topology/generic/traversor3Virt.hpp
include/Topology/generic/traversor3Virt.hpp
+17
-17
include/Topology/generic/traversorCell.h
include/Topology/generic/traversorCell.h
+3
-32
include/Topology/generic/traversorCell.hpp
include/Topology/generic/traversorCell.hpp
+11
-148
include/Topology/generic/traversorCellVirt.h
include/Topology/generic/traversorCellVirt.h
+3
-35
include/Topology/generic/traversorCellVirt.hpp
include/Topology/generic/traversorCellVirt.hpp
+3
-139
include/Topology/gmap/basegmap.h
include/Topology/gmap/basegmap.h
+0
-249
include/Topology/gmap/embeddedGMap2.h
include/Topology/gmap/embeddedGMap2.h
+5
-3
include/Topology/gmap/embeddedGMap3.h
include/Topology/gmap/embeddedGMap3.h
+5
-3
include/Topology/gmap/gmap0.h
include/Topology/gmap/gmap0.h
+8
-11
include/Topology/gmap/gmap0.hpp
include/Topology/gmap/gmap0.hpp
+51
-43
include/Topology/gmap/gmap1.h
include/Topology/gmap/gmap1.h
+6
-21
include/Topology/gmap/gmap1.hpp
include/Topology/gmap/gmap1.hpp
+143
-122
include/Topology/gmap/gmap2.h
include/Topology/gmap/gmap2.h
+6
-20
include/Topology/gmap/gmap2.hpp
include/Topology/gmap/gmap2.hpp
+1080
-102
include/Topology/gmap/gmap3.h
include/Topology/gmap/gmap3.h
+6
-11
include/Topology/gmap/gmap3.hpp
include/Topology/gmap/gmap3.hpp
+1104
-73
include/Topology/ihmap/ihm2.h
include/Topology/ihmap/ihm2.h
+11
-9
include/Topology/ihmap/ihm2.hpp
include/Topology/ihmap/ihm2.hpp
+4
-4
include/Topology/map/basemap.h
include/Topology/map/basemap.h
+0
-464
include/Topology/map/embeddedMap2.h
include/Topology/map/embeddedMap2.h
+5
-3
include/Topology/map/embeddedMap3.h
include/Topology/map/embeddedMap3.h
+4
-4
include/Topology/map/map1.h
include/Topology/map/map1.h
+9
-18
include/Topology/map/map1.hpp
include/Topology/map/map1.hpp
+122
-88
include/Topology/map/map2.h
include/Topology/map/map2.h
+16
-21
include/Topology/map/map2.hpp
include/Topology/map/map2.hpp
+1053
-74
include/Topology/map/map3.h
include/Topology/map/map3.h
+6
-19
include/Topology/map/map3.hpp
include/Topology/map/map3.hpp
+1629
-74
include/Utils/pointSprite.h
include/Utils/pointSprite.h
+0
-1
src/Algo/ImplicitHierarchicalMesh/ihm3.cpp
src/Algo/ImplicitHierarchicalMesh/ihm3.cpp
+3
-3
src/Algo/Render/topo3PrimalRender.cpp
src/Algo/Render/topo3PrimalRender.cpp
+0
-363
src/Algo/Render/topo3Render.cpp
src/Algo/Render/topo3Render.cpp
+0
-476
src/Algo/Render/topoPrimalRender.cpp
src/Algo/Render/topoPrimalRender.cpp
+0
-363
src/Algo/Render/topoRender.cpp
src/Algo/Render/topoRender.cpp
+0
-415
src/Topology/generic/attribmap.cpp
src/Topology/generic/attribmap.cpp
+0
-81
src/Topology/generic/genericmap.cpp
src/Topology/generic/genericmap.cpp
+83
-680
src/Topology/generic/mapMono.cpp
src/Topology/generic/mapMono.cpp
+189
-0
src/Topology/generic/mapMulti.cpp
src/Topology/generic/mapMulti.cpp
+417
-0
src/Topology/gmap/embeddedGMap2.cpp
src/Topology/gmap/embeddedGMap2.cpp
+12
-12
src/Topology/gmap/embeddedGMap3.cpp
src/Topology/gmap/embeddedGMap3.cpp
+5
-5
src/Topology/gmap/gmap0.cpp
src/Topology/gmap/gmap0.cpp
+0
-59
src/Topology/gmap/gmap1.cpp
src/Topology/gmap/gmap1.cpp
+0
-101
src/Topology/gmap/gmap2.cpp
src/Topology/gmap/gmap2.cpp
+0
-1017
src/Topology/gmap/gmap3.cpp
src/Topology/gmap/gmap3.cpp
+0
-1048
src/Topology/ihmap/ihm2.cpp
src/Topology/ihmap/ihm2.cpp
+1
-1
src/Topology/map/embeddedMap2.cpp
src/Topology/map/embeddedMap2.cpp
+30
-18
src/Topology/map/embeddedMap3.cpp
src/Topology/map/embeddedMap3.cpp
+7
-12
src/Topology/map/map2.cpp
src/Topology/map/map2.cpp
+0
-1066
src/Topology/map/map3.cpp
src/Topology/map/map3.cpp
+0
-1727
No files found.
Apps/Examples/Debug/CMakeLists.txt
View file @
d19ee728
...
...
@@ -63,19 +63,17 @@ target_link_libraries( clippingD ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI
(
volumeExplorer_ui ../volumeExplorer.ui
)
QT4_WRAP_CPP
(
volumeExplorer_moc ../volumeExplorer.h
)
add_executable
(
volumeExplorerD ../volumeExplorer.cpp
${
volumeExplorer_ui
}
${
volumeExplorer_moc
}
)
target_link_libraries
(
volumeExplorerD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
volumeExplorerD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_UI
(
mcmesh_ui ../mcmesh.ui
)
QT4_WRAP_CPP
(
mcmesh_moc ../mcmesh.h
)
add_executable
(
mcmeshD ../mcmesh.cpp
${
mcmesh_moc
}
${
mcmesh_ui
}
)
target_link_libraries
(
mcmeshD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
#
QT4_WRAP_UI( mcmesh_ui ../mcmesh.ui )
#
QT4_WRAP_CPP( mcmesh_moc ../mcmesh.h )
#
add_executable( mcmeshD ../mcmesh.cpp ${mcmesh_moc} ${mcmesh_ui} )
#target_link_libraries( mcmeshD ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS}
)
QT4_WRAP_CPP
(
concave_rendering_moc ../concave_rendering.h
)
add_executable
(
concave_renderingD ../concave_rendering.cpp
${
concave_rendering_moc
}
${
concave_rendering_ui
}
)
target_link_libraries
(
concave_renderingD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
concave_renderingD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_CPP
(
viewerOBJ_moc ../viewerOBJ.h
)
add_executable
(
viewerOBJD ../viewerOBJ.cpp
${
viewerOBJ_moc
}
)
target_link_libraries
(
viewerOBJD
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
viewerOBJD
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
Apps/Examples/Release/CMakeLists.txt
View file @
d19ee728
...
...
@@ -31,6 +31,10 @@ QT4_WRAP_CPP( texturesExample_moc ../texturesExample.h )
add_executable
(
texturesExample ../texturesExample.cpp
${
texturesExample_moc
}
)
target_link_libraries
(
texturesExample
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_CPP
(
simpleMap3_moc ../simpleMap3.h
)
add_executable
(
simpleMap3 ../simpleMap3.cpp
${
simpleMap3_moc
}
)
target_link_libraries
(
simpleMap3
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_CPP
(
simpleGMap2_moc ../simpleGMap2.h
)
add_executable
(
simpleGMap2 ../simpleGMap2.cpp
${
simpleGMap2_moc
}
)
target_link_libraries
(
simpleGMap2
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
...
...
@@ -58,10 +62,10 @@ QT4_WRAP_CPP( volumeExplorer_moc ../volumeExplorer.h )
add_executable
(
volumeExplorer ../volumeExplorer.cpp
${
volumeExplorer_ui
}
${
volumeExplorer_moc
}
)
target_link_libraries
(
volumeExplorer
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_UI
(
mcmesh_ui ../mcmesh.ui
)
QT4_WRAP_CPP
(
mcmesh_moc ../mcmesh.h
)
add_executable
(
mcmesh ../mcmesh.cpp
${
mcmesh_moc
}
${
mcmesh_ui
}
)
target_link_libraries
(
mcmesh
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
#
QT4_WRAP_UI( mcmesh_ui ../mcmesh.ui )
#
QT4_WRAP_CPP( mcmesh_moc ../mcmesh.h )
#
add_executable( mcmesh ../mcmesh.cpp ${mcmesh_moc} ${mcmesh_ui} )
#
target_link_libraries( mcmesh ${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP
(
concave_rendering_moc ../concave_rendering.h
)
add_executable
(
concave_rendering ../concave_rendering.cpp
${
concave_rendering_moc
}
${
concave_rendering_ui
}
)
...
...
@@ -69,5 +73,4 @@ target_link_libraries( concave_rendering ${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP
(
viewerOBJ_moc ../viewerOBJ.h
)
add_executable
(
viewerOBJ ../viewerOBJ.cpp
${
viewerOBJ_moc
}
)
target_link_libraries
(
viewerOBJ
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
viewerOBJ
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
Apps/Examples/clipping.cpp
View file @
d19ee728
...
...
@@ -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
]);
m_render_topo
->
updateData
(
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
]);
m_render_topo
->
updateData
(
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
]);
m_render_topo
->
updateData
(
myMap
,
position
,
m_coeffTopoExplod
[
0
],
m_coeffTopoExplod
[
1
],
m_coeffTopoExplod
[
2
]);
updateGL
();
}
...
...
@@ -814,7 +814,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
]);
m_render_topo
->
updateData
(
myMap
,
position
,
m_coeffTopoExplod
[
0
],
m_coeffTopoExplod
[
1
],
m_coeffTopoExplod
[
2
]);
m_bb
=
Algo
::
Geometry
::
computeBoundingBox
<
PFP
>
(
myMap
,
position
)
;
gPosObj
=
m_bb
.
center
()
;
...
...
@@ -843,7 +843,7 @@ void Clipping::cb_initGL()
// create the render
m_render
=
new
Algo
::
Render
::
GL2
::
MapRender
();
m_render_topo
=
new
Algo
::
Render
::
GL2
::
Topo3Render
();
m_render_topo
=
new
Algo
::
Render
::
GL2
::
Topo3Render
Map
<
PFP
>
();
// create VBO for position
m_positionVBO
=
new
Utils
::
VBO
();
...
...
Apps/Examples/clipping.h
View file @
d19ee728
...
...
@@ -70,18 +70,18 @@ struct PFP: public PFP_STANDARD
typedef
EmbeddedMap3
MAP
;
};
typedef
PFP
::
MAP
MAP
;
typedef
PFP
::
MAP
::
IMPL
MAP_IMPL
;
typedef
PFP
::
VEC3
VEC3
;
class
Clipping
:
public
Utils
::
QT
::
SimpleQT
{
Q_OBJECT
public:
typedef
PFP
::
MAP
MAP
;
typedef
PFP
::
VEC3
VEC3
;
//Manip Carte
MAP
myMap
;
VertexAttribute
<
VEC3
>
position
;
VertexAttribute
<
VEC3
,
MAP_IMPL
>
position
;
Dart
dglobal
;
//Render
...
...
@@ -91,7 +91,7 @@ public:
bool
m_drawTopo
;
Algo
::
Render
::
GL2
::
MapRender
*
m_render
;
Algo
::
Render
::
GL2
::
Topo3Render
*
m_render_topo
;
Algo
::
Render
::
GL2
::
Topo3Render
<
PFP
>
*
m_render_topo
;
Geom
::
BoundingBox
<
PFP
::
VEC3
>
m_bb
;
...
...
Apps/Examples/concave_rendering.cpp
View file @
d19ee728
...
...
@@ -128,12 +128,13 @@ 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
>
position
;
VertexAttribute
<
VEC3
,
MAP_IMPL
>
position
;
unsigned
int
nb_ears
;
...
...
Apps/Examples/extrusionView.cpp
View file @
d19ee728
...
...
@@ -53,6 +53,7 @@ struct PFP: public PFP_STANDARD
};
typedef
PFP
::
MAP
MAP
;
typedef
PFP
::
MAP
::
IMPL
MAP_IMPL
;
typedef
PFP
::
VEC3
VEC3
;
MAP
myMap
;
...
...
@@ -103,7 +104,7 @@ int main(int argc, char **argv)
QApplication
app
(
argc
,
argv
);
MyQT
sqt
;
VertexAttribute
<
VEC3
>
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
>
(
"position"
)
;
VertexAttribute
<
VEC3
,
MAP_IMPL
>
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
>
(
"position"
)
;
// define the face extruded (here a cross)
std
::
vector
<
PFP
::
VEC3
>
objV
;
...
...
Apps/Examples/mcmesh.cpp
View file @
d19ee728
...
...
@@ -197,7 +197,6 @@ void MCMesh::sphere()
myImg
=
new
SAlgo
::
MC
::
Image
<
DATATYPE
>
(
img
,
128
,
128
,
128
,
1.0
f
,
1.0
f
,
1.0
f
,
false
);
}
/**********************************************************************************************
* MAIN FUNCTION *
**********************************************************************************************/
...
...
@@ -210,7 +209,7 @@ int main(int argc, char **argv)
sqt
.
setGeometry
(
0
,
0
,
1000
,
800
);
sqt
.
show
();
sqt
.
valLabel
=
DATATYPE
(
0
);
sqt
.
valLabel
=
DATATYPE
(
0
);
if
(
argc
==
2
)
{
...
...
Apps/Examples/mcmesh.h
View file @
d19ee728
...
...
@@ -29,9 +29,10 @@
#include "Utils/Qt/qtui.h"
#include "Topology/generic/parameters.h"
#include "Topology/map/map2.h"
#include "Topology/map/embeddedMap2.h"
#include "Algo/MC/marchingcube.h"
#include "Geometry/vector_gen.h"
#include "Geometry/matrix.h"
...
...
@@ -41,8 +42,6 @@
#include "Utils/vbo.h"
#include "Algo/Geometry/boundingbox.h"
#include "Algo/MC/marchingcube.h"
using
namespace
CGoGN
;
...
...
@@ -55,6 +54,7 @@ struct PFP: public PFP_STANDARD
};
typedef
PFP
::
MAP
MAP
;
typedef
PFP
::
MAP
::
IMPL
MAP_IMPL
;
typedef
PFP
::
VEC3
VEC3
;
typedef
unsigned
char
DATATYPE
;
...
...
@@ -65,7 +65,6 @@ class MCMesh : public Utils::QT::SimpleQT
public:
MAP
myMap
;
SelectorTrue
allDarts
;
Utils
::
QT
::
uiDockInterface
dock
;
...
...
@@ -76,7 +75,7 @@ public:
bool
m_drawEdges
;
bool
m_drawFaces
;
VertexAttribute
<
VEC3
>
position
;
VertexAttribute
<
VEC3
,
MAP_IMPL
>
position
;
Algo
::
Render
::
GL2
::
MapRender
*
m_render
;
...
...
Apps/Examples/simpleGMap2.h
View file @
d19ee728
...
...
@@ -42,6 +42,7 @@ 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
...
...
@@ -51,7 +52,7 @@ class SimpleGMap2 : public Utils::QT::SimpleQT
public:
MAP
myMap
;
VertexAttribute
<
VEC3
>
position
;
VertexAttribute
<
VEC3
,
MAP_IMPL
>
position
;
SimpleGMap2
()
;
...
...
Apps/Examples/simpleGMap3.cpp
View file @
d19ee728
...
...
@@ -132,10 +132,10 @@ void SimpleGMap3::cb_initGL()
float
gWidthObj
=
std
::
max
<
float
>
(
std
::
max
<
float
>
(
tailleX
,
tailleY
),
tailleZ
)
;
setParamObject
(
gWidthObj
,
gPosObj
.
data
());
m_render_topo
=
new
Algo
::
Render
::
GL2
::
Topo3Render
();
m_render_topo
=
new
Algo
::
Render
::
GL2
::
Topo3RenderGMap
<
PFP
>
();
m_render_topo
->
setDartWidth
(
2.0
f
);
m_render_topo
->
setInitialDartsColor
(
1.0
f
,
1.0
f
,
1.0
f
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
0.8
f
);
m_render_topo
->
updateData
(
myMap
,
position
,
0.9
f
,
0.9
f
,
0.8
f
);
}
void
SimpleGMap3
::
cb_redraw
()
...
...
Apps/Examples/simpleGMap3.h
View file @
d19ee728
...
...
@@ -43,6 +43,7 @@ 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
...
...
@@ -52,10 +53,10 @@ class SimpleGMap3 : public Utils::QT::SimpleQT
public:
MAP
myMap
;
VertexAttribute
<
VEC3
>
position
;
VolumeAttribute
<
VEC3
>
volume
;
VertexAttribute
<
VEC3
,
MAP_IMPL
>
position
;
VolumeAttribute
<
VEC3
,
MAP_IMPL
>
volume
;
Algo
::
Render
::
GL2
::
Topo3Render
*
m_render_topo
;
Algo
::
Render
::
GL2
::
Topo3Render
<
PFP
>
*
m_render_topo
;
SimpleGMap3
()
;
...
...
Apps/Examples/simpleMap3.cpp
View file @
d19ee728
...
...
@@ -106,20 +106,20 @@ void SimpleMap3::cb_initGL()
float
gWidthObj
=
std
::
max
<
float
>
(
std
::
max
<
float
>
(
tailleX
,
tailleY
),
tailleZ
)
;
setParamObject
(
gWidthObj
,
gPosObj
.
data
());
m_render_topo
=
new
Algo
::
Render
::
GL2
::
Topo3Render
();
m_render_topo
=
new
Algo
::
Render
::
GL2
::
Topo3Render
Map
<
PFP
>
();
m_render_topo
->
setDartWidth
(
2.0
f
);
m_render_topo
->
setInitialDartsColor
(
1.0
f
,
1.0
f
,
1.0
f
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
0.8
f
);
m_render_topo
->
updateData
(
myMap
,
position
,
0.9
f
,
0.9
f
,
0.8
f
);
m_render_topo_boundary
=
new
Algo
::
Render
::
GL2
::
TopoRender
();
m_render_topo_boundary
=
new
Algo
::
Render
::
GL2
::
TopoRender
Map
<
PFP
>
();
m_render_topo_boundary
->
setDartWidth
(
2.0
f
);
m_render_topo_boundary
->
setInitialDartsColor
(
0.4
f
,
0.8
f
,
0.4
f
);
m_render_topo_boundary
->
updateDataBoundary
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
bb
.
maxSize
()
/
50.0
f
);
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
();
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
->
updateData
<
PFP
>
(
myMap
,
position
,
0.95
f
,
0.85
f
);
m_render_topo_primal
->
updateData
(
myMap
,
position
,
0.95
f
,
0.85
f
);
}
void
SimpleMap3
::
cb_keyPress
(
int
code
)
...
...
Apps/Examples/simpleMap3.h
View file @
d19ee728
...
...
@@ -45,6 +45,7 @@ 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
...
...
@@ -55,11 +56,11 @@ public:
MAP
myMap
;
SelectorTrue
allDarts
;
VertexAttribute
<
VEC3
>
position
;
VertexAttribute
<
VEC3
,
MAP_IMPL
>
position
;
Algo
::
Render
::
GL2
::
Topo3Render
*
m_render_topo
;
Algo
::
Render
::
GL2
::
TopoRender
*
m_render_topo_boundary
;
Algo
::
Render
::
GL2
::
Topo3PrimalRender
*
m_render_topo_primal
;
Algo
::
Render
::
GL2
::
Topo3Render
Map
<
PFP
>
*
m_render_topo
;
Algo
::
Render
::
GL2
::
TopoRender
Map
<
PFP
>
*
m_render_topo_boundary
;
Algo
::
Render
::
GL2
::
Topo3PrimalRender
<
PFP
>
*
m_render_topo_primal
;
SimpleMap3
()
;
...
...
@@ -69,4 +70,3 @@ public:
void
cb_redraw
()
;
void
cb_keyPress
(
int
code
);
};
Apps/Examples/texturesExample.cpp
View file @
d19ee728
...
...
@@ -85,12 +85,11 @@ void TexView::cb_initGL()
m_shader2
->
setSpecular
(
Geom
::
Vec4f
(
0.5
));
registerShader
(
m_shader2
);
glEnable
(
GL_TEXTURE_2D
);
if
(
!
m_obj
.
hasNormals
())
{
VertexAttribute
<
Geom
::
Vec3f
>
normal
=
myMap
.
getAttribute
<
VEC3
,
VERTEX
>
(
"normal"
)
;
VertexAttribute
<
Geom
::
Vec3f
,
MAP_IMPL
>
normal
=
myMap
.
getAttribute
<
VEC3
,
VERTEX
>
(
"normal"
)
;
if
(
!
normal
.
isValid
())
normal
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
>
(
"normal"
)
;
...
...
@@ -99,7 +98,6 @@ void TexView::cb_initGL()
}
m_nbIndices
=
m_obj
.
createSimpleVBO_PTN
(
m_positionVBO
,
m_texcoordVBO
,
m_normalVBO
);
}
void
TexView
::
cb_redraw
()
...
...
@@ -120,8 +118,6 @@ void TexView::cb_redraw()
glDrawArrays
(
GL_TRIANGLES
,
0
,
m_nbIndices
);
m_shader
->
disableVertexAttribs
();
}
}
void
TexView
::
cb_keyPress
(
int
code
)
...
...
@@ -152,7 +148,6 @@ void TexView::cb_keyPress(int code)
m_shader2
->
setShininess
(
1.0
f
);
m_shader2
->
setSpecular
(
Geom
::
Vec4f
(
0
));
break
;
}
updateGL
();
}
...
...
@@ -179,10 +174,8 @@ void TexView::init(const std::string& fnm, const std::string& fnt)
// send BB info to interface for centering on GL screen
setParamObject
(
lWidthObj
,
lPosObj
.
data
());
}
void
TexView
::
computeImage
()
{
std
::
vector
<
Geom
::
Vec3f
>
colorTable
;
...
...
@@ -213,8 +206,8 @@ void TexView::computeTore()
{
#define NB 96
VertexAttribute
<
VEC3
>
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
>
(
"position"
);
VertexAttribute
<
Geom
::
Vec2f
>
texcoord
=
myMap
.
addAttribute
<
Geom
::
Vec2f
,
VERTEX
>
(
"texcoord"
);
VertexAttribute
<
VEC3
,
MAP_IMPL
>
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
>
(
"position"
);
VertexAttribute
<
Geom
::
Vec2f
,
MAP_IMPL
>
texcoord
=
myMap
.
addAttribute
<
Geom
::
Vec2f
,
VERTEX
>
(
"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
);
...
...
@@ -245,9 +238,6 @@ void TexView::computeTore()
m_obj
.
setTexCoordAttribute
(
texcoord
);
}
int
main
(
int
argc
,
char
**
argv
)
{
// interface:
...
...
@@ -267,10 +257,8 @@ int main(int argc, char**argv)
tv
.
init
(
""
,
"x"
);
}
tv
.
show
();
// et on attend la fin.
return
app
.
exec
();
}
Apps/Examples/texturesExample.h
View file @
d19ee728
...
...
@@ -50,7 +50,9 @@ struct PFP: public PFP_STANDARD
};
typedef
PFP
::
MAP
MAP
;
typedef
PFP
::
MAP
::
IMPL
MAP_IMPL
;
typedef
PFP
::
VEC3
VEC3
;
/**
* A class for a little interface and rendering
*/
...
...
Apps/Examples/viewer.cpp
View file @
d19ee728
...
...
@@ -80,7 +80,7 @@ void Viewer::cb_initGL()
Utils
::
GLSLShader
::
setCurrentOGLVersion
(
2
)
;
m_render
=
new
Algo
::
Render
::
GL2
::
MapRender
()
;
m_topoRender
=
new
Algo
::
Render
::
GL2
::
TopoRender
()
;
m_topoRender
=
new
Algo
::
Render
::
GL2
::
TopoRender
Map
<
PFP
>
()
;
m_topoRender
->
setInitialDartsColor
(
0.25
f
,
0.25
f
,
0.25
f
)
;
...
...
@@ -230,7 +230,7 @@ void Viewer::importMesh(std::string& filename)
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
,
m_drawBoundaryTopo
)
;
m_topoRender
->
updateData
(
myMap
,
position
,
0.85
f
,
0.85
f
,
m_drawBoundaryTopo
)
;
bb
=
Algo
::
Geometry
::
computeBoundingBox
<
PFP
>
(
myMap
,
position
)
;
normalBaseSize
=
bb
.
diagSize
()
/
100.0
f
;
...
...
@@ -262,7 +262,7 @@ void Viewer::exportMesh(std::string& filename, bool askExportMode)
if
(
askExportMode
)
Utils
::
QT
::
inputValues
(
Utils
::
QT
::
VarCombo
(
"binary mode;ascii mode"
,
ascii
,
"Save in"
))
;
std
::
vector
<
VertexAttribute
<
VEC3
>*>
attributes
;
std
::
vector
<
VertexAttribute
<
VEC3
,
MAP_IMPL
>*>
attributes
;
attributes
.
push_back
(
&
position
)
;
Algo
::
Surface
::
Export
::
exportPLYnew
<
PFP
>
(
myMap
,
attributes
,
filename
.
c_str
(),
!
ascii
)
;
}
...
...
Apps/Examples/viewer.h
View file @
d19ee728
...
...
@@ -64,6 +64,7 @@ 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
...
...
@@ -100,11 +101,11 @@ public:
bool
m_drawTopo
;
bool
m_drawBoundaryTopo
;
VertexAttribute
<
VEC3
>
position
;
VertexAttribute
<
VEC3
>
normal
;
VertexAttribute
<
VEC3
,
MAP_IMPL
>
position
;
VertexAttribute
<
VEC3
,
MAP_IMPL
>
normal
;
Algo
::
Render
::
GL2
::
MapRender
*
m_render
;
Algo
::
Render
::
GL2
::
TopoRender
*
m_topoRender
;
Algo
::
Render
::
GL2
::
TopoRender
Map
<
PFP
>
*
m_topoRender
;
Utils
::
VBO
*
m_positionVBO
;
Utils
::
VBO
*
m_normalVBO
;
...
...
Apps/Examples/volumeExplorer.cpp
View file @
d19ee728
...
...
@@ -22,7 +22,6 @@
* *
*******************************************************************************/
#include "volumeExplorer.h"
#include <iostream>
...
...
@@ -35,10 +34,9 @@
#include "Algo/Export/exportVol.h"
PFP
::
MAP
myMap
;
VertexAttribute
<
PFP
::
VEC3
>
position
;
VolumeAttribute
<
PFP
::
VEC3
>
color
;
MAP
myMap
;
VertexAttribute
<
VEC3
,
MAP_IMPL
>
position
;
VolumeAttribute
<
VEC3
,
MAP_IMPL
>
color
;
void
MyQT
::
volumes_onoff
(
bool
/*x*/
)
{
...
...
@@ -59,7 +57,7 @@ void MyQT::topo_onoff(bool /*x*/)
{
// 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
);