songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
113,709 Commits 3 Branches 156 Tags 962 MiB
Commit Graph

301 Commits

Author SHA1 Message Date
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
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
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 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 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 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
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
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
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 60c9eb8cbc Remove trailing whitespace. 2015-01-06 15:52:41 +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 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 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 1cb63c386b Modification of the names of attributes management functions 2014-12-05 16:03:44 +01:00
Guillaume Damiand 63731a1df3 Remove the use of index_to function in the demo. 2014-10-06 13:25:42 +02:00
Guillaume Damiand 54b4e8028f Index version. 2014-09-18 16:59:19 +02: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 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 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
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 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 d2e409487e Bug fix in close operation. 2013-07-04 16:55:53 +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 07ec5d15f8 Remove debug flags for LCC-demo in CMakeLists.txt 2013-02-21 08:55:35 +01:00
Guillaume Damiand bf70c5b8e5 * Bug fix in is_sewable for i>3. 
* replace some assert by CGAL_assertion.
* add composition of beta, static version when no c++11.
 2013-02-15 13:25:51 +01:00
Guillaume Damiand 450a07786b Ok for group/degroup and operations. 
* clarify all the tests of group/ungroup cases for non void attributes
* create specialized functors allowing to consider all the different cases
  (group two edges along their two extremities, only the first or the second...)
* make many cleanup to move functors in different files, and to comment them
* add namespace before global functions

Still to do: sewable for dim>3 (build the isomorphism); try to improve onsplit
  test by testing only one out of two modified darts; add a parameter to
  operations to do not test group/ungroup; do a functor which updates the
  attributes of all the map (avoid do make many small tests, and do only one
  big test once).
 2013-02-14 16:27:51 +01:00
Guillaume Damiand 6035180c7a cont... 2013-02-13 22:17:09 +01:00
Guillaume Damiand 29039d2fde wip split... 2013-01-29 16:30:43 +01:00
Guillaume Damiand 7f6cf79490 Onsplit again... 2013-01-28 22:13:56 +01:00
Sébastien Loriot 82b2ebc865 apply the cpp0x namespace renaming in all files 2012-12-19 11:33:17 +01:00
Guillaume Damiand 4ab6143652 Merge branch 'master' of ssh://scm.cgal.org/var/git/cgal 2012-11-28 21:37:27 +01:00
Guillaume Damiand 703e5d4149 Remove warnings. 
Unused typedef, variable; unitialized type.
 2012-11-28 10:10:48 +01:00
Guillaume Damiand 2e8a492d4d Typo in messages 2012-11-22 19:26:10 +01:00
Laurent Rineau 2db4effa7e CMake: Fix the handling of cmake_policy 
That is a followup-to my commit last year:
  | ------------------------------------------------------------------------
  | r63198 | lrineau | 2011-04-28 19:45:22 +0200 (Thu, 28 Apr 2011) | 5 lines
  | 
  | Try to fix my last revision about cmake_policy, with CMake-2.6.x
  | 
  | CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
  | x.y.z is greater than the current CMake version.
  | 
  | ------------------------------------------------------------------------

The following check:
  if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
is useless just after a call to:
 cmake_minimum_required(VERSION 2.6.2)



The script used to fix that was:


#!/usr/bin/env perl

$replacement=<<'END';
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
  cmake_policy(VERSION 2.8.4)
else()
  cmake_policy(VERSION 2.6)
endif()
END

