Guillaume Damiand
c660599bed
Add a missing link
2016-11-29 11:43:24 +01:00
Guillaume Damiand
52266f5f82
Ok for LCC doc
2016-11-29 11:43:24 +01:00
Guillaume Damiand
c1ff5763f6
Continue doc of LCC
2016-11-29 11:43:22 +01:00
Guillaume Damiand
101700a2e0
Add figures for GMap doc
2016-11-29 11:43:22 +01:00
Guillaume Damiand
de634dbd87
Doc of GMap and LCC.
2016-11-29 11:43:21 +01:00
Guillaume Damiand
7e3cb2094e
Update also LCC doc accordingly.
2016-11-29 11:43:21 +01:00
Guillaume Damiand
eca1865ad7
Add an example of lcc using GMaps.
2016-11-29 11:43:18 +01:00
Guillaume Damiand
9b8eb9e785
Correction for make_tetrahedron and make_quadrangle for gmaps; modify corresponding methods in LCC to be able to work both for CMaps and GMaps.
2016-11-29 11:43:17 +01:00
Guillaume Damiand
6656ab9f4e
Update doc in header files for make_xxx function in LCC.
2016-11-29 11:43:17 +01:00
Guillaume Damiand
8670c7b150
Update doc of LCC and figures.
2016-11-29 11:43:17 +01:00
Guillaume Damiand
3737af7a44
Add linear cell complex storage for GMaps.
2016-11-29 11:43:15 +01:00
Guillaume Damiand
0e80ecf8c0
Work to be able to use LCC with GMap as underlying DS (nyf)
2016-11-29 11:43:13 +01:00
Guillaume Damiand
fce9c1db1c
Cleanup figures in LCC.
2016-11-29 11:43:10 +01:00
Guillaume Damiand
79febdd8a3
All figures of CMap and LCC are now in svg.
2016-11-29 11:43:00 +01:00
Guillaume Damiand
55f0b69fdf
Remove my previous trick to change the orientation.
2016-11-01 14:33:24 -04:00
Laurent Rineau
3044d512f2
Merge pull request #1511 from gdamiand/CMap_LCC-bugfixes-gdamiand
...
Some bugfixes in CMap and LCC
2016-10-17 10:01:36 +02:00
Guillaume Damiand
9aae106124
Add explicit call to base contructor to avoid warning.
2016-10-12 08:22:37 -04:00
Sébastien Loriot
6ff846a483
add missing CGAL namespace
2016-10-11 15:21:09 +02:00
Guillaume Damiand
7620635cfe
* Bugfix in correct_invalid_attributes in LCC
...
* Remove deprecated code in LCC (that should be removed for CGAL 4.9)
2016-10-06 08:19:04 -04:00
Guillaume Damiand
0073b85d7e
Some bug fixes in CMap and LCC:
...
* Bugfix in Combinatorial_map::copy and Combinatorial_map::swap
* Bugfix in erase dart if automatic attribute are disabled
* Add missing operator= in Linear_cell_complex
* Remove deprecated code in Linear_cell_complex storage (code which was already removed in Combinatorial_map_storage and not in LCC)
* add const for isomorphic function
2016-10-06 08:11:14 -04:00
Laurent Rineau
223c1cf5a4
Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
...
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
Laurent Rineau
3fac1b31f0
Fix typos (and compilation errors!)
2016-10-03 12:12:46 +02:00
Andreas Fabri
cebf2f8bab
include import_from_.. headers in LCC demo
2016-10-03 08:53:28 +02:00
Andreas Fabri
cf8c1a6cdf
Dispatch import functions to Polyhedron, T2, T3
2016-09-30 15:23:15 +02:00
Andreas Fabri
d95e7301da
Fix package Linear_cell_complex: include headers
2016-09-30 15:23:14 +02:00
Sébastien Loriot
7e2ee496de
update project name of cmake scripts of tests
2016-09-08 00:26:37 +02:00
Sébastien Loriot
e78bef8a9c
update project name of demos
2016-09-08 00:13:34 +02:00
Sébastien Loriot
6b338eeb1f
improve the name of projects in cmake scripts of examples
2016-09-08 00:02:55 +02:00
Guillaume Damiand
10469f9c4e
Update with master
2016-05-25 10:58:55 +02:00
Sebastien Loriot
4d56e3ef51
Merge pull request #971 from gdamiand/CMap-global_functions-gdamiand
...
Combinatorial map: remove global functions
2016-05-10 09:26:58 +02:00
Guillaume Damiand
d44b75d192
Update version of boost_gcc
2016-05-10 09:13:32 +02:00
Guillaume Damiand
a06ec250eb
Correct version of gcc to ignore array buffer warnings
2016-05-09 10:16:35 +02:00
Sebastien Loriot
7630d2a6fc
Merge pull request #875 from sloriot/Triangulation_2_and_PMP-fix_Triangulation_2_projection_traits_3
...
PMP: make triangulate_faces works with non filtered kernels
2016-05-05 14:55:11 +02:00
Guillaume Damiand
f8823fd689
remove array-bounds warning for gcc >= 4.9
2016-05-02 17:18:14 +02:00
Guillaume Damiand
afb03a8ae4
Remove the use of deprecated functions.
2016-04-01 22:44:29 +02:00
Guillaume Damiand
0adfd4d380
Add Kernel as inner type of Linear cell complex class.
2016-03-29 22:20:19 +02:00
Guillaume Damiand
ad5a9ee2ed
Add missing include
2016-03-29 22:19:32 +02:00
Guillaume Damiand
de89d2ecad
Ok for graph_traits_Linear_cell_complex.h for test_Euler_operations.
2016-03-28 22:08:21 +02:00
Guillaume Damiand
66fd1789b5
Add a second incremental builder which works as Polyhedron and Surface mesh for surface with boundaries.
2016-03-25 18:32:17 +01:00
Sébastien Loriot
4c29bf1b44
CMAKE_SOURCE_DIR -> CMAKE_CURRENT_SOURCE_DIR
2016-03-24 16:33:46 +01:00
Guillaume Damiand
547ca15400
Demo of lcc must link with glu library
2016-03-23 15:07:18 +01:00
Guillaume Damiand
e24572c942
demo updating for LCC after deprecation of global functions.
2016-03-09 19:00:16 +01:00
Guillaume Damiand
fb4bc44829
examples and tests updating for LCC after deprecation of global functions.
2016-03-09 18:48:29 +01:00
Guillaume Damiand
7f45f5faea
Update LCC following the deprecated global functions of CMap
2016-03-09 17:25:10 +01:00
Clement Jamin
f2c68b25cd
Update CMakeLists.txt of all demos for header-only mode
2016-03-09 17:23:20 +01:00
Sébastien Loriot
881e4d3199
request Core only in examples, tests and demos when really needed
2016-03-07 22:36:57 +01:00
Sébastien Loriot
2d191d6651
commit CMakeLists.txt for all examples and tests
2016-03-07 17:39:36 +01:00
Sébastien Loriot
45406a5296
Merge pull request #788 from bo0ts/Installation-split_config-pmoeller
...
Split CGALConfig.cmake and CGALExports.cmake
2016-03-06 15:36:55 +01:00
Sébastien Loriot
d7e9261d58
hide the filtered projection traits behind the projection traits
...
the selection of the base class is done using Kernel::Has_filtered_predicates
2016-03-02 21:57:54 +01:00
Guillaume Damiand
86ebce9b78
end_XXX now return one dart in incremental builder.
2016-02-26 16:28:14 +01:00
Philipp Möller
4211a4f01e
Globally remove CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS
...
This is a Cmake 2.4.3 variable that isn't even documented anymore.
2016-02-16 17:02:55 +01:00
Laurent Rineau
def3952e0e
Merge pull request #767 from bo0ts/Documentation-no_internal_in_title-pmoeller
...
Remove internal release number from documentation title
2016-02-11 15:42:40 +01:00
Philipp Möller
0a04a3a48f
Use CGAL_DOC_VERSION
2016-02-11 15:37:54 +01:00
Laurent Rineau
8b22743b06
Merge pull request #766 from maxGimeno/LCC_Demo-MSAA_removal-GF
...
Removal of the MSAA in LCC
Conflicts:
GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h
Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp
2016-02-11 15:13:18 +01:00
Maxime Gimeno
9da8afe1f1
Removal of the MSAA in LCC
2016-02-11 14:27:44 +01:00
Maxime Gimeno
0a37521263
Revert "Fix for the context"
...
This reverts commit 552aaa159f .
Conflicts:
Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_viewer_qt.h
2016-02-11 14:16:04 +01:00
Sébastien Loriot
42a363fb3f
revert changes to the cmake script
2016-02-10 09:07:33 +01:00
Maxime Gimeno
bb86ec2ee9
Comment the lines in the CMakeLists
2016-02-09 15:16:59 +01:00
Maxime Gimeno
1191a9ee7a
Fix for LCC example
2016-02-09 15:14:14 +01:00
Maxime Gimeno
552aaa159f
Fix for the context
2016-02-09 14:48:26 +01:00
Sébastien Loriot
72863bfe44
fix doxygen warnings
2016-02-04 21:19:36 +01:00
Sébastien Loriot
e211843b4f
Merge pull request #654 from maxGimeno/FixForMac-GF
...
Demo fix for OS X (fix for #437 )
2016-02-03 14:39:48 +01:00
Andreas Fabri
244c285257
4080 -> 5000
2016-02-01 13:22:17 +01:00
Andreas Fabri
3a36c7f34b
the same lor LCC
2016-02-01 12:38:13 +01:00
Maxime Gimeno
eb867bb810
Addition of a specific function for the MSAA in LCC
2016-01-20 14:35:00 +01:00
Maxime Gimeno
517ff8321a
Fix for LCC_demo
...
- The setSamples(16) was causing a segfault. I moved it in the createOpenGLContext(). If the other demos performances are affected by this, a new function will have to be created.
2016-01-19 17:13:06 +01:00
Philipp Möller
71b4e9c515
Use CGAL_FULL_VERSION in all Doxyfile.in
2015-12-17 16:33:28 +01:00
Philipp Möller
81a8f982dc
Handle the easy INPUT cases
...
If INPUT is just PKG/doc/PKG, handle it automatically.
2015-12-10 17:00:26 +01:00
Maxime Gimeno
7b4267c162
Replacement of cgalRequires
...
-fix for #291
2015-11-23 22:06:06 +01:00
Guillaume Damiand
1f47f46cff
Remove viewer in examples
2015-11-06 17:11:51 +01:00
Guillaume Damiand
c3ab85cabc
Remove useless ;
2015-11-06 09:01:58 +01:00
Guillaume Damiand
418c02b63e
Remove the use of typename outside template class
2015-11-05 07:30:12 +01:00
Guillaume Damiand
e4515eb3be
Enable viewer for example (to remove later, here only for the testsuite)
2015-11-04 11:31:11 +01:00
Guillaume Damiand
ec54248572
reverse the orientation of created cube to have a correct normal orientation.
2015-11-04 11:30:47 +01:00
Guillaume Damiand
a9f2278c5b
Better position for light.
2015-11-04 11:29:59 +01:00
Guillaume Damiand
3f206e9b60
Improve drawing.
2015-11-03 17:36:52 +01:00
Guillaume Damiand
a21da00c9d
Improve drawing
2015-11-02 15:14:50 +01:00
Guillaume Damiand
ef9f1d4973
Merge branch 'LCC-examples_qt5-gdamiand-old' into LCC-examples_qt5-gdamiand
2015-11-02 14:48:46 +01:00
Sebastien Loriot
5d9d9d660d
Merge pull request #450 from gdamiand/CMap-marks_with_exceptions-sbrandel
...
C map marks with exceptions sbrandel
2015-11-02 09:12:42 +01:00
Guillaume Damiand
58d3eb9893
Update the viewer (not yet finished).
2015-10-30 21:32:44 +01:00
Guillaume Damiand
afeb0eb4d2
Do not use using declaration but a typedef.
2015-10-29 07:41:55 +01:00
Guillaume Damiand
d02357fb9c
Remplace int by size_type for mark
2015-10-28 18:56:46 +01:00
Guillaume Damiand
06731095ae
Add using declaration for Exception_no_more_available_mark.
2015-10-28 11:19:02 +01:00
Guillaume Damiand
38a28fd78c
Bug fix: reserve a mark before to use it.
2015-10-16 07:28:43 +02:00
Guillaume Damiand
97f44c5749
Add smoth display mode in LCC demo.
2015-10-02 15:01:19 +02:00
Guillaume Damiand
2ee49ba5f3
Update basic viewer and corresponding examples; remove one example since it is now in the demo.
2015-10-02 14:44:42 +02:00
Guillaume Damiand
558fbb7f04
Improve triangulation method
2015-10-02 12:05:58 +02:00
Guillaume Damiand
43d4380537
Update drawing function to allow to draw faces with holes.
2015-10-01 19:21:47 +02:00
Guillaume Damiand
0f7bb719f3
Merge branch 'CMap-marks_with_exceptions-sbrandel-old' into CMap-marks_with_exceptions-sbrandel
2015-10-01 18:31:45 +02:00
Guillaume Damiand
b5c34bf9cc
Ok for qt5 viewer
2015-10-01 16:55:55 +02:00
Guillaume Damiand
8e39e7e4d7
Merge branch 'LCC-examples_qt5-gdamiand-OLD' into LCC-examples_qt5-gdamiand
2015-10-01 13:41:15 +02:00
Andreas Fabri
6e214c5f4a
remove Qt3 demos and empty dontsubmit files
2015-09-30 12:51:40 +02:00
Laurent Rineau
09766139ec
Fix a warning about moc
...
The warning was:
Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp:0: Note: No relevant classes found. No output generated.
2015-09-17 15:38:28 +02:00
Guillaume Damiand
e2656f9600
Remove glu link in cmake
2015-09-03 12:35:42 +02:00
Guillaume Damiand
9b4b3ee846
More cleanup plus do not recenter the scene at each modification.
2015-09-03 12:32:20 +02:00
Guillaume Damiand
98b36b260e
Update light parameters
2015-08-31 08:18:04 +02:00
Guillaume Damiand
24840dbd5c
Improve drawing code in LCC demo.
2015-08-29 14:43:52 +02:00
Guillaume Damiand
921416603f
Reintegrate LCC demo save/load in the new qt5 version ok.
2015-08-28 14:43:07 +02:00
Guillaume Damiand
600e7b1b30
Start to merge with the new qt5 version of the LCC demo (nyf).
2015-08-28 11:51:48 +02:00
Maxime Gimeno
95f87a3ac5
Depth test problem fix
...
- Calling glEnable(GL_DEPTH_TEST) in the beginning of every draw should solve this problem.
2015-08-13 14:08:12 +02:00
Maxime Gimeno
ee2b0b2011
Transparent facets fix
...
- set the alpha value to 1 in the shaders to insure opaque color.
2015-08-13 11:56:04 +02:00
Maxime Gimeno
52a35d4d8d
Random displaying fix
...
- The bounding box was set before being initialized.
2015-08-13 08:55:10 +02:00
Maxime Gimeno
3a5d0a79fc
Mesa Fix
...
- Replaced the 3.3 context by a 2.1 context
- Set the shaders version to 120
2015-08-10 10:11:29 +02:00
Maxime Gimeno
e413b0c45a
GLSL Version changed
...
- Shaders specify version 140 (opengl 3.1) instead of 330. This should fix the "GLSL 3.30 is not supported" error.
2015-08-06 15:19:36 +02:00
Guillaume Damiand
d3f2e9cba2
LCC viewer uses now qt5.
2015-08-05 18:26:19 +01:00
Laurent Rineau
508b467203
Merge branch 'CGAL-Qt5_support-GF'
2015-08-05 11:23:40 +02:00
Laurent Rineau
55c30d0808
Qt::AA_UseDesktopOpenGL is usable from Qt-5.3 only
2015-08-04 10:55:26 +02:00
Laurent Rineau
cb0bdd3ad2
Remove warnings about unused moc files
...
Should fix #194 .
2015-08-03 16:27:28 +02:00
Maxime Gimeno
1b14d447e5
SEGFAULT Fix
...
- the iterator he_circ was looping wrong. I changed he_circ_end(he_circ) in
he_circ_end = lcc.darts_of_orbit<1>(dartIter).end();
2015-08-03 12:57:45 +02:00
Sébastien Loriot
5d2c892dbe
Merge pull request #149 'lrineau/Polygon_mesh_processing-GF'
...
Add various functions to manipulate polygon meshes
2015-07-17 14:50:56 +02:00
Sébastien Loriot
50595505c4
Merge branch 'Fix_warnings-GF'
...
Fixes warnings in various packages
Successfully tested in CGAL-4.7-Ic-87
Approved by the release Manager
2015-07-17 14:21:21 +02:00
Laurent Rineau
aa72eaa371
Merge pull request #154 from maxGimeno/CGAL-Qt5_support-GF
...
Qt5 support, GSoC 2014
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Qt5_support
In this commit, I have fixed the permissions of the file:
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/points
In this commit, I have also modified:
Installation/changes.html
2015-07-17 14:13:37 +02:00
Sébastien Loriot
10dddcc881
init base class to avoid a warning with clang
2015-07-16 17:45:52 +02:00
Sébastien Loriot
590106f5fc
Changes in the other demos due to Polygon_mesh_processing package (PMP)
2015-07-16 17:27:17 +02:00
Laurent Rineau
04db43556f
Do not warn when Qt5 is not found.
2015-07-13 15:55:41 +02:00
Laurent Rineau
f9917c487e
CMake 2.8.11
2015-07-13 12:36:43 +02:00
Laurent Rineau
15c1469a54
CGAL requires CMake>=2.8.11.
2015-07-10 17:01:42 +02:00
Laurent Rineau
3ec0c69f8f
We want 2.8.10 for all demos
...
Previous versions are not tested by the CGAL daily test suite.
2015-07-09 17:50:22 +02:00
Andreas Fabri
6c46be1d01
static_casts
2015-07-09 13:17:41 +02:00
Maxime Gimeno
278e9d9829
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
...
Conflicts:
Circular_kernel_3/demo/Circular_kernel_3/Circular_kernel_3.cpp
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h
2015-07-08 12:40:14 +02:00
Maxime Gimeno
f76bb19734
Windows fix
...
- add an attribute at the application in the main() function
- add a custom context to the viewer
2015-07-08 12:16:51 +02:00
Sébastien Loriot
1d4358e052
update qt urls
2015-07-08 09:48:45 +02:00
Sébastien Loriot
e199f546d4
remove QT4 specific code
2015-07-07 19:36:04 +02:00
Sébastien Loriot
722abba27b
cosmetic changes to remove mentions of QT4
2015-07-07 18:00:43 +02:00
Andreas Fabri
3c46e5262d
less typenames
2015-07-07 16:45:26 +02:00
Sébastien Loriot
84dfabf3b4
remove REQUIRED keyword for CGAL_Qt5 in demos
...
The handling should be with a status message
2015-07-07 11:23:46 +02:00
Maxime Gimeno
32a8cb7d0c
Changed system fixed.
...
- Problem remaining : OFF aren't displayed when loaded.Scene need an additional scene_changed to display OFFs.
2015-07-07 09:07:04 +02:00
Laurent Rineau
e5bcdc5f3e
Update all CMakeLists.txt
...
- CMake 2.8.11 or later is now required
- GLEW is no longer used by demo/Polyhedron/
2015-07-06 18:14:34 +02:00
Guillaume Damiand
662408b2f8
Improve merge coplanar faces method.
2015-07-01 15:21:35 +02:00
Guillaume Damiand
7f0b73634a
Remove typename outside templace class
2015-07-01 07:28:37 +02:00
Guillaume Damiand
fbfd47896b
Remove the use of glu tesselator to draw non convex faces.
2015-06-30 14:22:53 +02:00
Maxime Gimeno
a0e7a60973
Merge remote-tracking branch 'cgal/master' into CGAL-Qt5_support-GF
...
Conflicts:
Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
Alpha_shapes_3/demo/Alpha_shapes_3/MainWindow.cpp
Alpha_shapes_3/demo/Alpha_shapes_3/Viewer.h
GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
GraphicsView/demo/Bounding_volumes/CMakeLists.txt
GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
GraphicsView/demo/Generator/CMakeLists.txt
GraphicsView/demo/GraphicsView/CMakeLists.txt
GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
GraphicsView/demo/Stream_lines_2/CMakeLists.txt
GraphicsView/demo/Triangulation_2/CMakeLists.txt
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
Mesh_3/demo/Mesh_3/CMakeLists.txt
Mesh_3/demo/Mesh_3/include/CGAL_demo/Scene_item_with_display_list.h
Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_join_and_split_polyhedra_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h
Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
Polyhedron/demo/Polyhedron/Scene_plane_item.h
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
Polyhedron/demo/Polyhedron/Scene_polylines_item.h
Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
Surface_mesher/demo/Surface_mesher/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/MainWindow.cpp
2015-06-30 09:17:26 +02:00
Guillaume Damiand
cf563fa834
Disable non flat rendering; add casts to solve problem of gluTessCallback on win32.
2015-06-25 16:09:51 +02:00
Guillaume Damiand
d67542fb59
Add is_xxx_used in cmap for dart and attributes; add tests in CMap and LCC.
2015-06-22 16:50:56 +02:00
Guillaume Damiand
ff15468079
Remove flag in cmake, pushed by error
2015-06-22 16:02:32 +02:00
Guillaume Damiand
6395db7d5e
Increase the size of the first column.
2015-06-18 09:55:35 +02:00
Guillaume Damiand
a57e127412
Remove warnings
2015-06-17 09:45:59 +02:00
Guillaume Damiand
37b0d2256c
* Better drawing when scene was empty.
...
* Bug fix in triangulate all faces
2015-06-16 12:14:47 +02:00
Guillaume Damiand
0a92fae044
Do not modify the user point of view after each operation.
2015-06-16 08:53:45 +02:00
Guillaume Damiand
da8fbde03c
Bug fix in merge coplanar faces
2015-06-16 08:39:00 +02:00
Guillaume Damiand
d0cb5d35f5
Bug fix when changing the visible property of a volume.
2015-06-16 07:57:45 +02:00
Guillaume Damiand
50fabbec8d
Add delaunay triangulation of faces
2015-06-15 22:59:00 +02:00
Guillaume Damiand
4bae2612d8
* Modify load to not take into account the typeid of attributes
...
* Update the demo to draw non convex faces
2015-06-15 21:14:02 +02:00
Guillaume Damiand
1797dc57e0
* add one more import
...
* bugfix in drawing fuction (to draw a volume in wireframe)
2015-06-15 16:18:05 +02:00
Guillaume Damiand
1867f5b096
Add save/load in the demo.
2015-06-15 14:53:00 +02:00
Sylvain Brandel
25b2727381
mark type modified from int to size_type, exception thrown in get_new_mark and test added in the test-suite
2015-06-12 15:11:04 +02:00
Laurent Rineau
fae635d2fb
Merge pull request #73 from afabri/CGAL-Qt_no_keywords-GF
...
All Qt4-based demos now use `-DQT_NO_KEYWORDS`
2015-05-26 12:32:40 +02:00
Guillaume Damiand
98bbdbfc2d
Move functor that detect non void attributes and point in CGAL namespace (before they were in internal); add a missing void typedef.
2015-05-15 19:58:37 +02:00
Andreas Fabri
c5d196f78c
remaining demos
2015-05-06 18:53:44 +02:00
Maxime Gimeno
8fc89ebf86
WIP : non-triangle facets management
...
- Sometimes at run time nothing is displayed
for the entire life of the program, sometimes
it's ok but a message is displayed about the
scene radius which is negative
- Voronoi crashes for points sets in 3D (wrong map,
darts xxx does not have a vertex or something similar)
and displays nonsense for 2D set points
2015-04-10 14:29:05 +02:00
Maxime Gimeno
7b2f0ebe89
WIP : Upgrade to OpenGL 3 with Qt wrappers
...
- de-activated the light for the points and lines
- rendering with shaders
- need of non-triangle facets management
2015-04-10 09:43:21 +02:00
Sylvain Brandel
41464f142f
type of boolean marks modified from int to size_type in both Combinatorial_map and Linear_cell_complex
2015-04-01 15:36:34 +02:00
Maxime Gimeno
60b47f0978
Succesfully upgraded to Qt5
2015-04-01 12:18:59 +02:00
Pranav
0310953938
undo a redundant change in import_from_triangulation_3
2015-04-01 11:02:47 +05:30
Pranav
78dd583dac
fixes issue of infinite vertex in import_from_triangulation_3
2015-03-31 14:18:41 +05:30
Maxime Gimeno
52dc3b265d
Merge remote-tracking branch 'remotes/cgal-public-dev/gsoc2014-CGAL-Qt5_support-vialon' into to-qt5
...
All CMake files modified by the branch 'gsoc2014-CGAL-Qt5_support-vialon' have been reset.
Conflicts:
GraphicsView/demo/Polygon/CMakeLists.txt
GraphicsView/src/CGAL_Qt4/CMakeLists.txt
GraphicsView/src/CGAL_Qt4/GraphicsView.qtmoc.cmake
Installation/cmake/modules/CGALConfig_binary.cmake.in
Installation/cmake/modules/CGALConfig_install.cmake.in
Installation/cmake/modules/CGAL_Macros.cmake
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp
Mesh_3/demo/Mesh_3/CMakeLists.txt
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_edit_polyhedron_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_join_polyhedra_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt
Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_average_spacing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_inside_out_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_local_spacing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_off_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_smoothing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_helper.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene.cpp
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
2015-03-30 16:02:51 +02:00
Guillaume Damiand
93ceb66149
Remove -Wall for demo
2015-03-04 13:36:53 +01:00
Guillaume Damiand
c0e4987190
Add wall option for lcc demo
2015-03-03 11:13:25 +01:00
Guillaume Damiand
fd4162a5a1
Bug fix in size function in ranges
2015-03-03 10:37:37 +01:00
Guillaume Damiand
2ee8f25ba6
Update the undocumented function write_off to allow the export of mesh with dimension higher than 2
2015-02-27 13:57:52 +01:00
Sylvain Brandel
9a6ed32a15
Merge branch 'Combinatorial_map-update_attributes-sbrandel'
...
- corresponding to small feature "Combinatorial map update attributes"
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Combinatorial_map_update_attributes
- succesfully tested, release number CGAL-4.6-lc-99
- Approved by the Release Manager
Conflicts:
Installation/changes.html
2015-01-08 14:48:47 +01:00
Guillaume Damiand
e2c433bd7e
One more remove^Crailing whitespace.
2015-01-06 15:53:51 +01:00
Guillaume Damiand
60c9eb8cbc
Remove trailing whitespace.
2015-01-06 15:52:41 +01:00
Guillaume Damiand
4d6a8573f5
Add one example.
2015-01-06 12:24:50 +01:00
Guillaume Damiand
31f97645d9
Finalize doc + example.
2015-01-05 18:37:50 +01:00
Guillaume Damiand
090f2f5cfd
Remove warning
2015-01-02 18:50:49 +01:00
Guillaume Damiand
32464de4a5
Update demo for Menger, Sierpinski Carpet and Sierpinski Triangle.
2014-12-28 17:15:02 +01:00
Guillaume Damiand
237c4b87fb
Remove warnings.
2014-12-27 20:12:51 +01:00
Guillaume Damiand
029724ab67
Add example file
2014-12-25 08:20:52 +01:00
Guillaume Damiand
d851f35651
Remove warnings; wrong use of typename and template in viewer; default argument for example.
2014-12-25 08:20:00 +01:00
Guillaume Damiand
69b53d262d
Improve demo drawing.
2014-12-24 09:18:55 +01:00
Guillaume Damiand
34e9139cde
Update viewers.
2014-12-24 08:19:09 +01:00
Guillaume Damiand
bdc0dee6ce
Update operations to use are_attributes_automatically_managed
2014-12-23 22:15:49 +01:00
Guillaume Damiand
0860cf5012
Remove trailing whitespaces
2014-12-23 21:52:15 +01:00
Guillaume Damiand
c9345af46b
add the new function in Linear cell complex class.
2014-12-23 21:51:04 +01:00
Guillaume Damiand
882c6033df
Bug fix; optimize merge volume operations.
2014-12-23 21:07:53 +01:00
Guillaume Damiand
919bf8af74
Cleanup + some optimizations.
2014-12-23 09:34:09 +01:00
Sylvain Brandel
08af113c95
Adding linear_cell_complex_3_attributes_management.cpp example
2014-12-12 15:41:23 +01:00
Sylvain Brandel
b0591661fd
Adding example linear_cell_complex_3_attributes_management.cpp
2014-12-12 15:38:14 +01:00
Sylvain Brandel
1cb63c386b
Modification of the names of attributes management functions
2014-12-05 16:03:44 +01:00
Andreas Fabri
2916850771
use iformat for reading doubles
2014-11-26 16:53:50 +01:00
Aurélien Vialon
df9e315536
Correction of some problem (SDK Windows, REQUIERED thing...) and add of comments for findQt5.cmake.
2014-08-15 02:57:48 +02:00
Aurélien Vialon
f1f6218ca7
Fix of some bugs with Arrangement on surface 2 and others demonstrations.
...
Improvement of some comentaries.
Change of findQt5.cmake flags using.
2014-08-14 02:15:02 +02:00
Aurélien Vialon
2d65524aea
All last demonstrations ported to Qt4or5. Need to check working of it on Linux.
2014-08-12 22:12:42 +02:00
Aurélien Vialon
7f408374a1
Modification of LCC CMakeList to make the Qt version missing appears.
2014-08-05 20:13:45 +02:00
Aurélien Vialon
6df9530094
All GraphicView demonstrations ported to the new Qt inclusion way.
...
Change of Qt4or5 variables names.
Now: QT_VERSION => contains "QtX", with x 4 or 5 depending of the version wanted by the user.
USE_QT_VERSION => variable to force the version of Qt wanted. If this variable is set, the Qt Choice drop-down menu doesn't appear on CMake-gui.
QT_VERSION_USED => number of Qt version wanted (4 or 5).
QT4 => TRUE if Qt4 chosen.
QT5 => TRUE if Qt5 chosen.
2014-08-05 18:13:39 +02:00
Aurélien Vialon
9a1461442b
Some bug correction for new Qt inclusion way.
...
Following demonstrations ported to Qt4or5 way :
- Polyhedron
- Linear Cell Complex
- Mesh_3
- Periodic_3_Triangulation
- Periodic_Llyod_3
- Surface_reconstruction_point_3
2014-08-04 20:16:44 +02:00
Aurélien Vialon
0a457c4b03
Correction of some bug caused by the new find_package way of Qt (Qt4or5) with the Qt4 support.
2014-08-02 14:59:49 -07:00
Aurélien Vialon
46c8926854
New way to chose Qt version for projects configuration.
...
Now, we have choice between "WITH_CGAL_Qt4" and "WITH_CGAL_Qt5" (like before because differents CGAL_QtX sources folders return).
Once the libCGALQt4 or libCGALQt5 configured, an cmake config variable "CGAL_QT_RECENT" allow us to know what is the more recent libCGAL_QtX configured.
Automaticaly,the demonstrations chose this recent version of Qt to build their project (even if a Qt version choice is proposed during CMake configuration)
During CMake configuration, when the user change the version of libCGAL_QtX, that change automaticaly the Qt version of find_package(QtX)
Now Qt4or5 is the thing allowing the choice between Qt4 and Qt5 (find_package(CGAL COMPONENT Qt4or5) or find_package(Qt4or5))
2014-08-02 01:37:41 +02:00
Aurélien Vialon
6784800dd1
Fusion of CGAL_Qt4 and CGAL_Qt5 into just one CGAL_Qt.
2014-07-31 22:41:44 +02:00
Laurent Rineau
3deb8e7910
Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF
...
Create an integration branch for 'Mesh_3-compare_index-GF': a new branch
created from 'master', where I merged the previous version of
'Mesh_3-compare_index-GF'.
There was a conflict with two features recently merged into 'master' for
CGAL-4.5:
- the move of two files from include/CGAL/Mesh_3/ to include/CGAL/. See
the small feature:
http://cgal.org/wiki/Features/Small_Features/New_constructor_in_Label_mesh_domain_3_and_new_function_wrapper
- parallelism for Triangulation_3 and Mesh_3:
http://cgal.org/wiki/Features/Parallel_Mesh_3
Conflicts:
Combinatorial_map/include/CGAL/Cell_attribute.h
Mesh_3/include/CGAL/Implicit_mesh_domain_3.h
Mesh_3/include/CGAL/Labeled_image_mesh_domain_3.h
Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
Mesh_3/test/Mesh_3/test_meshing_3D_image.cpp
Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
Mesh_3/test/Mesh_3/test_meshing_polyhedron_with_features.cpp
Polyhedron/demo/Polyhedron/Polyhedron_type.h
STL_Extension/include/CGAL/Compact_container.h
STL_Extension/test/STL_Extension/test_Compact_container.cpp
I also modified the following files during the conflict resolution:
Linear_cell_complex/include/CGAL/Cell_attribute_with_point.h
Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
2014-07-18 15:47:14 +02:00
Aurélien Vialon
a3a84ce2e8
Fix attempt of git problem + Periodic_3_triangulation_3 and Periodic_Llyod_3 demonstrations ported.
2014-07-11 19:22:13 +02:00
Laurent Rineau
e4b033e964
Add/remove #include
...
- I remove <CGAL/basic.h> when I see it, in favor of <CGAL/config.h>.
- <CGAL/ipower.h> is needed for CGAL::ipower
- <ctime> is needed for std::time
2014-06-26 19:10:06 +02:00
Aurélien Vialon
aee9e4eb24
Commit of new demonstrations porting.
2014-06-26 14:38:23 +02:00
Sylvain Brandel
d62a535fd7
minor addons in the code, not in the API
2014-06-13 16:02:55 +02:00
Aurélien Vialon
5be86812ea
Merge branch 'gsoc2014-CGAL-Qt5_support-vialon' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2014-CGAL-Qt5_support-vialon
...
Conflicts:
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
2014-06-12 22:16:31 +02:00
Aurélien Vialon
956bdabe0e
Addition of find_package(Qt5) file and command into CMakeList of LCC, Triangulation_3 and Surface_mensher demonstrations.
2014-06-12 21:46:52 +02:00
Aurélien Vialon
6ec9415dc1
Demonstrations LCC and Trigulation_3 and surface mesher working.
2014-06-12 14:34:19 +02:00
Sylvain Brandel
ec61d7cdc0
Updating new branch with modified and new files, in accordance with provided features
2014-06-03 11:22:47 +02:00
Sylvain Brandel
4d34b88770
Updating new branch with modified and new files, in accordance with provided features
2014-06-03 11:15:08 +02:00
Aurélien Vialon
08685b683e
Merge branch 'gsoc2014-CGAL-Qt5_support-vialon' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2014-CGAL-Qt5_support-vialon
...
Conflicts:
GraphicsView/src/CGAL_Qt5/CMakeLists.txt
GraphicsView/src/CGAL_Qt5/resources.cpp
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
2014-06-02 00:55:05 +02:00
Aurélien Vialon
75dcf91cc9
Suppression de code superflu dans le CMakeLists de la demonstration de LinearCellComplex.
2014-06-02 00:46:23 +02:00
Aurélien Vialon
5f09ccde1a
Compilation effective de la demonstration Linear Cell Complex. Commencement du portage de Triangulation_3.
2014-06-01 22:46:14 +02:00
Aurélien Vialon
1f669ad498
Update Support for Qt5 project.
2014-05-29 12:07:42 +02:00
Clement Jamin
239b6d0932
Merge branch 'STL_extension-Compact_container_as_vector-cjamin-old' into STL_extension-Compact_container_as_vector-cjamin
2014-04-16 14:14:24 +01:00
Guillaume Damiand
7749eb75d5
Remove unused parameter when tests are not traced.
2014-04-08 09:27:19 +02:00
Guillaume Damiand
3ab46250db
Reinit always ref counting when creating attribute. VC12 does not use the specialized version for copy constructor but always the generic one.
2014-04-07 19:53:06 +02:00
Laurent Rineau
29f28936a0
Revert "Add minimal example showing the vc12 bug (?)"
...
This reverts commit 907a2a3130 .
2014-03-31 17:00:16 +02:00
Guillaume Damiand
907a2a3130
Add minimal example showing the vc12 bug (?)
2014-03-27 09:41:04 +01:00
Sébastien Loriot
9114db9085
restore figure source files removed in 0fa2cacb
...
| commit 0fa2cacb60
| Author: Sébastien Loriot <sebastien.loriot@cgal.org>
| Date: Tue Dec 3 17:27:02 2013 +0100
|
| remove doc_tex documentation (including developer manual) and old manual tools
2014-02-10 14:54:23 +01:00
Clement Jamin
28c5fde142
Add an increment policy to the Compact_container, and an operator[]
2013-12-20 15:03:37 +01:00
Sébastien Loriot
0fa2cacb60
remove doc_tex documentation (including developer manual) and old manual tools
2013-12-03 17:27:02 +01:00
Guillaume Damiand
8e8ab82527
Merge branch 'CMap_no_static_for_null_dart_handle-gdamiand'
...
null_dart_handle is no longer static; implies to move several methods from Dart concept into CMap concept. This will simplify the changing of the underlying container in the near future.
Small feature Combinatorial map dart attribute pre-approved in May 2013.
Approved by the release manager.
2013-11-28 08:22:40 +01:00
Guillaume Damiand
60e9c235af
typo
2013-11-26 17:29:31 +01:00
Guillaume Damiand
e42f41a615
Small modif in explanations of modifications.
2013-11-22 08:00:00 +01:00
Guillaume Damiand
db7c14cc58
* Document the deprecated function in Dart, CMap concept and LCC class;
...
* Add paragraph in changes.html;
* Bugfix in Linear_cell_complex_constructors for lcc without 2-attributes.
2013-11-21 10:23:24 +01:00
Guillaume Damiand
95dd472779
Remove trailing whitespace.
2013-11-19 16:38:13 +01:00
Guillaume Damiand
c34014bcf7
Doc update.
2013-11-19 16:31:53 +01:00
Guillaume Damiand
b3a7330a33
Remove function get_attribute_of_dart which is useless.
2013-11-19 15:42:51 +01:00
Guillaume Damiand
96f3835d0a
Remove null vector in traits (pb with Kernel_d ?)
2013-11-19 07:30:43 +01:00
Guillaume Damiand
44687b4f5d
Add option allowing to trace the tests in LCC.
2013-11-16 18:22:36 +01:00
Guillaume Damiand
42959d525f
Add missing typedef
2013-11-14 13:25:45 +01:00
Guillaume Damiand
cd3b457f67
Modif in CMakeList in LCC examples.
...
Trivial bug fix for master.
2013-11-14 11:59:30 +01:00
Guillaume Damiand
ddefa1f60c
Remove warning
2013-11-14 08:39:34 +01:00
Guillaume Damiand
08b29d689f
Remove trailing whitespace.
2013-11-13 17:42:37 +01:00
Guillaume Damiand
3766e7c8e6
Cleanup in benchmarks
2013-11-13 17:41:35 +01:00
Guillaume Damiand
61d6236b60
Use null_handle instead of NULL everywhere internally to simplify the future possible version with index.
2013-11-13 17:32:46 +01:00
Guillaume Damiand
e6647d3751
Add benchmarks for lcc.
2013-11-13 13:50:35 +01:00
Guillaume Damiand
53f02ea00d
Add storage classes (forgotten in the previous commit)
2013-11-13 13:49:59 +01:00
Guillaume Damiand
dccdec40a5
Combinatorial map with no static dart_null_handle.
...
This is a copy from the branch CMap_no_dart-gdamiand by keeping only the part with dart_handle.
The modifications are the ones given in the small feature Combinatorial map dart attribute.
2013-11-12 22:27:44 +01:00
Guillaume Damiand
cfad121d1a
Remove a useless #include
...
Approved by the Release Manager
2013-09-05 10:28:00 +02:00
Laurent Rineau
bc03aaf30b
Put doc/ in the global dont_submit file
2013-08-20 10:57:03 +02:00
Sébastien Loriot
143a2181b3
add latex format for \imagei doxygen command
...
perl -pe 's/^(\s*)\\image\s+html\s+(.*)\s*$/$1\\image html $2\n$1\\image latex $2\n/' -i
2013-07-25 11:50:53 +02:00
Sébastien Loriot
74a1ac055e
remove pdf files from doxygen doc include path
2013-07-25 11:15:18 +02:00
Guillaume Damiand
d2e409487e
Bug fix in close operation.
2013-07-04 16:55:53 +02:00
Guillaume Damiand
6653320136
Tests for reverse orientation.
...
Bugfix: initialization of internal::Test_is_same_attribute_functor<Self, Map2>::value.
Add text in changes.html.
2013-06-24 10:27:26 +02:00
Guillaume Damiand
5cf231d998
add tests to verify that reverse(reverse(map))=Id
2013-06-23 21:29:07 +02:00
Guillaume Damiand
37d7b8ef0f
Merge branch 'Combinatorial_map-reverse_orientation-kenohori-old' into Combinatorial_map-reverse_orientation-kenohori
2013-06-23 21:02:11 +02:00
Guillaume Damiand
444ba939a8
Dynamic attributes for onmerge and onsplit.
...
Copy of master, and integrations of modifs done in the branch Combinatorial_map_dynamic_onxxxfunctors-gdamiand. Add an example in map_3_dynamic_onmerge.cpp.
2013-06-16 20:48:01 +02:00
Guillaume Damiand
98a4e30f34
Merge branch 'Combinatorial_map_copy2-gdamiand'
...
Approved by the release manager
2013-06-14 13:33:46 +02:00
Sébastien Loriot
716f87d2d7
rename Hidden_type to unspecified_type and update its description
2013-06-13 18:48:58 +02:00
Guillaume Damiand
7f7788bd84
Small corrections on reverse orientations; reformating; start to add tests
2013-06-13 11:14:03 +02:00
Guillaume Damiand
eabe898d25
Initialize bbox in Viewer (default initialization does not work when using std::array)
2013-06-11 09:10:00 +02:00
Guillaume Damiand
a4e392b552
Copy of CMap: ok for code and test suite.
2013-06-05 16:16:02 +02:00
Guillaume Damiand
035ff356b6
Better solution for lcc copy
2013-06-04 18:27:13 +02:00
Guillaume Damiand
6e7babc14b
copy cont
2013-06-04 13:23:43 +02:00
Guillaume Damiand
1cc9540daf
copy cont
2013-06-03 22:08:57 +02:00
Guillaume Damiand
6cc05e3920
wip copy
2013-06-03 18:50:35 +02:00
Guillaume Damiand
13a1bf5903
cont...
2013-06-03 09:10:44 +02:00
Guillaume Damiand
6fca991923
Copy constructor for cmap cont
2013-06-02 21:07:33 +02:00