0a55b1399e
Mesh_3 fix post merge
2015-06-30 13:47:52 +02:00
8ab112f5bd
Merge and new plugin fixes
2015-06-30 13:03:20 +02:00
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
76cf7e789f
Merge remote-tracking branch 'cgal/releases/CGAL-4.6-branch'
...
- Merge pull request #140 from
lrineau/Mesh_3-demo_fix_QGLViewer-2.6.0-lrineau
Fix for libQGLViewer>=2.6.0
Conflicts:
Installation/changes.html
2015-06-28 18:25:04 +02:00
24b0b1ec50
Merge pull request #136 from akobel/CreateCMakeLists_extensions-akobel
...
make `cgal_create_CMakeLists` recognize all common C++ source file extensions
2015-06-28 18:21:06 +02:00
81eda79252
Merge pull request #140 from lrineau/Mesh_3-demo_fix_QGLViewer-2.6.0-lrineau
...
Fix for libQGLViewer>=2.6.0
2015-06-28 18:20:50 +02:00
9c37e3f1e8
Merge pull request #134 from bo0ts/Installation-fix-debugsymbol-removal-pmoeller
...
Do not check for the actual CMAKE_BUILD_TYPE
2015-06-28 18:20:39 +02:00
39584e30e4
updated crontab (automated commit)
2015-06-26 23:20:49 +02:00
ad01608c2c
Fix for libQGLViewer>=2.6.0
...
Fix #138
2015-06-26 18:04:25 +02:00
8ae9c144a8
make cgal_create_CMakeLists and its brethren recognize all common C++ source file extensions
...
Rationale: cgal_create_CMakeLists and related scripts used to not
consider files ending on anything else than .cpp or .C as C++ sources.
This patch allows for the list of extensions considered as C++ source
files as stated in the g++ man page.
2015-06-25 15:55:55 +02:00
b4875fc99a
changes for CGAL-4.6.1
2015-06-25 14:58:30 +02:00
708c135703
updated crontab (automated commit)
2015-06-25 14:33:19 +02:00
d4b4e1720b
Merge branch 'releases/CGAL-4.6-branch'
...
This merge imports the following merge commits:
- Merge pull request #132 from lrineau/Installation-fix_configure_component-pmoeller_rebased_4.6
- Merge pull request #126 from afabri/Triangulation_2-fix_plus_2-GF
- Merge pull request #125 from lrineau/Mesh_3-fix_with_gcc44_cpp11-lrineau
2015-06-25 11:28:30 +02:00
71ab8ea9aa
Merge pull request #132 from lrineau/Installation-fix_configure_component-pmoeller_rebased_4.6
...
Use `get_filename_component` to manipulate paths
This caused a bug in CMake>=3.3.0 when `file(GLOB)` is not adding multiple
slashes. The lack of trailing slashes is guaranteed and documented in
`get_filename_component`.
2015-06-24 16:35:07 +02:00
f0082c20f4
To not check for the actual CMAKE_BUILD_TYPE
...
If CMAKE_BUILD_TYPE is not set in the initial run, is only
defined *after* this code is run. Since the build type is cached this
seemed to work when a cmake cache was already present, but not without.
2015-06-24 11:39:47 +02:00
5f8116e075
Precision avec SFINAE, access control, and C++11
2015-06-23 19:30:24 +02:00
06a17381a6
Fix the use of get_filename_component
...
For CMake<=2.8.11, the option DIRECTORY must be renamed to PATH, the
legacy name of the option.
2015-06-23 11:22:01 +02:00
61e61220eb
Use get_filename_component to manipulate paths
...
This caused a bug in CMake>=3.3.0 when file(GLOB) is not adding multiple
slashes. The lack of trailing slashes is guaranteed and documented in
get_filename_component.
2015-06-23 11:13:09 +02:00
eddb96aff9
Merge pull request #126 from afabri/Triangulation_2-fix_plus_2-GF
...
Fix a bug in CDT_plus_2
2015-06-22 12:51:15 +02:00
1d8c6116d2
Merge pull request #125 from lrineau/Mesh_3-fix_with_gcc44_cpp11-lrineau
...
Fix a compilation error with gcc44 -std=c++0x
2015-06-22 12:50:58 +02:00
cbdb23172f
Merge pull request #130 from mglisse/Triangulation-no_Cartesian_d-glisse
...
Document that Triangulation only works with Epick_d.
2015-06-22 12:44:11 +02:00
44ebc81721
Re-add C2t3_type.h
...
This reverts one error made in commit
ec54e1d42c
2015-06-22 11:42:23 +02:00
49b45a753d
vaos replacement
...
- The vao array has been relaced by a QMap and the buffer array by a vector, so that each item can have the right number of VAOs/VBOs.
2015-06-22 10:10:45 +02:00
b71335b4fe
Document that Triangulation only works with Epick_d.
2015-06-19 12:15:40 +02:00
f5343911a6
fix the link to the developers manual, in the code
2015-06-19 11:15:55 +02:00
cbf2104c5f
Fix the link to our Sympa archives
2015-06-19 11:05:34 +02:00
97cd20e8de
Merge pull request #126 from afabri/Triangulation_2-fix_plus_2-GF
...
Fix a bug in CDT_plus_2
2015-06-18 17:31:17 +02:00
22242f69c7
Merge pull request #125 from lrineau/Mesh_3-fix_with_gcc44_cpp11-lrineau
...
Fix a compilation error with gcc44 -std=c++0x
Conflicts:
Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
2015-06-18 17:31:09 +02:00
f315b195cd
Merge remote-tracking branch 'refs/remotes/cgal-public-dev/CGAL-Qt5_support-GF' into CGAL-Qt5_support-GF
...
Conflicts:
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
2015-06-18 15:11:59 +02:00
6a3bae29cd
clean up
2015-06-18 15:08:06 +02:00
0273dd2544
trivial_plugin refactored.
2015-06-18 14:55:13 +02:00
0484ba4e6c
mesh_3 plugin refactored
2015-06-18 14:45:13 +02:00
0fbea0f85c
cut_plugin refactored
2015-06-18 14:20:33 +02:00
ab568465c5
cene_edges_item in cut_plugin refactored.
2015-06-18 12:54:40 +02:00
980eb8fcf3
scene_aabb_item in cut plugin refactored.
2015-06-18 12:47:30 +02:00
5148c8d377
polyhedron_selection_item refactored.
2015-06-18 12:29:31 +02:00
f566e54ddb
transformed_item refactored and corrected some problems in other items.
2015-06-18 12:04:15 +02:00
c9272417b1
Points_with_normal_items refactored.
...
- No more splatting for now.
2015-06-18 11:39:48 +02:00
5172e2d6a5
nef_polyhedron_item refactored
2015-06-18 11:15:43 +02:00
8754e3a40f
edit_polyhedron_item refactored.
...
- needed a special program for the red bbox appearing when moving points.
2015-06-18 10:42:39 +02:00
c80a9aaa6c
Fix a bug in CDT_plus_2
...
Fix issue #122
2015-06-17 18:52:30 +02:00
7c23f13b3e
polygon_soup_item refactored + bug corrected
...
- wire mode wasn't working correctly because the filling of the edges data wasn't looping.
2015-06-17 14:37:17 +02:00
2e9ae070dd
Implicit function refactored
...
- Use the program library
- force some data like the manipulated frame matrix or the color and normals in the draw functions to be able to use an existing program
with existing shaders.
2015-06-17 13:00:28 +02:00
b221fd0328
Fix an incoherent indentation
2015-06-17 12:24:01 +02:00
21a699368d
Fix a compilation error with gcc44 -std=c++0x
...
Should fix issue https://github.com/CGAL/cgal/issues/121
The error was that the "domain" class returns a `CGAL::Point_3<K>`, the
triangulation uses `CGAL::Weighted_point<CGAL::Point_3<K>, double>`, and
one piece of code from Mesh_3 in <CGAL/Mesh_3/Refine_facets_3.h> uses an
implicit conversion from
tuple<something_A, something_B, CGAL::Point_3<K> >
to
tuple<something_A, something_B, CGAL::Weighted_point<P, double> >
and plugs that into a `boost::optional`. For some reason, the g++-4.4
compiler does not like that, but recent g++ compilers accept the code.
The fix is to use an explicit conversion from `Point_3` to
`Weighted_point<Point_3, double>`.
2015-06-17 12:21:15 +02:00
b0e0e5fc79
Merge branch 'releases/CGAL-4.6-branch'
...
That merge imports the pull-request:
https://github.com/CGAL/cgal/pull/115
_Emulate mpn_sqr on old versions of GMP_
2015-06-17 12:16:20 +02:00
7bb2046372
This should solve issue #41 .
...
(cherry picked from commit bc125c525c
2015-06-17 12:07:51 +02:00
195f11a98f
Explicitely call the constructor of Surface_patch to prevent compilation failures with g++.
...
(cherry picked from commit f9e4a9faff
2015-06-17 12:04:13 +02:00
ec54e1d42c
Refactoring
...
- keeps shaders in resources files
- Uses a program vector doubled with a sort of singleton to create or return a program.
- currently implemented classes ; polyhedron_item, textured_polyhedron_item and polylines items
2015-06-17 11:39:07 +02:00
e020872989
Merge two commits forgotten in pull-request #110
...
https://github.com/CGAL/cgal/pull/110
Fixes issue #124 .
https://github.com/CGAL/cgal/issues/124
Merge remote-tracking branch 'cgal-dev/Polyhedron_iostream-Binary_STL_Readder-GF'
2015-06-17 10:20:28 +02:00
Maxime Gimeno
Laurent Rineau
Alexander Kobel
Philipp Möller
Marc Glisse
Andreas Fabri
Simon