while(<>) {
    if(/if\("\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6\)/) {
        while(<>) {
            if(/^endif\(\)/) {
                print "$replacement";
                while(<>) {
                    print;
                }
                exit 0
            }
        }
    }
    print;
}
 2012-08-22 12:35:03 +00:00
Guillaume Damiand bf0d1025eb Revert last commit: cgal is really too rigid... 2012-07-17 08:56:13 +00:00
Guillaume Damiand 46f16de7c9 Add operator += in BBox classes (more or less a trivial bug-fix). 2012-07-17 08:18:59 +00:00
Guillaume Damiand ad06e50196 Remove a warning 2012-07-06 05:09:00 +00:00
Guillaume Damiand 49780518f2 Remove some warnings 2012-07-05 13:39:34 +00:00
Guillaume Damiand 44d29a5c8f * Add a second subdvision method in LCC demo 
* Add two basic usefull functions (internal as undocumented)
* Add an example showing how to customize the type of point used in LCC
 2012-07-02 09:20:14 +00:00
Guillaume Damiand 82fe54b829 Warnings 2012-05-10 11:27:30 +00:00
Guillaume Damiand 1041faed99 More warnings 2012-05-09 11:25:38 +00:00
Guillaume Damiand 084dc9e99c Small errors and warning 2012-05-09 10:45:32 +00:00
Guillaume Damiand 71c334496c Add timers in LCC demo. 2012-05-05 07:03:14 +00:00
Guillaume Damiand 39f29392b0 Remove a warning 2012-04-05 06:59:46 +00:00
Guillaume Damiand 4e1e4e3739 Remove warnings and replace pow by CGAL::ipow 2012-04-03 07:41:31 +00:00
Guillaume Damiand dee0350bd3 Demo... 2012-04-01 19:37:45 +00:00
Guillaume Damiand df1af8c5e4 Extend filled volumes 2012-03-30 14:43:40 +00:00
Guillaume Damiand 002ca688a3 Reinit the dialog box to create several menger sponges 2012-03-30 14:23:17 +00:00
Guillaume Damiand de2244f46d Demo ok for menger v2 2012-03-30 14:01:27 +00:00
Guillaume Damiand c61f107354 Demo... 2012-03-30 11:00:40 +00:00
Guillaume Damiand f04bc65cf0 Wip refactoring demo 2012-03-29 19:55:20 +00:00
Guillaume Damiand 2e79d76bbe Wip refactoring the demo. 2012-03-29 13:39:14 +00:00
Guillaume Damiand bc1faf125e Remove some warnings 2012-03-28 11:30:12 +00:00
Guillaume Damiand 60476a44fa LCC demo improve 3D subdivision 2012-03-26 20:13:07 +00:00
Guillaume Damiand e33465fa33 Improve the flip edge method (avoid remove and insert edge) 2012-03-26 16:07:17 +00:00
Guillaume Damiand be0b67ba72 Create menger sponge is not modeless. 2012-03-26 14:53:13 +00:00
Guillaume Damiand be004894bc Create mesh is now modeless 2012-03-26 13:39:58 +00:00
Guillaume Damiand 72a62b217c cleanup 2012-03-26 12:49:54 +00:00
Guillaume Damiand 1651561609 Menger demo is ok 2012-03-26 12:30:53 +00:00
Guillaume Damiand 99b0a3cd56 Menger demo: ok for remove edges. 2012-03-26 11:44:53 +00:00
Guillaume Damiand 108f7a330e Modification of the edge removal 2012-03-26 10:16:16 +00:00
Guillaume Damiand 5638f518f3 Update dialog box; start menger subdivision to 0. 2012-03-26 07:46:54 +00:00
Guillaume Damiand 98db531bdf Wip on menger sponge demo to decrease the resolution. 2012-03-23 16:34:33 +00:00
Guillaume Damiand db7fb1e941 Modify name of slots to use qt auto connect. Add function allowing to merge all connected volumes. 2012-03-23 13:44:08 +00:00
Guillaume Damiand 8508f48c4d Menger increase level ok 2012-03-23 12:05:36 +00:00
Guillaume Damiand c243971b40 V1 for menger sponge. 2012-03-23 09:28:20 +00:00
Laurent Rineau 3c9313ae52 Rename Linear_cell_complex_3.cpp to Linear_cell_complex_3_demo.cpp 
That way, the automatically generated cgal_test script will work.
 2012-01-24 18:39:05 +00:00
Laurent Rineau 08fa2f98c9 Rename the target Linear_cell_complex_3 to Linear_cell_complex_3_demo 
On Windows, CMake makes the difference between the target
linear_cell_complex_3 (from examples) and Linear_cell_complex_3 (from
demo). But those two targets only differ by the case, and that makes
a confusion at the level of nmake.
 2012-01-20 15:03:37 +00:00
Laurent Rineau 36aab7376c Fix the initialization of CGAL Qt resources, on Windows platforms 2012-01-16 10:09:33 +00:00
Guillaume Damiand 9c203dec50 Remove warnings + useless data file. 2011-12-28 14:03:24 +00:00
Guillaume Damiand 8496ccedd0 Remove a warning 2011-12-23 07:43:26 +00:00
Guillaume Damiand ecbc71a4d7 Remove some warnings. 2011-12-22 07:06:55 +00:00
Guillaume Damiand 5a0c179699 Remove typename outside template class. Replace int by uint to avoid a warning. 2011-12-21 07:26:28 +00:00
Guillaume Damiand aa7cd239a0 Demo is now able to compute voronoi 3D. 2011-12-20 15:30:25 +00:00
Guillaume Damiand ce8b663b83 * Add functions to extend the visible volumes to adjacent ones. 
* Modification of the way that properties are associated with volumes.
 2011-12-20 14:51:29 +00:00
Guillaume Damiand 4c432aad97 Linear cell complex demo. 2011-12-19 16:08:19 +00:00
Guillaume Damiand 20ce6ad41e Remove warnings 2011-11-17 10:32:29 +00:00
Guillaume Damiand 5fbd84abf6 Update CMakeLists.txt of the demo. 2011-11-17 09:52:21 +00:00
Guillaume Damiand 173b240519 Remove a warning. 2011-11-11 06:41:56 +00:00
Guillaume Damiand e16a6a252f Remove warning. Update CmakeLists. 2011-11-09 10:46:03 +00:00
Guillaume Damiand aed76961bc Remove a warning. 2011-11-09 09:19:06 +00:00
Guillaume Damiand f0a94e2b9c Modif in demo. 2011-11-08 19:45:52 +00:00
Guillaume Damiand a4dd7e4167 Update the demo. 2011-10-24 10:03:33 +00:00
Guillaume Damiand 34f7291fa4 Add the Linear_cell_complex directory by copy of the previous branch in order to conserv the history 2011-10-14 17:53:30 +00:00
Guillaume Damiand b68c7da28b Remove directory Linear_cell_complex/ 2011-10-14 17:51:15 +00:00
Guillaume Damiand 025a6db5e6 Add Linear_cell_complex directory. 2011-10-14 15:46:50 +00:00