Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
CGoGN
CGoGN
Commits
5b63bed6
Commit
5b63bed6
authored
Sep 04, 2013
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Plain Diff
Merge cgogn:~cgogn/CGoGN
parents
34bb63de
ab764478
Changes
206
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
206 changed files
with
8228 additions
and
9544 deletions
+8228
-9544
Apps/Tuto/show_traversors.cpp
Apps/Tuto/show_traversors.cpp
+547
-485
Apps/Tuto/tuto_oper2.cpp
Apps/Tuto/tuto_oper2.cpp
+17
-3
Apps/Tuto/tuto_oper2.h
Apps/Tuto/tuto_oper2.h
+11
-3
Apps/Tuto/tuto_oper3.cpp
Apps/Tuto/tuto_oper3.cpp
+744
-587
Apps/Tuto/tuto_oper3.h
Apps/Tuto/tuto_oper3.h
+13
-3
Apps/Tuto/tuto_oper3.ui
Apps/Tuto/tuto_oper3.ui
+5
-0
CMakeLists.txt
CMakeLists.txt
+14
-3
README.TXT
README.TXT
+43
-35
README_VISUAL.TXT
README_VISUAL.TXT
+21
-33
SCHNApps/CMakeLists.txt
SCHNApps/CMakeLists.txt
+7
-8
SCHNApps/Plugins/CMakeLists.txt
SCHNApps/Plugins/CMakeLists.txt
+5
-11
SCHNApps/Plugins/renderVector/CMakeLists.txt
SCHNApps/Plugins/renderVector/CMakeLists.txt
+0
-32
SCHNApps/Plugins/renderVector/src/renderVector.cpp
SCHNApps/Plugins/renderVector/src/renderVector.cpp
+0
-236
SCHNApps/Plugins/renderVector/src/renderVectorDockTab.cpp
SCHNApps/Plugins/renderVector/src/renderVectorDockTab.cpp
+0
-136
SCHNApps/Plugins/subdivideSurface/CMakeLists.txt
SCHNApps/Plugins/subdivideSurface/CMakeLists.txt
+0
-32
SCHNApps/Plugins/subdivideSurface/forms/subdivideSurfaceDialog.ui
.../Plugins/subdivideSurface/forms/subdivideSurfaceDialog.ui
+0
-95
SCHNApps/Plugins/surface_deformation/CMakeLists.txt
SCHNApps/Plugins/surface_deformation/CMakeLists.txt
+0
-0
SCHNApps/Plugins/surface_deformation/forms/surfaceDeformation.ui
...s/Plugins/surface_deformation/forms/surfaceDeformation.ui
+0
-0
SCHNApps/Plugins/surface_deformation/include/surfaceDeformation.h
.../Plugins/surface_deformation/include/surfaceDeformation.h
+0
-0
SCHNApps/Plugins/surface_deformation/include/surfaceDeformationDockTab.h
...s/surface_deformation/include/surfaceDeformationDockTab.h
+0
-0
SCHNApps/Plugins/surface_deformation/src/surfaceDeformation.cpp
...ps/Plugins/surface_deformation/src/surfaceDeformation.cpp
+0
-0
SCHNApps/Plugins/surface_deformation/src/surfaceDeformationDockTab.cpp
...ins/surface_deformation/src/surfaceDeformationDockTab.cpp
+0
-0
SCHNApps/Plugins/surface_differentialProperties/CMakeLists.txt
...pps/Plugins/surface_differentialProperties/CMakeLists.txt
+5
-5
SCHNApps/Plugins/surface_differentialProperties/forms/dialog_computeCurvature.ui
...e_differentialProperties/forms/dialog_computeCurvature.ui
+5
-5
SCHNApps/Plugins/surface_differentialProperties/forms/dialog_computeNormal.ui
...face_differentialProperties/forms/dialog_computeNormal.ui
+5
-5
SCHNApps/Plugins/surface_differentialProperties/include/dialog_computeCurvature.h
..._differentialProperties/include/dialog_computeCurvature.h
+7
-7
SCHNApps/Plugins/surface_differentialProperties/include/dialog_computeNormal.h
...ace_differentialProperties/include/dialog_computeNormal.h
+37
-0
SCHNApps/Plugins/surface_differentialProperties/include/surface_differentialProperties.h
...entialProperties/include/surface_differentialProperties.h
+21
-26
SCHNApps/Plugins/surface_differentialProperties/src/dialog_computeCurvature.cpp
...ce_differentialProperties/src/dialog_computeCurvature.cpp
+20
-40
SCHNApps/Plugins/surface_differentialProperties/src/dialog_computeNormal.cpp
...rface_differentialProperties/src/dialog_computeNormal.cpp
+102
-0
SCHNApps/Plugins/surface_differentialProperties/src/surface_differentialProperties.cpp
...erentialProperties/src/surface_differentialProperties.cpp
+33
-33
SCHNApps/Plugins/surface_import/CMakeLists.txt
SCHNApps/Plugins/surface_import/CMakeLists.txt
+3
-3
SCHNApps/Plugins/surface_import/include/surface_import.h
SCHNApps/Plugins/surface_import/include/surface_import.h
+41
-0
SCHNApps/Plugins/surface_import/src/surface_import.cpp
SCHNApps/Plugins/surface_import/src/surface_import.cpp
+10
-12
SCHNApps/Plugins/surface_render/CMakeLists.txt
SCHNApps/Plugins/surface_render/CMakeLists.txt
+4
-4
SCHNApps/Plugins/surface_render/forms/surface_render.ui
SCHNApps/Plugins/surface_render/forms/surface_render.ui
+141
-0
SCHNApps/Plugins/surface_render/include/surface_render.h
SCHNApps/Plugins/surface_render/include/surface_render.h
+113
-0
SCHNApps/Plugins/surface_render/include/surface_render_dockTab.h
...s/Plugins/surface_render/include/surface_render_dockTab.h
+53
-0
SCHNApps/Plugins/surface_render/src/surface_render.cpp
SCHNApps/Plugins/surface_render/src/surface_render.cpp
+306
-0
SCHNApps/Plugins/surface_render/src/surface_render_dockTab.cpp
...pps/Plugins/surface_render/src/surface_render_dockTab.cpp
+221
-0
SCHNApps/Plugins/surface_renderScalar/CMakeLists.txt
SCHNApps/Plugins/surface_renderScalar/CMakeLists.txt
+0
-0
SCHNApps/Plugins/surface_renderScalar/forms/renderScalar.ui
SCHNApps/Plugins/surface_renderScalar/forms/renderScalar.ui
+0
-0
SCHNApps/Plugins/surface_renderScalar/include/renderScalar.h
SCHNApps/Plugins/surface_renderScalar/include/renderScalar.h
+0
-0
SCHNApps/Plugins/surface_renderScalar/include/renderScalarDockTab.h
...lugins/surface_renderScalar/include/renderScalarDockTab.h
+0
-0
SCHNApps/Plugins/surface_renderScalar/src/renderScalar.cpp
SCHNApps/Plugins/surface_renderScalar/src/renderScalar.cpp
+0
-0
SCHNApps/Plugins/surface_renderScalar/src/renderScalarDockTab.cpp
.../Plugins/surface_renderScalar/src/renderScalarDockTab.cpp
+0
-0
SCHNApps/Plugins/surface_renderTopo/CMakeLists.txt
SCHNApps/Plugins/surface_renderTopo/CMakeLists.txt
+0
-0
SCHNApps/Plugins/surface_renderTopo/backup/renderTopoSurface.cpp
...s/Plugins/surface_renderTopo/backup/renderTopoSurface.cpp
+313
-0
SCHNApps/Plugins/surface_renderTopo/backup/renderTopoSurface.h
...pps/Plugins/surface_renderTopo/backup/renderTopoSurface.h
+97
-0
SCHNApps/Plugins/surface_renderTopo/backup/renderTopoSurface.ui
...ps/Plugins/surface_renderTopo/backup/renderTopoSurface.ui
+42
-55
SCHNApps/Plugins/surface_renderTopo/backup/renderTopoSurfaceDockTab.cpp
...ns/surface_renderTopo/backup/renderTopoSurfaceDockTab.cpp
+163
-0
SCHNApps/Plugins/surface_renderTopo/backup/renderTopoSurfaceDockTab.h
...gins/surface_renderTopo/backup/renderTopoSurfaceDockTab.h
+46
-0
SCHNApps/Plugins/surface_renderTopo/forms/renderTopoSurface.ui
...pps/Plugins/surface_renderTopo/forms/renderTopoSurface.ui
+0
-0
SCHNApps/Plugins/surface_renderTopo/include/renderTopoSurface.h
...ps/Plugins/surface_renderTopo/include/renderTopoSurface.h
+0
-0
SCHNApps/Plugins/surface_renderTopo/include/renderTopoSurfaceDockTab.h
...ins/surface_renderTopo/include/renderTopoSurfaceDockTab.h
+0
-0
SCHNApps/Plugins/surface_renderTopo/src/renderTopoSurface.cpp
...Apps/Plugins/surface_renderTopo/src/renderTopoSurface.cpp
+0
-0
SCHNApps/Plugins/surface_renderTopo/src/renderTopoSurfaceDockTab.cpp
...ugins/surface_renderTopo/src/renderTopoSurfaceDockTab.cpp
+0
-0
SCHNApps/Plugins/surface_renderVector/CMakeLists.txt
SCHNApps/Plugins/surface_renderVector/CMakeLists.txt
+32
-0
SCHNApps/Plugins/surface_renderVector/forms/surface_renderVector.ui
...lugins/surface_renderVector/forms/surface_renderVector.ui
+28
-30
SCHNApps/Plugins/surface_renderVector/include/surface_renderVector.h
...ugins/surface_renderVector/include/surface_renderVector.h
+86
-0
SCHNApps/Plugins/surface_renderVector/include/surface_renderVector_dockTab.h
...rface_renderVector/include/surface_renderVector_dockTab.h
+49
-0
SCHNApps/Plugins/surface_renderVector/src/surface_renderVector.cpp
...Plugins/surface_renderVector/src/surface_renderVector.cpp
+215
-0
SCHNApps/Plugins/surface_renderVector/src/surface_renderVector_dockTab.cpp
...surface_renderVector/src/surface_renderVector_dockTab.cpp
+153
-0
SCHNApps/Plugins/surface_subdivision/CMakeLists.txt
SCHNApps/Plugins/surface_subdivision/CMakeLists.txt
+32
-0
SCHNApps/Plugins/surface_subdivision/forms/dialog_surface_subdivision.ui
...s/surface_subdivision/forms/dialog_surface_subdivision.ui
+83
-0
SCHNApps/Plugins/surface_subdivision/include/dialog_surface_subdivision.h
.../surface_subdivision/include/dialog_surface_subdivision.h
+37
-0
SCHNApps/Plugins/surface_subdivision/include/surface_subdivision.h
...Plugins/surface_subdivision/include/surface_subdivision.h
+57
-0
SCHNApps/Plugins/surface_subdivision/src/dialog_surface_subdivision.cpp
...ns/surface_subdivision/src/dialog_surface_subdivision.cpp
+93
-0
SCHNApps/Plugins/surface_subdivision/src/surface_subdivision.cpp
...s/Plugins/surface_subdivision/src/surface_subdivision.cpp
+125
-0
SCHNApps/Plugins/volume_import/CMakeLists.txt
SCHNApps/Plugins/volume_import/CMakeLists.txt
+0
-0
SCHNApps/Plugins/volume_import/include/importVolume.h
SCHNApps/Plugins/volume_import/include/importVolume.h
+0
-0
SCHNApps/Plugins/volume_import/src/importVolume.cpp
SCHNApps/Plugins/volume_import/src/importVolume.cpp
+0
-0
SCHNApps/Plugins/volume_renderExplod/CMakeLists.txt
SCHNApps/Plugins/volume_renderExplod/CMakeLists.txt
+0
-0
SCHNApps/Plugins/volume_renderExplod/forms/renderExplod.ui
SCHNApps/Plugins/volume_renderExplod/forms/renderExplod.ui
+0
-0
SCHNApps/Plugins/volume_renderExplod/include/renderExplod.h
SCHNApps/Plugins/volume_renderExplod/include/renderExplod.h
+0
-0
SCHNApps/Plugins/volume_renderExplod/include/renderExplodDockTab.h
...Plugins/volume_renderExplod/include/renderExplodDockTab.h
+0
-0
SCHNApps/Plugins/volume_renderExplod/src/renderExplod.cpp
SCHNApps/Plugins/volume_renderExplod/src/renderExplod.cpp
+0
-0
SCHNApps/Plugins/volume_renderExplod/src/renderExplodDockTab.cpp
...s/Plugins/volume_renderExplod/src/renderExplodDockTab.cpp
+0
-0
SCHNApps/bin/schnappsInit.py
SCHNApps/bin/schnappsInit.py
+0
-2
SCHNApps/doc/Doxyfile.in
SCHNApps/doc/Doxyfile.in
+0
-1716
SCHNApps/doc/LaTeX/images/callBacks.png
SCHNApps/doc/LaTeX/images/callBacks.png
+0
-0
SCHNApps/doc/LaTeX/images/callBacks.svg
SCHNApps/doc/LaTeX/images/callBacks.svg
+0
-507
SCHNApps/doc/LaTeX/images/plugins.png
SCHNApps/doc/LaTeX/images/plugins.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot1.png
SCHNApps/doc/LaTeX/images/screenshot1.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot10.png
SCHNApps/doc/LaTeX/images/screenshot10.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot11.png
SCHNApps/doc/LaTeX/images/screenshot11.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot12.png
SCHNApps/doc/LaTeX/images/screenshot12.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot13.png
SCHNApps/doc/LaTeX/images/screenshot13.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot14.png
SCHNApps/doc/LaTeX/images/screenshot14.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot15.png
SCHNApps/doc/LaTeX/images/screenshot15.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot16.png
SCHNApps/doc/LaTeX/images/screenshot16.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot17.png
SCHNApps/doc/LaTeX/images/screenshot17.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot18.png
SCHNApps/doc/LaTeX/images/screenshot18.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot19.png
SCHNApps/doc/LaTeX/images/screenshot19.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot2.png
SCHNApps/doc/LaTeX/images/screenshot2.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot20.png
SCHNApps/doc/LaTeX/images/screenshot20.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot21.png
SCHNApps/doc/LaTeX/images/screenshot21.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot22.png
SCHNApps/doc/LaTeX/images/screenshot22.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot23.png
SCHNApps/doc/LaTeX/images/screenshot23.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot24.png
SCHNApps/doc/LaTeX/images/screenshot24.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot25.png
SCHNApps/doc/LaTeX/images/screenshot25.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot26.png
SCHNApps/doc/LaTeX/images/screenshot26.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot28.png
SCHNApps/doc/LaTeX/images/screenshot28.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot3.png
SCHNApps/doc/LaTeX/images/screenshot3.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot4.png
SCHNApps/doc/LaTeX/images/screenshot4.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot5.png
SCHNApps/doc/LaTeX/images/screenshot5.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot6.png
SCHNApps/doc/LaTeX/images/screenshot6.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot7.png
SCHNApps/doc/LaTeX/images/screenshot7.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot8.png
SCHNApps/doc/LaTeX/images/screenshot8.png
+0
-0
SCHNApps/doc/LaTeX/images/screenshot9.png
SCHNApps/doc/LaTeX/images/screenshot9.png
+0
-0
SCHNApps/doc/LaTeX/images/systemMap1.png
SCHNApps/doc/LaTeX/images/systemMap1.png
+0
-0
SCHNApps/doc/LaTeX/images/systemMap2.png
SCHNApps/doc/LaTeX/images/systemMap2.png
+0
-0
SCHNApps/doc/LaTeX/overview.aux
SCHNApps/doc/LaTeX/overview.aux
+0
-119
SCHNApps/doc/LaTeX/overview.fdb_latexmk
SCHNApps/doc/LaTeX/overview.fdb_latexmk
+0
-96
SCHNApps/doc/LaTeX/overview.log
SCHNApps/doc/LaTeX/overview.log
+0
-959
SCHNApps/doc/LaTeX/overview.out
SCHNApps/doc/LaTeX/overview.out
+0
-26
SCHNApps/doc/LaTeX/overview.pdf
SCHNApps/doc/LaTeX/overview.pdf
+0
-0
SCHNApps/doc/LaTeX/overview.synctex.gz
SCHNApps/doc/LaTeX/overview.synctex.gz
+0
-0
SCHNApps/doc/LaTeX/overview.tex
SCHNApps/doc/LaTeX/overview.tex
+0
-1489
SCHNApps/doc/LaTeX/overview.toc
SCHNApps/doc/LaTeX/overview.toc
+0
-56
SCHNApps/doc/Video/cameraQuickPathDemo.webm
SCHNApps/doc/Video/cameraQuickPathDemo.webm
+0
-0
SCHNApps/forms/cameraViewDialog.ui
SCHNApps/forms/cameraViewDialog.ui
+0
-52
SCHNApps/forms/camerasDialog.ui
SCHNApps/forms/camerasDialog.ui
+0
-87
SCHNApps/forms/controlDock_CameraTabWidget.ui
SCHNApps/forms/controlDock_CameraTabWidget.ui
+115
-0
SCHNApps/forms/controlDock_MapTabWidget.ui
SCHNApps/forms/controlDock_MapTabWidget.ui
+287
-0
SCHNApps/forms/controlDock_PluginTabWidget.ui
SCHNApps/forms/controlDock_PluginTabWidget.ui
+108
-0
SCHNApps/forms/mapsDialog.ui
SCHNApps/forms/mapsDialog.ui
+0
-226
SCHNApps/forms/mapsViewDialog.ui
SCHNApps/forms/mapsViewDialog.ui
+0
-58
SCHNApps/forms/pluginsDialog.ui
SCHNApps/forms/pluginsDialog.ui
+0
-83
SCHNApps/forms/pluginsViewDialog.ui
SCHNApps/forms/pluginsViewDialog.ui
+0
-55
SCHNApps/forms/schnapps.ui
SCHNApps/forms/schnapps.ui
+103
-0
SCHNApps/include/camera.h
SCHNApps/include/camera.h
+18
-30
SCHNApps/include/colorComboBox.h
SCHNApps/include/colorComboBox.h
+0
-28
SCHNApps/include/controlDock_cameraTab.h
SCHNApps/include/controlDock_cameraTab.h
+56
-0
SCHNApps/include/controlDock_mapTab.h
SCHNApps/include/controlDock_mapTab.h
+63
-0
SCHNApps/include/controlDock_pluginTab.h
SCHNApps/include/controlDock_pluginTab.h
+51
-0
SCHNApps/include/dialogs/cameraViewDialog.h
SCHNApps/include/dialogs/cameraViewDialog.h
+0
-43
SCHNApps/include/dialogs/camerasDialog.h
SCHNApps/include/dialogs/camerasDialog.h
+0
-44
SCHNApps/include/dialogs/mapsDialog.h
SCHNApps/include/dialogs/mapsDialog.h
+0
-40
SCHNApps/include/dialogs/mapsViewDialog.h
SCHNApps/include/dialogs/mapsViewDialog.h
+0
-41
SCHNApps/include/dialogs/pluginsDialog.h
SCHNApps/include/dialogs/pluginsDialog.h
+0
-43
SCHNApps/include/dialogs/pluginsViewDialog.h
SCHNApps/include/dialogs/pluginsViewDialog.h
+0
-41
SCHNApps/include/mapHandler.h
SCHNApps/include/mapHandler.h
+86
-44
SCHNApps/include/mapHandler.hpp
SCHNApps/include/mapHandler.hpp
+72
-30
SCHNApps/include/plugin.h
SCHNApps/include/plugin.h
+16
-73
SCHNApps/include/plugin_interaction.h
SCHNApps/include/plugin_interaction.h
+69
-0
SCHNApps/include/plugin_processing.h
SCHNApps/include/plugin_processing.h
+27
-0
SCHNApps/include/schnapps.h
SCHNApps/include/schnapps.h
+184
-0
SCHNApps/include/types.h
SCHNApps/include/types.h
+11
-10
SCHNApps/include/view.h
SCHNApps/include/view.h
+49
-74
SCHNApps/include/viewButtonArea.h
SCHNApps/include/viewButtonArea.h
+5
-1
SCHNApps/resources/icons/arrow_down.png
SCHNApps/resources/icons/arrow_down.png
+0
-0
SCHNApps/resources/icons/arrow_up.png
SCHNApps/resources/icons/arrow_up.png
+0
-0
SCHNApps/resources/resources.qrc
SCHNApps/resources/resources.qrc
+14
-12
SCHNApps/src/camera.cpp
SCHNApps/src/camera.cpp
+11
-23
SCHNApps/src/colorComboBox.cpp
SCHNApps/src/colorComboBox.cpp
+0
-51
SCHNApps/src/controlDock_cameraTab.cpp
SCHNApps/src/controlDock_cameraTab.cpp
+248
-0
SCHNApps/src/controlDock_mapTab.cpp
SCHNApps/src/controlDock_mapTab.cpp
+294
-0
SCHNApps/src/controlDock_pluginTab.cpp
SCHNApps/src/controlDock_pluginTab.cpp
+196
-0
SCHNApps/src/dialogs/cameraViewDialog.cpp
SCHNApps/src/dialogs/cameraViewDialog.cpp
+0
-113
SCHNApps/src/dialogs/camerasDialog.cpp
SCHNApps/src/dialogs/camerasDialog.cpp
+0
-147
SCHNApps/src/dialogs/mapsDialog.cpp
SCHNApps/src/dialogs/mapsDialog.cpp
+0
-191
SCHNApps/src/dialogs/mapsViewDialog.cpp
SCHNApps/src/dialogs/mapsViewDialog.cpp
+0
-102
SCHNApps/src/dialogs/pluginsDialog.cpp
SCHNApps/src/dialogs/pluginsDialog.cpp
+0
-119
SCHNApps/src/dialogs/pluginsViewDialog.cpp
SCHNApps/src/dialogs/pluginsViewDialog.cpp
+0
-107
SCHNApps/src/main.cpp
SCHNApps/src/main.cpp
+10
-5
SCHNApps/src/mapHandler.cpp
SCHNApps/src/mapHandler.cpp
+70
-10
SCHNApps/src/plugin.cpp
SCHNApps/src/plugin.cpp
+0
-136
SCHNApps/src/plugin_interaction.cpp
SCHNApps/src/plugin_interaction.cpp
+54
-0
SCHNApps/src/plugin_processing.cpp
SCHNApps/src/plugin_processing.cpp
+17
-0
SCHNApps/src/schnapps.cpp
SCHNApps/src/schnapps.cpp
+718
-0
SCHNApps/src/view.cpp
SCHNApps/src/view.cpp
+223
-169
SCHNApps/src/viewButtonArea.cpp
SCHNApps/src/viewButtonArea.cpp
+4
-4
ThirdParty/CMakeLists.txt
ThirdParty/CMakeLists.txt
+1
-0
ThirdParty/OpenNL/CMakeOptions.txt
ThirdParty/OpenNL/CMakeOptions.txt
+3
-2
ThirdParty/OpenNL/src/NL/nl_cholmod.c
ThirdParty/OpenNL/src/NL/nl_cholmod.c
+38
-20
apps_cmake.txt
apps_cmake.txt
+13
-2
include/Algo/ImplicitHierarchicalMesh/subdivision3.hpp
include/Algo/ImplicitHierarchicalMesh/subdivision3.hpp
+250
-42
include/Algo/Modelisation/subdivision.h
include/Algo/Modelisation/subdivision.h
+2
-2
include/Algo/Modelisation/subdivision.hpp
include/Algo/Modelisation/subdivision.hpp
+4
-2
include/Algo/Modelisation/tetrahedralization.hpp
include/Algo/Modelisation/tetrahedralization.hpp
+3
-1
include/Algo/MovingObjects/particle_base.h
include/Algo/MovingObjects/particle_base.h
+5
-0
include/Algo/MovingObjects/particle_cell_2D.h
include/Algo/MovingObjects/particle_cell_2D.h
+4
-0
include/Algo/MovingObjects/particle_cell_2D.hpp
include/Algo/MovingObjects/particle_cell_2D.hpp
+1
-1
include/Algo/MovingObjects/particle_cell_2D_memo.h
include/Algo/MovingObjects/particle_cell_2D_memo.h
+3
-0
include/Algo/MovingObjects/particle_cell_2D_secured.h
include/Algo/MovingObjects/particle_cell_2D_secured.h
+6
-1
include/Algo/MovingObjects/particle_cell_2DandHalf.hpp
include/Algo/MovingObjects/particle_cell_2DandHalf.hpp
+19
-8
include/Algo/MovingObjects/particle_cell_2DandHalf_memo.hpp
include/Algo/MovingObjects/particle_cell_2DandHalf_memo.hpp
+3
-3
include/Algo/Multiresolution/Map3MR/Masks/mcCrackenJoy.h
include/Algo/Multiresolution/Map3MR/Masks/mcCrackenJoy.h
+16
-12
include/Algo/Multiresolution/Map3MR/map3MR_PrimalRegular.h
include/Algo/Multiresolution/Map3MR/map3MR_PrimalRegular.h
+2
-0
include/Algo/Multiresolution/Map3MR/map3MR_PrimalRegular.hpp
include/Algo/Multiresolution/Map3MR/map3MR_PrimalRegular.hpp
+188
-67
include/Algo/Multiresolution/filter.h
include/Algo/Multiresolution/filter.h
+41
-9
include/Algo/Render/GL2/mapRender.h
include/Algo/Render/GL2/mapRender.h
+2
-4
include/Container/attributeMultiVector.h
include/Container/attributeMultiVector.h
+12
-5
include/Container/attributeMultiVector.hpp
include/Container/attributeMultiVector.hpp
+11
-5
include/Topology/generic/attribmap.h
include/Topology/generic/attribmap.h
+8
-1
include/Topology/generic/attribmap.hpp
include/Topology/generic/attribmap.hpp
+3
-2
include/Topology/generic/attributeHandler.h
include/Topology/generic/attributeHandler.h
+25
-7
include/Topology/generic/attributeHandler.hpp
include/Topology/generic/attributeHandler.hpp
+20
-8
include/Utils/textures.hpp
include/Utils/textures.hpp
+3
-3
include/Utils/vbo.hpp
include/Utils/vbo.hpp
+0
-77
include/Utils/vbo_base.h
include/Utils/vbo_base.h
+6
-7
src/Topology/generic/attribmap.cpp
src/Topology/generic/attribmap.cpp
+9
-5
src/Topology/map/map3.cpp
src/Topology/map/map3.cpp
+1
-0
src/Utils/svg.cpp
src/Utils/svg.cpp
+59
-59
src/Utils/vbo.cpp
src/Utils/vbo.cpp
+83
-0
No files found.
Apps/Tuto/show_traversors.cpp
View file @
5b63bed6
This diff is collapsed.
Click to expand it.
Apps/Tuto/tuto_oper2.cpp
View file @
5b63bed6
...
...
@@ -194,7 +194,12 @@ void MyQT::createMap(int n)
m_render_topo
->
setDartWidth
(
4.0
f
);
m_render_topo
->
setInitialDartsColor
(
0.0
f
,
0.0
f
,
0.0
f
);
m_render_topo
->
setInitialBoundaryDartsColor
(
0.0
f
,
0.0
f
,
0.0
f
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
true
);
// nb
#ifdef PRIMAL_TOPO
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
);
#else
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
true
);
#endif
for
(
Dart
d
=
myMap
.
begin
();
d
!=
myMap
.
end
();
myMap
.
next
(
d
))
{
...
...
@@ -213,7 +218,12 @@ void MyQT::createMap(int n)
void
MyQT
::
updateMap
()
{
m_render_topo
->
setInitialBoundaryDartsColor
(
0.0
f
,
0.0
f
,
0.0
f
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
true
);
// nb
#ifdef PRIMAL_TOPO
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
);
#else
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
true
);
#endif
for
(
Dart
d
=
myMap
.
begin
();
d
!=
myMap
.
end
();
myMap
.
next
(
d
))
{
if
(
dm
.
isMarked
(
d
)
&&
(
!
myMap
.
isBoundaryMarked2
(
d
)))
...
...
@@ -229,7 +239,11 @@ void MyQT::updateMap()
void
MyQT
::
cb_initGL
()
{
glClearColor
(
1.0
f
,
1.0
f
,
1.0
f
,
1.0
f
);
m_render_topo
=
new
Algo
::
Render
::
GL2
::
TopoRender
(
0.01
f
)
;
#ifdef PRIMAL_TOPO
m_render_topo
=
new
Algo
::
Render
::
GL2
::
TopoPrimalRender
()
;
#else
m_render_topo
=
new
Algo
::
Render
::
GL2
::
TopoRender
(
0.01
f
)
;
#endif
}
// redraw GL callback (clear and swap already done)
...
...
Apps/Tuto/tuto_oper2.h
View file @
5b63bed6
...
...
@@ -27,6 +27,7 @@
//#define USE_GMAP
//#define PRIMAL_TOPO 1
#include "Topology/generic/parameters.h"
...
...
@@ -36,8 +37,11 @@
#include "Topology/map/embeddedMap2.h"
#endif
#include "Algo/Render/GL2/topoRender.h"
#ifdef PRIMAL_TOPO
#include "Algo/Render/GL2/topoPrimalRender.h"
#else
#include "Algo/Render/GL2/topoRender.h"
#endif
#include "ui_tuto_oper2.h"
#include "Utils/Qt/qtui.h"
...
...
@@ -88,7 +92,11 @@ protected:
DartAttribute
<
VEC3
>
colorDarts
;
// render (for the topo)
Algo
::
Render
::
GL2
::
TopoRender
*
m_render_topo
;
#ifdef PRIMAL_TOPO
Algo
::
Render
::
GL2
::
TopoPrimalRender
*
m_render_topo
;
#else
Algo
::
Render
::
GL2
::
TopoRender
*
m_render_topo
;
#endif
Dart
m_selected
;
Dart
m_selected2
;
DartMarker
dm
;
...
...
Apps/Tuto/tuto_oper3.cpp
View file @
5b63bed6
This diff is collapsed.
Click to expand it.
Apps/Tuto/tuto_oper3.h
View file @
5b63bed6
...
...
@@ -27,6 +27,7 @@
//#define USE_GMAP
//#define PRIMAL_TOPO 1
#include "Topology/generic/parameters.h"
...
...
@@ -36,7 +37,12 @@
#include "Topology/map/embeddedMap3.h"
#endif
#include "Algo/Render/GL2/topo3Render.h"
#ifdef PRIMAL_TOPO
#include "Algo/Render/GL2/topo3PrimalRender.h"
#else
#include "Algo/Render/GL2/topo3Render.h"
#endif
#include "Algo/Render/GL2/topoRender.h"
#include "Algo/Geometry/boundingbox.h"
...
...
@@ -71,7 +77,7 @@ class MyQT: public Utils::QT::SimpleQT
{
Q_OBJECT
public:
MyQT
()
:
m_render_topo
(
NULL
),
m_selected
(
NIL
),
m_selected2
(
NIL
),
dm
(
myMap
),
m_shift
(
0.01
f
),
m_ex1
(
0.9
f
),
m_ex2
(
0.9
f
),
m_ex3
(
0.9
f
),
clip_volume
(
true
)
,
hide_clipping
(
false
)
{}
MyQT
()
:
m_render_topo
(
NULL
),
m_selected
(
NIL
),
m_selected2
(
NIL
),
m_shift
(
0.01
f
),
m_ex1
(
0.9
f
),
m_ex2
(
0.9
f
),
m_ex3
(
0.9
f
),
clip_volume
(
true
)
,
hide_clipping
(
false
)
{}
void
cb_redraw
();
void
cb_initGL
();
...
...
@@ -95,12 +101,15 @@ protected:
Geom
::
BoundingBox
<
PFP
::
VEC3
>
bb
;
// render (for the topo)
#ifdef PRIMAL_TOPO
Algo
::
Render
::
GL2
::
Topo3PrimalRender
*
m_render_topo
;
#else
Algo
::
Render
::
GL2
::
Topo3Render
*
m_render_topo
;
#endif
Algo
::
Render
::
GL2
::
TopoRender
*
m_render_topo_boundary
;
Dart
m_selected
;
Dart
m_selected2
;
std
::
vector
<
Dart
>
m_selecteds
;
DartMarker
dm
;
float
m_shift
;
float
m_ex1
,
m_ex2
,
m_ex3
;
...
...
@@ -136,6 +145,7 @@ protected:
public:
// example of simple map creation
void
createMap
(
int
n
);
void
createMapTets
();
void
updateMap
();
void
importMesh
(
std
::
string
&
filename
);
...
...
Apps/Tuto/tuto_oper3.ui
View file @
5b63bed6
...
...
@@ -150,6 +150,11 @@
<string>
unsewVolumes
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
deleteVolume
</string>
</property>
</item>
</widget>
</item>
<item
row=
"6"
column=
"0"
>
...
...
CMakeLists.txt
View file @
5b63bed6
...
...
@@ -37,7 +37,6 @@ find_package(Boost COMPONENTS regex thread system REQUIRED)
find_package
(
ZLIB REQUIRED
)
find_package
(
LibXml2 REQUIRED
)
find_package
(
GLEW REQUIRED
)
#find_package(SuiteSparse REQUIRED)
IF
(
DEFINED ASSERTON
)
add_definitions
(
-DCGOGN_ASSERT_BOOL=
${
ASSERTON
}
)
...
...
@@ -77,7 +76,6 @@ SET (CGoGN_EXT_INCLUDES
${
ZLIB_INCLUDE_DIRS
}
${
LIBXML2_INCLUDE_DIR
}
${
Boost_INCLUDE_DIRS
}
# ${SUITESPARSE_INCLUDE_DIRS}
)
# define libs for external libs
...
...
@@ -90,9 +88,22 @@ SET (CGoGN_EXT_LIBS
${
Boost_SYSTEM_LIBRARY
}
${
Boost_REGEX_LIBRARY
}
${
Boost_THREAD_LIBRARY
}
# ${SUITESPARSE_LIBRARIES}
)
IF
(
WIN32
)
SET
(
CGoGN_EXT_INCLUDES
${
CGoGN_EXT_INCLUDES
}
${
CGoGN_ROOT_DIR
}
/windows_dependencies/include/suitesparse
)
SET
(
CGoGN_EXT_LIBS
${
CGoGN_EXT_LIBS
}
${
CGoGN_ROOT_DIR
}
/windows_dependencies/lib/suitesparse.lib
${
CGoGN_ROOT_DIR
}
/windows_dependencies/lib/metis.lib
${
CGoGN_ROOT_DIR
}
/windows_dependencies/lib/liblapack.lib
${
CGoGN_ROOT_DIR
}
/windows_dependencies/lib/libblas.lib
)
ELSE
(
WIN32
)
find_package
(
SuiteSparse REQUIRED
)
SET
(
CGoGN_EXT_INCLUDES
${
CGoGN_EXT_INCLUDES
}
${
SUITESPARSE_INCLUDE_DIRS
}
)
SET
(
CGoGN_EXT_LIBS
${
CGoGN_EXT_LIBS
}
${
SUITESPARSE_LIBRARIES
}
)
ENDIF
(
WIN32
)
#optionnal libs
IF
(
WITH_ASSIMP
)
add_definitions
(
-DWITH_ASSIMP
)
...
...
README.TXT
View file @
5b63bed6
*** english version below ***
Dépendences Linux:
installer les paquets suivants:
cmake
cmake-curses-gui libXi-dev libXmu-dev libglew-dev libxml2-dev libboost-all-dev zlib1g-dev qt4-designer qt4-dev-tools uuid-dev libgsl0-dev libsuitesparse-dev
cmake cmake-curses-gui libXi-dev libXmu-dev libglew-dev libxml2-dev libboost-all-dev zlib1g-dev qt4-designer qt4-dev-tools uuid-dev libgsl0-dev libsuitesparse-dev
Pour compiler CGoGN:
- aller dans ThirdParty, cd build, taper "cmake .", puis make ( avec -j x si vous avez x core sur votre machine) suivi de make install
- on compile tout d'abord les bibliothèques third-party :
On peut fixer certaines option pour ne pas tout compiler (cf le README.TXT dans ThirdParty)
cd CGoGN/ThirdParty/build
cmake ..
make (-j x si vous avez x cores)
make install
On peut fixer certaines option pour ne pas tout compiler (cf le README.TXT dans ThirdParty)
On peut aussi compiler en debug en compilant dans un répertoire dont le nom finit par Debug ("buildDebug" par exemple)
- ensuite on compile CGoGN (compile les libs dans CGoGN/lib et des exemples dans CGoGN/bin) :
cd CGoGN/build
cmake ..
make (-j x si vous avez x cores)
Certaines options (booléennes) sont ici aussi disponible:
BUILD_SHARED_LIBS (F) experimental !
WITH_ASSIMP (T)
WITH_NUMERICAL (T)
WITH_ZINRI (T)
WITH_QT (T)
afin de limiter les dépendances et le temps de compilation
FORCE_MR (2)
permet de compiler dans 3 modes: mono-resolution (0), multi-resolution (1)
ONELIB (F)
permet de forcer la compilation en une seule lib (libcgogn.a) au lieu de quatre.
-> certaines options sont disponibles :
BUILD_SHARED_LIBS (F) experimental !
WITH_ASSIMP (T)
WITH_NUMERICAL (T)
WITH_ZINRI (T)
WITH_QT (T)
-> afin de limiter les dépendances et le temps de compilation
- on peut ensuite compiler SCHNApps ainsi que les plugins fournis :
FORCE_MR (0)
-> permet de compiler dans 2 modes: mono-resolution(0), multi-resolution(1)
ONELIB (F)
-> permet de forcer la compilation en une seule lib (libcgogn.a) au lieu de quatre.
- on peut ensuite compiler SCHNApps ainsi que les plugins fournis :
cd CGoGN/SCHNApps/build
cmake ..
make (-j x si vous avez x cores)
Des exemples de données:
- fichiers trianbgz, off, etc
sont accessible à l'adresse suivante:
Des exemples de données (fichiers trianbgz, off, etc..) sont accessible à l'adresse suivante:
https://iggservis.u-strasbg.fr/Data/data.zip
=========================================================================================
ENGLISH VERSION
=========================================================================================
...
...
@@ -49,6 +55,7 @@ install the following packages:
cmake cmake-curses-gui libXi-dev libXmu-dev libglew-dev libxml2-dev libboost-all-dev zlib1g-dev qt4-designer qt4-dev-tools uuid-dev libgsl0-dev libsuitesparse-dev
To compile CGoGN:
- first compile third-party libraries:
cd CGoGN/ThirdParty/build
...
...
@@ -64,26 +71,27 @@ To compile CGoGN:
cmake ..
make (-j x if you have x cores)
Some options are available:
BUILD_SHARED_LIBS (F) experimental !
WITH_ASSIMP (T)
WITH_NUMERICAL (T)
WITH_ZINRI (T)
WITH_QT (T)
to minimize dependencies and compilation time
FORCE_MR (2)
allows the compilation in 3 modes: mono-resolution (0), multi-resolution (1)
ONELIB (F)
allowss to force the compilation in one lib (libcgogn.a) instead of four.
-> some options are available:.
- we can then compile SCHNApps and the provided plugins :
BUILD_SHARED_LIBS (F) experimental !
WITH_ASSIMP (T)
WITH_NUMERICAL (T)
WITH_ZINRI (T)
WITH_QT (T)
-> to minimize dependencies and compilation time
FORCE_MR (0)
-> allows the compilation in 2 modes: mono-resolution(0), multi-resolution(1)
ONELIB (F)
-> allow compilation in one lib (libcgogn.a) instead of four.
- we can then compile SCHNApps and the provided plugins :
cd CGoGN/SCHNApps/build
cmake ..
make (-j x if you have x cores)
Examples of data:
- Trianbgz files, off, etc.
are accessible at the following address:
Examples of data (trianbgz, off, etc.. files) are available at the following address:
https://iggservis.u-strasbg.fr/Data/data.zip
README_VISUAL.TXT
View file @
5b63bed6
...
...
@@ -3,11 +3,11 @@
Compilation sous VisualExpress C++
Prérequis:
Visual Studio ou C++ Express (
au moins 2005, si possible 2010
)
Visual Studio ou C++ Express (
testé avec 2010 express
)
CMake (au moins 2.8)
Unziper le windows_dependencies.zip (http://iggservis.u-strasbg.fr/Data/) a la racine de CGoGN
Installer boost et Qt
Installer boost et Qt
(4.8.x pas de 5.0 pour le moment)
Attention installer les binaires de Qt dans une version de compilateur differente (VS2008/VS2010)
permet d'executer mais pas de debugger !
...
...
@@ -22,6 +22,7 @@ Mettre le chemin de la racine de CGoGN + /ThirdParty pour les sources
Mettre le chemin de la racine de CGoGN + /ThirdParty/build pour le build en release
Mettre le chemin de la racine de CGoGN + /ThirdParty/buildDebug pour le build en debug
Sous windows les 2 versions sont nécessaires.
La suite vaut pour les 2 répertoires:
Cliquer sur Configure
Choisir le bon compilateur (celui de votre version de Visual C++)
...
...
@@ -29,7 +30,8 @@ Modifier les variables en fonctions de ce que vous voulez compiler (README.TXT d
Modifier le CMAKE_PREFIX_PATH si nécessaire (cf remarque dépendances)
Recliquer sur Configure
Cliquer sur Generate
Aller compiler sous visual(en release)
Aller sous visual, charger et compiler les 2 solutions
Ne pas oublier de générer la cible INSTALL (une seule fois)
Pour CGoGN:
Relancer CMake
...
...
@@ -41,8 +43,15 @@ Modifier les variables comme pour ThirdParty (et CMAKE_PREFIX_PATH si nécessair
Recliquer sur Configure
Cliquer sur Generate
Si il ne trouve pas Qt lui remplir la variable QT_QMAKE_EXECUTABLE
Aller dans Visual et double-cliquer sur CGoGN.sln !!
ATTENTION: Problème de link avec QGLViewer en Debug.
Si vous compiler un exemple (tuto1 & viewer) en Debug, il faut modifier
le projet: Proprietés de configuration -> Editeur de liens -> entrée -> Dépendances supplémentaires
et changer le QGLViewer2.lib en QGLViewerd2.lib
Pour que les executables fonctionnent ajouter le chemin vers les dll des dépendances dans la variable
d'environnement path (ou copier les dll dans un répertoire déjà dans le path)
...
...
@@ -53,18 +62,7 @@ changer le CMAKE_PREFIX_PATH (voir ci dessous)
Attention pour Boost le prefix path ne marche pas (utiliser BOOST_ROOT et d'autres si nécessaire)
Compilation 64bits:
La libraries et les exemples sont compilables en 64bit sous Windows.
Testé avec Visual Express C++ 2010 + Windows SDK 7.1
Les dépendances sont accessibles sous http://iggservis.u-strasbg.fr/Data/dependencies64.zip
Attention il faut modifer les projets et choisir Windows7.1SDK sous outils de plateforme
dans configuration/Général, pour utiliser les bons compilateurs et lib associées.
Remarque: gain de performance non négligeable en 64 bits (20/25%)
(Merci à Olivier Génevaux pour son expertise en compilation sous Windows !)
Compilation 64bits: TODO
...
...
@@ -73,7 +71,7 @@ Remarque: gain de performance non négligeable en 64 bits (20/25%)
=========================================================================================
Prerequisites:
Visual Studio and C +
+ Express (at least 2005, possibly
2010)
Visual Studio and C +
+ Express (
2010)
CMake (at least 2.8)
Unzip the windows_dependencies.zip (http://iggservis.u-strasbg.fr/Data/) is the root of CGoGN
...
...
@@ -103,8 +101,8 @@ Change the variables in functions that you want to compile (README.TXT for Third
Edit CMAKE_PREFIX_PATH if necessary (see note dependencies)
Click again on Configure
Click on Generate
Go
compile under visual (in release)
Go
on visual, load and compile the 2 solutions
Do not forgot to generate the target INSTALL (once)
For CGoGN:
...
...
@@ -118,6 +116,10 @@ Click again on Configure
Click on Generate
Go to Visual and double-click on CGoGN.sln!
WARNING: Problem of linking with QGLViewer in Debug
If you compile an example (tuto1 & viewer) in Debug you have to modifiy
the project: Configuration properties -> Linking Editor -> Entries -> Supplementary dependencies
and change QGLViewer2.lib in QGLViewerd2.lib
For running executables you have to add the path to the dll dependencies in the variable
path environment (or copy the dll in a directory already in the path)
...
...
@@ -128,18 +130,4 @@ If you want to use your own versions of dependency (Zlib / glew / Boost / Qt)
CMAKE_PREFIX_PATH change (see below)
Attention to Boost the prefix path does not work (use BOOST_ROOT and others if necessary)
Compiling 64-bit:
The libraries and the examples are compiled in 64bit Windows.
Tested with Visual Express C + + 2010 + Windows SDK 7.1
Dependencies are accessible in http://iggservis.u-strasbg.fr/Data/dependencies64.zip
Caution must be changed and select projects in Windows7.1SDK tools platform
in Configuration / General, to use the correct compiler and lib related.
Note: significant performance gain in 64-bit (20/25%)
(Thanks to Olivier Génevaux for its expertise in compilation under Windows!)
Compiling 64-bit: TODO
SCHNApps/CMakeLists.txt
View file @
5b63bed6
...
...
@@ -129,16 +129,15 @@ SET(SCHNApps_QOBJECT_FILES
${
SCHNApps_ROOT_DIR
}
/include/camera.h
${
SCHNApps_ROOT_DIR
}
/include/mapHandler.h
${
SCHNApps_ROOT_DIR
}
/include/plugin.h
${
SCHNApps_ROOT_DIR
}
/include/plugin_interaction.h
${
SCHNApps_ROOT_DIR
}
/include/plugin_processing.h
${
SCHNApps_ROOT_DIR
}
/include/view.h
${
SCHNApps_ROOT_DIR
}
/include/
window
.h
${
SCHNApps_ROOT_DIR
}
/include/
schnapps
.h
${
SCHNApps_ROOT_DIR
}
/include/viewButtonArea.h
${
SCHNApps_ROOT_DIR
}
/include/dialogs/camerasDialog.h
${
SCHNApps_ROOT_DIR
}
/include/dialogs/pluginsDialog.h
${
SCHNApps_ROOT_DIR
}
/include/dialogs/mapsDialog.h
${
SCHNApps_ROOT_DIR
}
/include/dialogs/cameraViewDialog.h
${
SCHNApps_ROOT_DIR
}
/include/dialogs/pluginsViewDialog.h
${
SCHNApps_ROOT_DIR
}
/include/dialogs/mapsViewDialog.h
${
SCHNApps_ROOT_DIR
}
/include/colorComboBox.h
${
SCHNApps_ROOT_DIR
}
/include/controlDock_cameraTab.h
${
SCHNApps_ROOT_DIR
}
/include/controlDock_pluginTab.h
${
SCHNApps_ROOT_DIR
}
/include/controlDock_mapTab.h
# ${SCHNApps_ROOT_DIR}/include/colorComboBox.h
)
...
...
SCHNApps/Plugins/CMakeLists.txt
View file @
5b63bed6
cmake_minimum_required
(
VERSION 2.8
)
ADD_SUBDIRECTORY
(
importSurface
)
ADD_SUBDIRECTORY
(
importVolume
)
ADD_SUBDIRECTORY
(
differentialProperties
)
ADD_SUBDIRECTORY
(
render
)
ADD_SUBDIRECTORY
(
renderVector
)
ADD_SUBDIRECTORY
(
renderScalar
)
ADD_SUBDIRECTORY
(
renderExplod
)
ADD_SUBDIRECTORY
(
renderTopoSurface
)
ADD_SUBDIRECTORY
(
subdivideSurface
)
#ADD_SUBDIRECTORY(surfaceDeformation)
ADD_SUBDIRECTORY
(
subdivideMRVolume
)
ADD_SUBDIRECTORY
(
surface_import
)
ADD_SUBDIRECTORY
(
surface_render
)
ADD_SUBDIRECTORY
(
surface_renderVector
)
ADD_SUBDIRECTORY
(
surface_differentialProperties
)
ADD_SUBDIRECTORY
(
surface_subdivision
)
SCHNApps/Plugins/renderVector/CMakeLists.txt
deleted
100644 → 0
View file @
34bb63de
cmake_minimum_required
(
VERSION 2.8
)
SET
(
PLUGIN_NAME RenderVector
)
SET
(
PLUGIN_ROOT_DIR
${
SCHNApps_ROOT_DIR
}
/Plugins/renderVector
)
INCLUDE_DIRECTORIES
(
${
PLUGIN_ROOT_DIR
}
/include
${
CMAKE_CURRENT_BINARY_DIR
}
)
file
(
GLOB_RECURSE
PLUGIN_FILES
${
PLUGIN_ROOT_DIR
}
/src/*.cpp
${
PLUGIN_ROOT_DIR
}
/include/*.h
${
PLUGIN_ROOT_DIR
}
/include/*.hpp
)
file
(
GLOB_RECURSE
PLUGIN_UI_FILES
${
PLUGIN_ROOT_DIR
}
/forms/*.ui
)
SET
(
PLUGIN_QOBJECT_FILES
${
PLUGIN_ROOT_DIR
}
/include/renderVector.h
${
PLUGIN_ROOT_DIR
}
/include/renderVectorDockTab.h
)
include
(
${
SCHNApps_ROOT_DIR
}
/Plugins/plugins_cmake.txt
)
SCHNApps/Plugins/renderVector/src/renderVector.cpp
deleted
100644 → 0
View file @
34bb63de
#include "renderVector.h"
#include "mapHandler.h"
namespace
CGoGN
{
namespace
SCHNApps
{
PerMapParameterSet
::
PerMapParameterSet
(
MapHandlerGen
*
map
)
:
positionVBO
(
NULL
),
vectorsScaleFactor
(
1.0
f
)
{
bool
positionFound
=
false
;
QList
<
Utils
::
VBO
*>
vbos
=
map
->
getVBOList
();
for
(
int
i
=
0
;
i
<
vbos
.
count
();
++
i
)
{
if
(
vbos
[
i
]
->
dataSize
()
==
3
)
{
if
(
!
positionFound
)
positionVBO
=
vbos
[
i
];
if
(
vbos
[
i
]
->
name
()
==
"position"
)
// try to select a VBO named "position"
{
positionVBO
=
vbos
[
i
];
positionFound
=
true
;
}
}
}
}
bool
RenderVectorPlugin
::
enable
()
{
m_dockTab
=
new
RenderVectorDockTab
(
m_window
,
this
);
addTabInDock
(
m_dockTab
,
"RenderVector"
);
m_vectorShader
=
new
Utils
::
ShaderVectorPerVertex
();
m_vectorShader
->
setColor
(
Geom
::
Vec4f
(
1.0
f
,
0.0
f
,
0.0
f
,
1.0
f
));
registerShader
(
m_vectorShader
);
connect
(
m_window
,
SIGNAL
(
viewAndPluginLinked
(
View
*
,
Plugin
*
)),
this
,
SLOT
(
viewLinked
(
View
*
,
Plugin
*
)));
connect
(
m_window
,
SIGNAL
(
viewAndPluginUnlinked
(
View
*
,
Plugin
*
)),
this
,
SLOT
(
viewUnlinked
(
View
*
,
Plugin
*
)));
connect
(
m_window
,
SIGNAL
(
currentViewChanged
(
View
*
)),
this
,
SLOT
(
currentViewChanged
(
View
*
)));
return
true
;
}
void
RenderVectorPlugin
::
disable
()
{
delete
m_vectorShader
;