b2196fca0c
remove non-needed OpenGL instructions
2016-01-18 13:17:41 +01:00
32a3972c33
Merge pull request #592 from afabri/CGAL-dont_submit_cleanup-GF
...
Towards getting rid of dont_submit files
2016-01-08 14:14:08 +01:00
f3bc10ef81
Merge pull request #549 from afabri/Polyhedron-clipping_in_shader-GF
...
Improve C3T3 item and meshing of a segmented image
2016-01-07 13:49:16 +01:00
e64ae35a6e
Merge pull request #542 from bo0ts/Documentation-release_build2-pmoeller
...
Allow to build the documentation in a release
2016-01-07 09:21:46 +01:00
a41165b6eb
various
2016-01-05 18:04:14 +01:00
56bfaa2746
merge
2016-01-05 17:06:04 +01:00
2b49997c7e
Merge pull request #493 from afabri/CGLAL-thread_local_storage-GF
...
Remove boost thread dependency
2016-01-04 16:49:26 +01:00
078afb18b3
Alpha_shapes_2
2015-12-31 16:19:26 +01:00
71b4e9c515
Use CGAL_FULL_VERSION in all Doxyfile.in
2015-12-17 16:33:28 +01:00
88596c38ce
bugfix: the datum was a segment not a triangle
2015-12-16 16:58:27 +01:00
a33f8326d4
Update aabb_tree.txt
...
fix typos (, vs .) in table
2015-12-15 09:35:48 +01:00
0b2b5ee1e6
Add an AAB tree primitive for C3T3 facets
2015-12-11 16:15:36 +01:00
79b7fc5081
Handle the INPUT cases where the whole include dir is used
2015-12-10 17:03:46 +01:00
ee5f29b07c
add a warning to not put degenerated objected in the tree
2015-11-24 00:12:36 +01:00
547be5cd2a
Use wrapper for the very basic mutex locking
2015-09-04 08:42:34 +02:00
61072a8e75
Clean-up
2015-08-10 09:04:01 +02:00
71b0fd8d31
Replaced the OpenGL 3 3 Core context by a 2_1 context.
2015-08-10 08:46:09 +02:00
970e767bbf
GL security enhancement
...
- Version of the shaders added and depth test enabled at each draw.
2015-08-06 15:05:00 +02:00
fd38d1192b
Plane manipulated secured
...
- Should resolve all the remaining problems about the manipulated frame, except for the wheels events.
- Added glEnable(GL_DEPTH_TEST) to the draw() function of the viewer to avoid errors in certain cases
2015-08-06 14:47:21 +02:00
508b467203
Merge branch 'CGAL-Qt5_support-GF'
2015-08-05 11:23:40 +02:00
55c30d0808
Qt::AA_UseDesktopOpenGL is usable from Qt-5.3 only
2015-08-04 10:55:26 +02:00
839d09e82a
ManipulatedFrame fps fix
...
- I used the startTimer(0) to cadence the calls to cutting_plane()
- Now if the plane is spinning, the fast_distance is used.
2015-08-04 09:03:15 +02:00
87a406ab81
Fix a warning with MSVC
...
> aabb_tree_demo\Scene.cpp(1313) : warning C4138: '*/' found outside of comment
Trivial bug-fix.
2015-07-30 13:04:29 +02:00
6dc5695989
remove unused variable warning
2015-07-22 15:47:23 +02:00
012110cfa5
fix warning for windows
2015-07-21 15:59:03 +02:00
cffdb2ca5d
fix unused variable warning
2015-07-17 13:56:04 +02:00
04db43556f
Do not warn when Qt5 is not found.
2015-07-13 15:55:41 +02:00
15c1469a54
CGAL requires CMake>=2.8.11.
2015-07-10 17:01:42 +02:00
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
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
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
e199f546d4
remove QT4 specific code
2015-07-07 19:36:04 +02:00
722abba27b
cosmetic changes to remove mentions of QT4
2015-07-07 18:00:43 +02:00
8c391c1cdf
Windows context problems fixed
...
- Called setAttribute(Qt::AA_UseDesktopOpenGL) in the main function.
2015-07-07 15:31:18 +02:00
620abb640d
WIP : still on the windows OGL context
2015-07-07 15:23:15 +02:00
ce6e05e8bd
WIP : forcing windows to use the right opengl context.
2015-07-07 15:12:41 +02:00
47e827764a
Trying to force the context to use OpenGL3_3_Core.
2015-07-07 13:42:37 +02:00
22dbcfaa2c
Still on that SIGSEGV
2015-07-07 11:50:05 +02:00
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
870795d79d
Add some info display
2015-07-07 11:22:01 +02:00
8b02b4f914
Still trying to fix that SIGSEGV with glGenTextures
2015-07-07 11:18:14 +02:00
9c501a57d4
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
2015-07-07 10:59:42 +02:00
b0d87a9236
Fix for the SIGSEGV at runtime
...
- initializeOpenGLFunction and GglGenTextures() have been moved to draw to be sure they have a working context.
2015-07-07 10:58:30 +02:00
1aa3ca438e
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
2015-07-07 10:46:55 +02:00
795a0bfafe
static_casts
2015-07-07 10:46:43 +02:00
d442644c8d
Fix for the SIGSEGV at the runtime
...
- draw only if the vectors of vertices aren't empty.
2015-07-07 10:43:52 +02:00
2c8bb3f978
changed() fixed
...
- are_buffers_initialized = true instead of ==true in initialize_buffers().
2015-07-07 08:36:17 +02:00
85afa81ebd
Changed() fixed.
2015-07-07 08:33:47 +02:00
f5ddbfdf96
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
2015-07-07 08:24:24 +02:00
12501598bb
Changed() fix and texture ID generation.
2015-07-07 08:21:56 +02:00
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
1a3e0e001b
add dependendency on svg
2015-07-06 16:31:56 +02:00
74ff5ae85c
Clean-up
...
- Scene_item_with_display_list removed
- Program initializing functions being moved to scene_item to lighten-up the code of each object (Only polyhedron_item concerned at this stage)
2015-06-12 14:46:05 +02:00
ed3298ee2f
Merge branch 'Polyhedron-new_opengl_REBASED_to_ignore_reindentations-gf' into CGAL-Qt5_support-GF
...
Conflicts:
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_selection_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
2015-04-27 08:50:06 +02:00
89348a1ab9
cut_plugin fixed
...
- replaced the missing modified files by the originals
- added a reference to a vector of floats in traits so that it fills it instead of drawing the bboxes
2015-04-24 15:59:23 +02:00
ba4ede5f50
Clean-up
...
- removed the unused functions and dependencies
- Replaced QGLBuffer by QOpenGLBuffer
2015-04-24 12:54:05 +02:00
965f2ab77b
Upgrade of AABB_Tree_demo to OpenGL ES with Qt 5 wrappers.
...
- used qt wrapper for the gestion of the shaders.
- used OpenGL ES 3 for the gestion of the texture.
- the texture doesn't have the "FLAT" mode while moving anymore.
2015-04-08 11:13:16 +02:00
69a534ae37
WORK IN PROGRESS
...
- Added vao gestion, draws everything but the cutting plane.
2015-04-03 16:43:52 +02:00
0ce6f75bc4
WORK IN PROGRESS
...
- Added qt shader material
- only drawing a red triangle for now
2015-04-03 14:54:35 +02:00
85c8e7e270
Upgrade of AABB_Tree Demo to Qt5
...
- setBackgroudColor was called too soon(in the constructor of the viewer), now called in InitializeGL
2015-04-02 11:54:06 +02:00
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
1983ed15c5
use listing
2015-02-11 17:15:39 +01:00
60a96c87b5
add missing template parameter
2015-02-11 16:34:21 +01:00
b28b4607ae
use UTF8 for letters with accent
2015-01-31 13:58:08 +01:00
1cc4f732f6
use Default for vertex point property map
2015-01-19 12:16:47 +01:00
67414ef0c8
fix default point property map used in BGL primitives
2015-01-19 11:57:43 +01:00
6e36a853a9
Merge branch 'Surface_mesh-new_package-GF'
...
Approved by the release manager
Conflicts:
Documentation/doc/Documentation/dependencies
Documentation/resources/how_to_cite_cgal.bib.in
Installation/changes.html
2015-01-12 11:27:35 +01:00
7e5b902ea8
cleanup in #include of AABB_tree examples
2014-11-13 11:53:04 +01:00
765684b613
test availability of BGL primitive constructors from a simplex
2014-11-05 17:19:38 +01:00
aeaed0d18a
remove deprecated constructor that conflict with the new one
2014-10-24 10:12:16 +02:00
e5a44099e9
add additional constructor to allow building a primitive from a descriptor
2014-10-23 17:03:48 +02:00
df9e315536
Correction of some problem (SDK Windows, REQUIERED thing...) and add of comments for findQt5.cmake.
2014-08-15 02:57:48 +02:00
2d65524aea
All last demonstrations ported to Qt4or5. Need to check working of it on Linux.
2014-08-12 22:12:42 +02:00
ff94f3bf39
Arrangement_on_surface_2 ported.
2014-07-04 17:57:12 +02:00
39c073948e
when using HalfedgeGraph or FaceGraph API, graph_traits must be included
2014-07-04 17:24:07 +02:00
9999dc8f0e
add missing include so that tags are defined
2014-07-04 17:24:06 +02:00
5f4813b64d
properties_Polyhedron_3.h is now included by graph_traits_Polyhedron_3.h
2014-07-04 17:24:05 +02:00
dfe0b88d2f
AABB tree primitives should not include Polyhedron specific files
...
I also renamed a file only used in these primitives
2014-07-04 17:24:05 +02:00
ab909badb9
Demonstrations AABB_tree, Alpha_shapes_3 and Circulat_kernel_3 ported. Working on Mesh_3, Polyhedron and Periodic_3_triangulation_3.
2014-07-03 15:07:00 +02:00
5d9219c96d
AABB-tree bugfix: perfect forward of arguments in C++11 and by ref otherwise
...
this was a bug because the shared data were copied
2014-07-02 12:23:52 +02:00
326b604e58
add missing shared data constructor from 2 args
2014-07-02 11:29:32 +02:00
e412f6c2e5
fix the const correctness of FaceGraph and HalfedgeGraph primitives
...
The BGL is not const correct by design choice. Passing a const Graph as
template parameter to the primitive type is error prone.
This will make the life easier to the user.
2014-07-02 11:28:58 +02:00
6638bff59a
add the missing 2 args version
2014-07-02 10:56:10 +02:00
4791498376
fix availability of a constructor for Polyhedron backward compatibility
2014-07-01 16:43:26 +02:00
ff3ad95287
remove boost:: prefix
2014-07-01 13:24:02 +02:00
97342ad6f6
backward compatibility with const Polyhedron
2014-06-24 16:38:03 +02:00
67fa385190
A FaceGraph is any model of the concept face graph
2014-06-11 15:15:09 +02:00
56f58c1945
Add backward compatibility code
2014-06-11 10:22:46 +02:00
d0dfac3caa
facet_handle -> face_descriptor
2014-06-05 21:29:01 +02:00
3d7d596e6b
Use vertex_point property map so that it now also compiled with OpenMesh
2014-06-05 15:29:49 +02:00
2c4c38809d
switch internally to BGL API in mesh segmentation. We still have to deal with the point property maps
2014-06-05 12:05:54 +02:00
4a37f74122
switch to new BGL API
2014-06-04 21:28:59 +02:00
e95c3d452c
Switch to new BGL API in package AABB_tree
2014-05-24 08:55:43 +02:00
3169b23528
doc fix: use cgalExample macro
2014-04-24 14:56:33 +02:00
2ed7784521
trivial fix for master
2014-04-15 18:22:22 +02:00
9114db9085
restore figure source files removed in 0fa2cacb
...
| commit 0fa2cacb60
2014-02-10 14:54:23 +01:00
afe06c0b69
Fix the testsuite of AABB tree
...
That is a followup to the following commit:
| commit 3e93d0bfc6
2014-02-05 12:04:11 +01:00
48f9c4c06c
Fix AABB_tree use of set_shared_data
...
That function set_shared_data is never tested in CGAL, happened not to
be callable using its documented API. I do not understand why there is
an additional template parameter 'PrimtiveType'. That commit removes it.
(cherry picked from commit 99790a0d39864c3d2e72d18876f41603ab94a5a5)
2014-01-13 18:56:48 +01:00
cb6ce3f448
Fix a typo: missing space
2014-01-10 16:44:33 +01:00
3e93d0bfc6
Fix test of AABB_tree (use of an epsilon)
...
The test 'aabb_naive_vs_tree_distance_triangle_test' failed
something. It was due to a test using an epsilon, with a too-low epsilon
value (1e-8). I managed to reproduce the bug, and the quantity compared
to the epsilon value was about 1.8e-8. I increase the epsilon value to
1e-7, and add a few lines that show the compared values, when the test
fails.
Trivial bug-fix.
2013-12-31 15:15:24 +01:00
3af2add868
Merge branch 'BGL-fix_doc-sloriot'
...
Clean-up and fix the documentation of the specialization of boost::graph_traits
Approved by the release manager
Tested in CGAL-4.4-Ic-48
2013-12-04 08:53:15 +01:00
0fa2cacb60
remove doc_tex documentation (including developer manual) and old manual tools
2013-12-03 17:27:02 +01:00
ee3ce8985f
fix the way the specialization of graph_traits are documentated
2013-12-03 12:03:00 +01:00
21d3cbd2bb
doc: add a return to line before heading
2013-09-23 16:37:34 +02:00
9ed4f837c3
Merge branch 'CGAL-compilable_headers-GF'
...
The conflict was about whitesapce
Approved by the release manager
Conflicts:
Polyhedron/include/CGAL/Polyhedron_copy_3.h
2013-09-23 14:50:17 +02:00
c801ccfe36
doc bugfix: add a sentence about a deprecated requirement
2013-09-23 08:40:54 +02:00
5c454cec64
add missing includes
2013-09-13 12:43:01 +02:00
bc03aaf30b
Put doc/ in the global dont_submit file
2013-08-20 10:57:03 +02:00
7349ad7caa
Replace ** with \b
2013-08-19 14:14:49 +02:00
9c2f35ed1a
using cgalHeading instead of h3
2013-08-07 10:06:49 +02:00
d282ade623
use \cgalCite instead of \cite
...
using perl -i -pe 's/\\cite\s*{?([a-zA-Z0-9:-]+)}?/\\cgalCite{$1}/g'
2013-08-05 18:25:26 +02:00
f5f6b034a6
Merge branch 'AABB_tree-fix_graph_primitives-local'
...
This fixes the graph primitives that were only model of
AABBPrimitiveWithSharedData, and also remove the artificial compatibility
with deprecated primitives that are not needed since we want to make users
use the new method.
Successfully tested in CGAL-4.3-Ic-107
One example on the platform i686_Linux-2.6_g++-4.1.2_CentOS-5.1-O3 indicates
an error, but after checking it is a floating point computation threshold
issue. The example expects an error to be below 1e-10 and it is 1.1e-10.
Approved by the interim release manager
2013-07-31 17:32:15 +02:00
5666173947
typos and missing static
2013-07-30 07:38:41 +02:00
a5eb2fa0b4
missing backquote
2013-07-30 07:15:11 +02:00
b6737e6b0f
fix the graph primitive when they don't have shared data
2013-07-29 18:47:17 +02:00
0864336a66
remove compatibility with original polyhedron primitives
...
there is no need to maintain such an artificial compatibility, the old
primitives are still in CGAL.
2013-07-29 17:17:56 +02:00
29a64aca9c
bugfix: OneHalfedgeGraphPerTree was not correctly forwarded
2013-07-29 10:18:02 +02:00
88f265be1c
re-document OneFaceGraphPerTree
2013-07-29 10:16:27 +02:00
0a2f31ce90
doc bugfix: fix template parameters
2013-07-29 10:07:51 +02:00
3b1c661634
doc bugfix: missing nested type in concept
2013-07-29 09:55:44 +02:00
ed76911e06
Merge branch 'AABB_tree-fix_non_conventional_names-local'
...
Successfully tested in CGAL-4.3-Ic-101
Approved by the interim release manager
This merge fixes documentation bugs and rename classes with names
non conform to CGAL conventions
2013-07-25 18:56:17 +02:00
2dfe8a3d73
workaround for a doxygen bug: remove space after /!* to avoid a verbatim env
...
this happens if you have an empty line or the text directly after /!*
to find them in the generated documentation, grep for "pre class=\"fragment\""
(a few of them are legitimate however)
2013-07-25 14:58:53 +02:00
ddda698034
inline the nested class Intersection_and_primitive_id in the documentation
2013-07-24 17:06:35 +02:00
c2fc43a8df
make doxygen picking the correct return type
2013-07-24 16:59:01 +02:00
a10c77ab03
typo in doc
2013-07-24 16:50:20 +02:00
79442d98ee
doc typo
2013-07-24 16:43:07 +02:00
773342f68e
forgot to rename doc_tex files
2013-07-24 16:31:14 +02:00
9c0808cad1
fix name of classes that do not respect CGAL naming conventions
...
AABB_HalfedgeGraph_segment_primitive -> AABB_halfedge_graph_segment_primitive
AABB_FaceGraph_triangle_primitive -> AABB_face_graph_triangle_primitive
2013-07-23 17:46:50 +02:00
2bf7690f57
rename template parameter cache_datum to CacheDatum
...
template parameter should be camel case
2013-07-22 14:52:16 +02:00
f61c8acc07
fix warning in the documentation
2013-07-04 19:16:58 +02:00
6735255fd0
The vertex point property map can be external for non-CGAL graph implementation
...
This is a bugfix of the API
2013-07-03 12:51:09 +02:00
940cd2bf33
bugfix: use the traits data member otherwise the shared_data cannot be used
2013-06-27 20:55:16 +02:00
757645d562
Merge branch 'AABB_tree-directed_vs_undirected_edges_bugfix-local'
...
Successfully tested in CGAL-4.3-Ic-73
2013-06-27 08:47:46 +02:00
91dde8b2c0
use undirected_edges to have only one primitive per edge
2013-06-26 08:55:14 +02:00
e1442df84f
remove unused typedef
2013-06-26 07:28:53 +02:00
dece6a1429
Fix a compilation error
2013-06-25 12:05:55 +02:00
42dbc14ffe
use class in the forward declaration too
2013-06-24 08:45:39 +02:00
bff4e98d01
fix warnings mainly coming from the merge of the replace object feature branch
2013-06-24 08:44:47 +02:00
f6c016257d
fix encoding problem in license header
2013-06-24 08:39:43 +02:00
dc7caa3a4c
remove TODO
2013-06-24 08:35:18 +02:00
376e99312e
Merge branch 'AABB_tree-one_primitive_per_object-sloriot'
...
Successfully tested in CGAL-4.3-Ic-68
implements what is described in Small_Features/aabb_tree_more_primitives
2013-06-24 08:11:05 +02:00
45c61f0061
remove Id template parameter from graph primitives that cannot be changed
2013-06-21 17:51:27 +02:00
7a04853d70
fix warnings
...
detected by msvc++
2013-06-21 09:53:02 +02:00
baac01b0b7
add missing template keyword
...
detected by Apple clang
2013-06-21 09:42:56 +02:00
bb7c57af94
update AABB-tree demo to use the new primitives
2013-06-20 10:36:43 +02:00
df7daacddc
fix constness issue
2013-06-20 10:35:44 +02:00
51870e6a66
update test to use the recommended primitive
2013-06-19 19:28:54 +02:00
d2bf82c8e5
document FaceGraph triangle primitive to be only for Polyhedron
2013-06-19 19:28:19 +02:00
9822a1a403
document operations for backward compatibility
2013-06-19 19:15:58 +02:00
c64e8b00cf
Revert "backward compatibility is ensured by the 2nd template parameter set to Tag_true"
...
This reverts commit ca32c286f6
2013-06-19 19:07:56 +02:00
9934b020c6
fix the triangle FaceGraph primitive to work with Polyhedron
2013-06-19 18:02:05 +02:00
ca32c286f6
backward compatibility is ensured by the 2nd template parameter set to Tag_true
2013-06-19 17:42:38 +02:00
607dc3386a
fix HalfedgeGraph segment primitive to match the current implementation
2013-06-19 17:30:13 +02:00
f395759b35
the segment and triangle primitive are now compatible with the former classes
...
even if they were not documented, they were used in examples
2013-06-19 16:55:29 +02:00
caf3bdfac8
fix copy-paste error
2013-06-19 16:55:06 +02:00
876b2c6cfc
add a default constructor to AABB_tree
2013-06-19 16:54:21 +02:00
914f60234c
fix typo
2013-06-19 14:12:08 +02:00
0f42b2f33b
AABB_segment_primitive and AABB_triangle_primitive model AABBPrimitive
2013-06-19 11:34:28 +02:00
0d3d71d482
fixes after updating the branch and the documentation
2013-06-19 10:55:05 +02:00
7cb2874da2
doxygen: fix documentation look
2013-06-19 10:40:41 +02:00
c3b717e4a5
correct introduction release
2013-06-19 07:56:30 +02:00
06fc6dc039
add the doxygen documentation corresponding to the doc_tex modifications
2013-06-18 19:55:20 +02:00
6144e5c45b
copy-paste error: triangle should be segment!
2013-06-18 16:30:48 +02:00
e74c1b1df8
move into AABB_tree sub-namespace
2013-06-18 14:14:24 +02:00
650f9b4295
Merge branch 'AABB_tree-one_primitive_per_object-sloriot-old' into AABB_tree-one_primitive_per_object-sloriot
...
Conflicts:
.gitattributes
AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex
AABB_tree/dont_submit
AABB_tree/include/CGAL/AABB_traits.h
AABB_tree/include/CGAL/AABB_tree.h
AABB_tree/include/CGAL/internal/AABB_tree/AABB_traversal_traits.h
AABB_tree/test/AABB_tree/AABB_test_util.h
AABB_tree/test/AABB_tree/aabb_correctness_triangle_test.cpp
AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp
AABB_tree/test/AABB_tree/aabb_distance_triangle_hint_test.cpp
AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp
AABB_tree/test/AABB_tree/aabb_intersection_triangle_test.cpp
Boolean_set_operations_2/examples/Boolean_set_operations_2/bezier_traits_adapter2.cpp
Installation/cmake/modules/CGAL_Common.cmake
Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake
Installation/cmake/modules/CGAL_Macros.cmake
Installation/cmake/modules/CGAL_SetupBoost.cmake
Installation/cmake/modules/CGAL_SetupDependencies.cmake
Installation/cmake/modules/CGAL_SetupGMP.cmake
Installation/cmake/modules/CGAL_SetupGMPXX.cmake
Installation/cmake/modules/CGAL_SetupLEDA.cmake
Installation/cmake/modules/CGAL_SetupMPFI.cmake
Installation/cmake/modules/CGAL_SetupNTL.cmake
Installation/cmake/modules/CGAL_SetupRS.cmake
Installation/cmake/modules/CGAL_UseMPFI.cmake
Installation/cmake/modules/CGAL_UseNTL.cmake
Installation/cmake/modules/CGAL_UseRS.cmake
Installation/cmake/modules/CGAL_VersionUtils.cmake
Interval_skip_list/examples/Interval_skip_list/isl_terrain.pts
Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_triangulation.cpp
Maintenance/svn_server/hooks/Mail/Sender/CType/Ext.pm
Point_set_processing_3/include/CGAL/property_map.h
Principal_component_analysis/include/CGAL/linear_least_squares_fitting_cuboids_3.h
Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_3.h
Principal_component_analysis/include/CGAL/linear_least_squares_fitting_tetrahedra_3.h
Principal_component_analysis/test/Principal_component_analysis/linear_least_squares_fitting_segments_3.cpp
Principal_component_analysis/test/Principal_component_analysis/linear_least_squares_fitting_spheres_3.cpp
Scripts/developer_scripts/list_package_files.rb
Scripts/developer_scripts/mirror_all_packages.rb
Scripts/developer_scripts/mirror_package.rb
Scripts/developer_scripts/mirror_package_files.rb
Scripts/developer_scripts/remove_package_files_from_build_tree.rb
Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.cpp
Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/contouring.tex
Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/output.tex
2013-06-18 11:50:30 +02:00
c09ec2beaa
Merge branch 'Kernel-replace_object-pmoeller'
...
Successfully tested in CGAL-4.3-Ic-59
Approved by the release manager
Conflicts:
Kernel_23/doc/Kernel_23/CGAL/intersections.h
Kernel_23/doc_tex/Kernel_23_ref/intersection.tex
Kernel_d/doc/Kernel_d/Kernel_d.txt
STL_Extension/doc/STL_Extension/CGAL/iterator.h
2013-06-14 14:26:05 +02:00
716f87d2d7
rename Hidden_type to unspecified_type and update its description
2013-06-13 18:48:58 +02:00
f9ac8d4288
Merge branch 'AABB_tree-fix-memory-leak-local'
...
Successfully tested in CGAL-4.3-Ic-50
2013-06-04 12:40:27 +02:00
7a7f9be240
incorrect simplification: empty() is not equivalent to size()>1
2013-06-03 15:29:41 +02:00
8bb442ae3b
fix a memory leak in the destructor of AABB_tree
...
the primitive container was clear before deleting the nodes
(which was not done since the container was empty)
At the same time I made the delete of the KD-tree done only
if it was constructed
2013-06-03 08:29:40 +02:00
f118e7c6eb
Clean up the files we use as examples
2013-05-31 11:40:35 +02:00
895245426a
Fix some errors introduced by adding the titles
2013-05-30 18:09:42 +02:00
4d9caf3763
Added names that were missing into the Doxyfile.in entries.
...
Also modified Installation/CMakeLists.txt to push the version number variable to the parent level
so that it can be accessed by the documentation
2013-05-30 17:55:43 +02:00
c0690f87f4
Manually inserted tags that could not be generated automatically
...
added in options that were in XML but were not moved across to new Doxyfile.in files.
2013-05-30 14:45:18 +02:00
4d469821f7
Generated Doxyfile.in and dependencies
2013-05-30 14:13:47 +02:00
0ade43576f
Add configuration building
2013-05-30 11:45:37 +02:00
2e9144ea16
Files that Philipp wanted to test Cmake for Doxygen
2013-05-30 11:13:08 +02:00
34362d2a0f
update how Intersection_and_primitive_id get the type and update its doc
...
We use meta programming to remove the optional rather than relying on
Intersection_traits (since it depends on GeomTraits)
2013-05-23 12:31:42 +02:00
7e6a880aa4
update AABB_tree documentation
2013-05-23 10:56:42 +02:00
75ebdeaeeb
update the replacement of Object_and_primitive_id ...
...
... to be a pair< variant<XXX>, Primitive_id > rather than
pair<optional<variant<XXX> >, Primitive_id >
The rational is that the optional around the variant here is not needed
since there is one around the pair.
2013-05-21 18:39:23 +02:00
f97d6b8bd9
s/boost::result_of/cpp11::result_of/g
2013-03-14 10:38:13 +01:00
d6905c61be
Merge branch 'Kernel-replace_object-pmoeller-old' into Kernel-replace_object-pmoeller
...
Conflicts:
AABB_tree/include/CGAL/AABB_tree.h
Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h
Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h
Kernel_23/doc/Kernel_23/CGAL/intersections.h
Kernel_23/doc/Kernel_23/Concepts/FunctionObjectConcepts.h
STL_Extension/doc/STL_Extension/CGAL/iterator.h
2013-03-14 10:29:31 +01:00
7d2903e230
add classified reference manual pages
2013-03-12 14:51:52 +01:00
2d8da664a3
Merge branch 'CGAL-fix_warnings-gdamiand'
...
Conflicts:
.gitignore
Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt
2013-02-22 13:02:37 +01:00
26a7e70785
New license.txt files (eol changes)
...
The new version 2.13.0 of licensecheck has changed the spaces at eol.
2013-02-19 16:46:39 +01:00
13bac84716
less warnings in various packages
2013-02-01 10:27:07 +01:00
e17201c286
Remove superfluous styling
2013-01-25 11:24:12 +01:00
0ce7a00f1e
Add comments in that test program (Emacs local variables)
...
That file uses wrong lenght for TAB characters. Those comments added Emacs
buffer local variables so that Emacs users can view and edit that files
nicely.
(Approved by the release manager... who is myself.)
2013-01-24 18:12:56 +01:00
0f3476be37
Remove unused type in AABB_tree test
2013-01-23 13:45:34 +01:00
34327e9688
Merge remote-tracking branch 'origin/AABB_tree-fix_documentation-lrineau'
2013-01-22 17:22:41 +01:00
65750effb1
Improve the documentation of the class template AABB_tree
...
- Group the documented methods that were not.
- Document typedefs that are used in the methods declarations.
- Use \tparam when relevant.
- Fix a comment block that was prefixed with ' ///' or '\t\t///'
depending on the lines. That one is particularily nasty because the
difference between lines is invisible. But that was confusing Doxygen.
- plus minor fixes
2013-01-16 15:04:17 +01:00
54bacd752a
Rename tests to lowercase names, for uniformity
2013-01-16 10:46:39 +01:00
827a70e110
Fix crashes when the AABB tree contains only one primitive.
...
An extra test program has been added to test all functions of the API with
a singleton AABB tree.
2013-01-16 10:39:52 +01:00
fc3061c822
Bug fix: fix AABB_tree doc and code about preconditions !empty()
...
The AABB_tree code had several assertions checkinng that the tree was not
empty. Those preconditions were not documented. There was several places in
the code were it was not really required that the tree is not empty.
This patch rationalizes the preconditions: only the function `bbox()` and
the queries about distances or closest things now require that the tree is
not empty.
2013-01-15 17:19:11 +01:00
4b252e8cc2
add missing backticks
2013-01-08 17:50:28 +01:00
318c280932
less linking
2013-01-07 19:26:50 +01:00
d16be07906
polish AABB Tree
2012-12-27 20:36:04 +01:00
75f69570dc
Change the titles of mainpages to "User Manual"
...
This leads to a slightly odd result in the search for "User Manual",
but makes the pages themselves more consistent.
2012-12-13 14:47:09 +01:00
3810676aba
Lower parameters to reduce strain on the testsuite
2012-12-07 18:00:46 +01:00
2c83dd01c8
AABB_tree now uses result_of
2012-12-07 18:00:46 +01:00
a3e399028e
typo
2012-12-05 19:37:51 +01:00
e0acf10424
doc_tex -> doxygen of the AABB Tree documentation
2012-12-05 14:37:56 +01:00
b86b662d61
Convert remaining CRLF files to LF
2012-12-04 18:47:18 +01:00
d198458ca7
Merge branch 'origin-gsoc2011-boost_object-pmoeller' into Kernel-replace_object-pmoeller
...
Conflicts:
.gitattributes
AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABB_traits.tex
AABB_tree/include/CGAL/AABB_traits.h
AABB_tree/include/CGAL/AABB_tree.h
AABB_tree/test/AABB_tree/AABB_test_util.h
Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2/arr_queries.tex
Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2_ref/Arr_trapezoid_ric_point_location.tex
Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2_ref/intro.tex
Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_generator_base.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_random_generator.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_trapezoid_ric_pl_impl.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_walk_along_line_pl_impl.h
Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h
Arrangement_on_surface_2/test/Arrangement_on_surface_2/point_location.cpp
Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circular_arc_3.h
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_line_arc_3.h
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h
Filtered_kernel/include/CGAL/Lazy.h
Filtered_kernel/include/CGAL/Lazy_kernel.h
Intersections_2/include/CGAL/Triangle_2_Iso_rectangle_2_intersection.h
Intersections_2/test/Intersections_2/test_intersections_2.cpp
Intersections_3/test/Intersections_3/test_intersections_3.cpp
Kernel_23/doc_tex/Kernel_23_ref/intersection.tex
Kernel_23/include/CGAL/Kernel/Type_mapper.h
Kernel_d/doc_tex/Kernel_d_ref/Kernel.tex
2012-12-04 17:57:53 +01:00
7d20531b1d
Convert remaining CRLF files to LF
2012-12-04 17:09:28 +01:00
3ffb31cc44
Convert all CRLF files to LF
2012-12-04 15:55:58 +01:00
1adf441b18
Convert all CRLF files to LF
2012-12-03 18:44:24 +01:00
533b9f07b3
BUG: typedef has moved
2012-11-28 12:05:02 +01:00
4ec9529581
Merge branch 'doxy-port-pmoeller'
...
Conflicts:
.gitattributes
Surface_reconstruction_points_3/include/CGAL/Poisson_reconstruction_function.h
Surface_reconstruction_points_3/include/CGAL/Reconstruction_triangulation_3.h
Surface_reconstruction_points_3/include/CGAL/k_nearest_neighbor.h
2012-11-27 10:05:41 +01:00
9576be3c3b
add doc in dont_submit
2012-11-27 08:42:02 +01:00
920eb63882
backporting documentation changes of master@9fcc5b57 into doxy-port-pmoeller
...
Conflicts:
Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_linear_traits_2.h
Installation/doc_tex/Installation/usage.tex
Kernel_23/doc/Kernel_23/CGAL/Projection_traits_xy_3.h
Mesh_2/doc/Mesh_2/Concepts/ConformingDelaunayTriangulationTraits_2.h
Spatial_searching/doc/Spatial_searching/CGAL/Incremental_neighbor_search.h
Spatial_searching/doc/Spatial_searching/CGAL/K_neighbor_search.h
Spatial_searching/doc/Spatial_searching/CGAL/Orthogonal_incremental_neighbor_search.h
2012-11-23 22:54:31 +01:00
6cc7d66415
Revert "Replace tex-style quotes with quotes that you would expect, as there"
...
This reverts commit e65a8028ea
2012-11-23 18:08:13 +01:00
625f9f6cd7
after git merge remotes/origin/hot-fixes-for-Git
2012-11-20 13:02:17 +01:00
128b02abb8
update CGAL custom doxygen macros
...
corresponds to a run of the script Documentation/conversion_tools/rename_macros.sh
+manual edit of doxyassist.xml and pkglist_filter.py
2012-11-14 00:31:05 +01:00
974621b58f
start using new figure macros.
...
For Combinatorial maps, I reintroduced the original anchor names as they
were still in use in the reference manual.
2012-11-08 10:55:09 +00:00
8f19c3d595
Remove size_type from TraversalTraits.
...
There is no reason for TraversalTraits to know the size_type (or any
of the other typedefs) and removing it prevents an unnecessary
instantiation of AABB_tree and a funky include.
2012-10-23 14:56:26 +00:00
31e9eadf8b
Fix all PackageDescriptions to a newer layout
2012-10-19 15:52:31 +00:00
c48ef2954c
Small fixes
2012-10-17 08:36:09 +00:00
a484b9ba7d
remove todo
2012-10-10 21:00:18 +00:00
fb244b47b4
remove empty destructor
2012-10-10 12:41:11 +00:00
9b44f4f7d8
AABB_tree is finished
2012-10-10 12:31:37 +00:00
ae3cccf4f2
typo: missing \\
2012-10-08 13:46:03 +00:00
ab423c9f68
typo
2012-10-08 13:37:54 +00:00
bc48dfe5a0
Be consistent about author/authors
2012-10-03 16:40:16 +00:00
37778547bf
Fix example to point to paths similar to a flat layout
2012-10-01 18:02:44 +00:00
b64ba48134
The changes to move the package overview labels into the
...
PackageDescription.
2012-09-25 17:17:49 +00:00
1954eff3d6
* build normalized mainpage anchors
...
* better naming for Pkg commands
* User and Reference Manual links from the PackageOverview
2012-09-20 15:30:03 +00:00
1b3a78a08f
Salvage the demo information from the old package description.
2012-09-20 13:30:49 +00:00
50e5409ffe
Merge next and restore the temporary delete of Bounding_volumes/doc
2012-09-20 11:37:03 +00:00
2987470868
Add Kinetic doc.
2012-09-19 14:01:12 +00:00
6f61e2b2ee
Downsize headings
2012-09-17 14:53:05 +00:00
d30771c4c2
Fix a typo in a tex command that broke the AABB_tree documentation.
2012-09-12 14:29:30 +00:00
864aebe2e5
Merge next.
...
This commit also updates the respective mock-headers when the
corresponding .tex documentation has changed. This has been the case for:
AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABB_traits.tex
Mesh_3/doc_tex/Mesh_3_ref/parameters_features.tex
Mesh_3/doc_tex/Mesh_3_ref/parameters_no_features.tex
Number_types/doc_tex/NumberTypeSupport_ref/Interval_nt.tex
Number_types/doc_tex/NumberTypeSupport_ref/Lazy_exact_nt.tex
Spatial_searching/doc_tex/Spatial_searching_ref/Search_traits_2.tex
Spatial_searching/doc_tex/Spatial_searching_ref/Search_traits_3.tex
Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_Delaunay_triangulation_2.tex
2012-09-12 14:14:22 +00:00
1d120f7da4
polish
2012-09-12 08:04:13 +00:00
632d2c7b76
template parameter AT got replaced by AABBTraits
2012-09-04 11:45:35 +00:00
0b80f4fa4c
Removed double example inclusion.
2012-08-30 13:00:28 +00:00
1c5bdb7882
take the thumb teaser
2012-08-30 12:42:08 +00:00
c1c932a1a0
various fixes
2012-08-30 10:29:46 +00:00
7ab9597e20
Correct name for the group
2012-08-30 10:21:16 +00:00
e18df919df
double table of contents
2012-08-30 09:39:53 +00:00
79e8f20043
rename teaser.png
2012-08-30 09:37:10 +00:00
2d8931167f
autoexamples
2012-08-29 16:20:55 +00:00
5a0a5403c4
Enable autotoc on mainpages
2012-08-29 15:45:17 +00:00
e2b79eb9db
Manually move AABB_tree here
2012-08-29 15:27:03 +00:00
80140d1bba
move function
2012-08-28 13:12:59 +00:00
6e00e85f3e
remove documented but not implemented size_type (that should not be here anyway)
2012-08-28 13:11:28 +00:00
8f22de68ce
concept bugfix
...
* CODE+DOC: Bbox_3 is a nested type in CGAL's Kernel; the code uses Bbox_3
* DOC: Add Compute_squared_distance_3 in AABBGeomTraits as it is needed by AABBTraits
* DOC: remove Splitting_direction from AABBTraits as it is not used
* DOC: Squared_distance in AABBTraits is only used between two points
(I guess the confusion from the fact that nearest_point use the other
version but without using the AABBTraits model).
* CODE+DOC add the function to construct Squared_distance functor in AABBTraits + AABB_traits
and use it instead of AABBTraits::Compute_squared_distance_3 which was not in the concept
* DOC: remove from AABB_traits types Ray_3, Line_3 and Segment_3 that are not required by AABBTraits
* CODE: The code was using AABBTraits::Point which is not in the concept. Use Point_3 instead
* CODE: reorder typedefs in AABB_traits to match concept order
2012-08-28 12:21:57 +00:00
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
e65a8028ea
Replace tex-style quotes with quotes that you would expect, as there
...
is no way to handle them in the converter.
Needs to be revert before this is being merged into next.
2012-08-02 12:55:15 +00:00
b6acb44b19
Fix mixed eol styles introduced by the licenses change scripts
2012-08-02 12:48:04 +00:00
a758751485
Remove / comment out unused local typedefs. Fix one place where FT was used instead of RT (homogeneous coordinates, probably never compiled).
2012-07-28 06:21:06 +00:00
389c2ab9e9
Fix a warning about an unused variable
...
Now the example does use the variable, and displays the coordinates of
the vertices of the closest facet.
2012-07-27 09:14:21 +00:00
a3cde4717f
typos
2012-06-05 09:03:41 +00:00
0bf796b59a
update TODO+typo
2012-06-04 14:43:46 +00:00
21283eab97
remove requirements of having get_reference_point and get_datum in the traits
2012-06-04 14:14:11 +00:00
567e637484
document previous changes
...
add new concept for primitive with shared data
rename Extra_data -> Shared_data
2012-06-01 15:24:17 +00:00
f57fab0c0a
*variadic version of insert, cstr and rebuild of AABB_tree
...
*the traits now correctly handle the storage of primitive data
*update primitives
2012-05-15 08:46:42 +00:00
a1bdd02f36
The traits now has a base class that is used to access the reference_point
...
and datum of a primitive. The base class is the one that will store additional
data.
2012-05-14 17:22:07 +00:00
dfc678846f
update AABB_primitive to take into account the fact that the property maps
...
can be stored outside of the primitive
2012-05-14 16:10:00 +00:00
21cf39655e
reserve to speed up allocation
2012-05-14 12:07:34 +00:00
79affebe42
make the traversal and expand using the traits class
...
stored in the AABB_tree
2012-05-14 11:54:16 +00:00
3ebb42ea04
remove extra glue
2012-05-11 13:57:25 +00:00
6df0c3dfde
update doc of FaceGraph primitive to match the new BGL
2012-05-11 13:25:30 +00:00
77c3301ab1
document additional parameter pack blindly forwarded+update HalfedgeGraph primitive
2012-05-11 13:16:01 +00:00
ce41bc6925
id() should be const with no ref
2012-05-11 12:14:21 +00:00
77ea587d47
merge from next
2012-05-11 11:55:44 +00:00
8f55eb0cd3
edge_descriptor is the id
2012-05-11 10:49:38 +00:00
f60aa3f456
doc typo
2012-05-11 09:50:41 +00:00
09b624111b
add two other primitives
2012-05-11 09:47:17 +00:00
899525f493
doc: *deprecate polyhedron_primitives
...
*document 3 new primitives
2012-05-11 09:28:14 +00:00
6c2ef90a21
remove default constructor
2012-05-10 16:41:23 +00:00
8a3d8e1d01
rename cache_primitive -> cache_datum
2012-05-10 16:18:33 +00:00
be1de01b22
*update AABB_primitive: the property maps must operate on Id!
...
*correct and complete implementation for HalfhedgeGraph models
2012-05-10 15:51:45 +00:00
388d53e0a3
correct enable_if
2012-05-10 08:19:38 +00:00
31d6ebe9bf
*add primitive types for HalfedgeGraph and FaceGraph (wip)
...
*clean up triangle and segment primitive
2012-05-09 17:11:09 +00:00
008d297172
typos
2012-05-09 12:28:05 +00:00
6efd7f7954
* remove a template parameter to primitive caching
...
* add a generic class that has two property map as template parameter to define a aabb_tree primitive
2012-05-09 07:14:49 +00:00
6e72bfd1a7
add a point property map to access reference_point, with a default that uses datum()
2012-05-04 14:59:14 +00:00
ed6ac1f4fd
rename Property maps template parameter
...
set primitive caching to false by default
2012-05-04 14:49:27 +00:00
58156fb1e9
merge from next
2012-05-04 12:24:50 +00:00
17797b7271
Merge next into this branch. There have been conflicts in the
...
AABB_tree documentation, Intersections_3 and Arrangement_on_surface_2.
The merge also introduced a regression for a bug fixed in R68387 which
fixed a bug in Triangle_3 Segment_3 intersections. The relevant
testcase is in triangle_other_intersection_test.cpp.
2012-04-24 15:06:19 +00:00
b435af6afd
Add svn:eol-style=native. Rewrite EOLs accordingly.
2012-02-15 13:03:09 +00:00
e0bc688832
Bug fix
...
<CGAL/internal/AABB_tree/nearest_point_segment_3.h> was doing stupid things
if there was a degenerate segment in the AABB tree.
2012-02-15 13:02:25 +00:00
09d86739d0
Recode eol of two files: dos2unix, and add the eol-style=native svn property
2012-02-14 10:43:34 +00:00
6c962ecf31
Remove warnings: do use variables
2012-01-23 12:11:13 +00:00
a37c74d534
Add license files, per package
2012-01-16 15:54:22 +00:00
2af2160942
Turn \ccLicenseQPL into \ccLicenseGPL
2012-01-13 17:13:55 +00:00
8f59fd9592
Turn QPL into LGPLv3+
2012-01-13 16:33:35 +00:00
5b5dd33848
merge changes from next
2012-01-09 12:33:39 +00:00
6c8dc2c2d6
Added by error
2011-11-26 00:08:56 +00:00
f38bae38a4
Add the macro that we can define or not to bench with/without static filter
...
of Do_intersect_3
2011-11-18 15:45:32 +00:00
1ea6830233
New version of Do_intersect_3 static filter
...
This time we hope it is correct.
2011-11-18 15:34:26 +00:00
66ef67491a
benchmark now uses filtering to focus more on intersections
2011-11-18 15:26:32 +00:00
407c3a1fec
The example now uses the new API
2011-11-18 14:19:38 +00:00
b516d75bd5
* AABB tree documentation doesn't talk about metafunctions anymore
2011-11-16 17:46:28 +00:00
60b309246a
Reworked the examples to fit the new API
2011-11-16 17:08:00 +00:00
ca483965fc
Documentation is cleaner
2011-11-16 14:04:45 +00:00
93486787c3
The inside of ccPkgDescription must not contain black lines between macros
...
Otherwise that inserts a buggy "<p>" tag in the package overview where the
doctype does not allow it.
2011-11-15 19:16:23 +00:00
376b6309f4
Adapted AABB_tree to the new concept and documented the API changes
2011-11-15 17:13:09 +00:00
51100ae07c
Added a benchmark for any_intersection and all_intersection to compare object vs optional<variants>
2011-11-14 18:00:57 +00:00
bddbfcc8e4
Adapted AABB_tree for new intersections
2011-11-10 16:00:22 +00:00
88ef561715
Fix the call to Q_INIT_RESOURCE
...
For resources that are shipped by the CGAL_Qt4 library, one need to call
CGAL_QT4_INIT_RESOURCES, a macro that calls CGAL_Qt4_init_resources
(exported by the CGAL_Qt4 DLL)
2011-10-11 09:51:29 +00:00
554f62d411
remove executable property from copyright files
2011-10-03 08:18:16 +00:00
0ba746503d
Add a file with the copyright holder(s) to the package_info
2011-09-29 15:54:43 +00:00
77b9fd79db
Remove ETHZ copyright, as Camille's contribution during his postdoc was minor
2011-09-29 15:34:00 +00:00
fdb7ea6c6b
prepare ccPkgHowToCiteCgal for CGAL-3.10 (in 2012)
2011-09-28 16:15:05 +00:00
dad46fe794
remove not need CMakeLists.txt's
2011-09-27 08:51:49 +00:00
2446abcdd9
Change the title of the chapter of AABB Tree
2011-09-23 14:57:04 +00:00
e91475e722
DOC BUGFIX: typo
2011-09-09 09:02:50 +00:00
8104f41823
DOC BUG_FIX:
...
accelerate_distance_queries(begin,end) never had a third parameter.
2011-09-09 08:58:44 +00:00
5e0c09d8ce
For backward compatibility reasons and according to this article:
...
http://gotw.ca/gotw/006.htm , accelerate_distance_queries and
clear_search_tree should be const.
To guarantee the read-only thread-safety, a mutex for the construction
of the internal kd-tree is used.
At the same time, optimize accelerate_distance_queries() to not
redo computation if nothing has changed in the aabb_tree.
Note that clear_search_tree does not need to be thread-safe as it is private.
2011-09-09 08:31:38 +00:00
c93ba3a215
remove temporary comment
2011-09-08 16:03:23 +00:00
f8449dcec4
more efficient usage of mutex. The lock is only done
...
if the build need to be done. We have an extra "if (m_need_build)"
but otherwise we would need to use mutex::try_lock() which results
in more code and as efficient.
2011-09-08 15:54:44 +00:00
a09f6640f5
remove non-const version of root_node added in r65337
...
for backward compatibility. It is not documented and not
used (in a non-const context).
2011-09-08 12:02:06 +00:00
795ab80486
use a mutex in const function root_node to protect the non const call to
...
build()
The class AABB_tree is now read-only thread-safe
2011-09-08 08:56:16 +00:00
eed2074f7f
Fix constness issues in AABB_tree
...
*remove mutable data members
*accelerate_distance_queries is not const
*clear_search_tree is not const
*root_node() const returns a const Node*
*add root_note() non-const version
*update documentation of AABB_tree class. function constness was not documented
*update changes.html
2011-09-07 09:55:59 +00:00
cec38470a7
remove exe property
2011-09-06 09:52:23 +00:00
5a9d789b73
DOC BUGFIX:
...
dos2unix to convert CR LF end-of-line to LF
(fix bad looking doc page)
2011-09-06 09:31:35 +00:00
f38a57003a
Add an example that takes arrays of doubles and indices to store points and triangles
2011-08-17 11:00:16 +00:00
578d41a962
deprecate AABB_polyhedron_*_primitive
...
add triangle and segment property_map from polyhedron simplices
update examples to use these property maps with modified primitive classes.
2011-07-25 06:22:05 +00:00
7a0b2326e1
add property_map as template parameter of segment and triangle primitive
...
and add a template parameter to enable or disable the caching of the
or object inside the primitive.
Pb to handle: in case the object is not cached, point() might be
expansive
2011-07-20 21:59:14 +00:00
ac9877372d
Update all PkgDescription files to CGAL-3.9
2011-06-27 14:31:45 +00:00
cb2aa6f75b
DOC BUGFIX: remove last occurences of the fact that
...
the traits must be included before the kernel.
Update testsuite accordingly.
2011-06-23 07:56:17 +00:00
ca13392880
CGAL -> \cgal\
2011-05-30 12:36:57 +00:00
7f7a8dc358
merge from trunk
2011-05-16 11:28:24 +00:00
ea7b0b0735
AABB demo: save snapshot now requires selecting a filename.
2011-05-08 16:45:18 +00:00
3c02e07b23
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.
2011-04-28 17:45:22 +00:00
c97205f085
Global handling of CMake policies (second part)
...
We declare
cmake_minimum_required(VERSION 2.6.2)
but we also use
cmake_policy(VERSION 2.8.4)
to declare that our CMake scripts are OK with all the defaults of CMake policies
as of CMake-2.8.4. That shuts down the warnings of CMake-2.8.4.
That way, we no longer need any declaration of specific policies.
Those two lines must be present and maintained in all our CMakeLists.txt
files (the one for the libraries, and also the one for examples and demos,
and maybe tests).
2011-04-28 10:55:56 +00:00
0631943153
Uniform capitalization in our CMake script: use lowercase for commands
2011-04-28 10:36:18 +00:00
ca5c92e034
Global maintenance of CMakeLists.txt: CMake minimal version is -2.6.2
...
The documentation of CGAL says that the minimal version of CMake must be
CMake-2.6.2.
- change cmake_minimum_required to VERSION 2.6.2
- no longer any need for the policy CMP0003 (was for 2.4.x)
- no longer any need for CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS (was for 2.4)
2011-04-27 17:58:27 +00:00
7543ecc606
make g++46 quiet
2011-04-12 10:23:53 +00:00
72f323a5dd
The bbox() of AABB_tree can return a const reference.
2011-04-07 12:54:35 +00:00
da95064578
Update the \ccPkgHowToCiteCgal tag for CGAL-3.8 (2011).
2011-02-24 15:21:10 +00:00
9d666b52a8
Don't link to the global function do_intersect from the arrangement package
2011-02-15 12:18:10 +00:00
b31c054bc0
Don't link to the global function 'insert' from the arrangement package
2011-02-15 12:16:08 +00:00
6f390c482e
Add a missing #include of OpenGL headers.
2011-01-10 16:26:44 +00:00
7e1efcddb2
typo
2011-01-10 10:51:29 +00:00
12e8540bbe
merge from candidate branch.
2011-01-10 10:46:16 +00:00
8b08eb2b5b
Fix -pedantic error.
2010-09-28 21:23:13 +00:00
77a2bead80
Add missing svn properties (keywords and eol-style).
2010-09-20 12:12:46 +00:00
1daecf3943
move BBox vs {sphere,plane,triangle} do_intersect from AABB_tree to Intersections_3,
...
and update accordingly include directives. Update testsuite
remove unneed CMakeLists.txt from AABBtree testsuite
Remove Triangle_3_Plane_3 intersection from AABB_tree (I define it in Intersections_3 some days ago, thus a conflict)
2010-09-01 08:49:24 +00:00
4aa953888f
all polyhedron primitives to be constructed from non compact container iterators
2010-08-31 13:45:38 +00:00
af3ad196a0
Global fix of all uses of qt4_generate_moc: the destination file path must be absolute.
2010-08-11 13:24:20 +00:00
813d775fba
Add missing #include.
2010-07-08 07:35:44 +00:00
5c3aa143ab
Fix warnings.
2010-07-06 06:54:22 +00:00
9c99fa19f8
AABB_demo. fix warnings: 'unsigned int' -> 'std::size_t'.
2010-07-05 07:56:40 +00:00
44a0da017c
ADD FT to disambiguate float/double
2010-06-22 11:43:10 +00:00
ed0b940802
too many additional inculde paths
2010-06-21 15:39:16 +00:00
54f913051c
int -> size_type/std::size_t
2010-06-21 15:38:26 +00:00
52317dd49f
add python script (replace_CGAL_NAMESPACE.py) to replace CGAL_BEGIN_NAMESPACE and CGAL_END_NAMESPACE
...
by namespace CGAL { and } //namespace CGAL. in all .h and .cpp files
in a directory.
Apply it to all packages in the trunk
Remove macro definition from the config.h file.
2010-06-09 07:37:13 +00:00
Sébastien Loriot
Sebastien Loriot
Andreas Fabri
Philipp Möller
Pierre Alliez
Maxime Gimeno
Laurent Rineau
Jane Tournois
Aurélien Vialon
Philipp Möller
Ross Hemsley
Guillaume Damiand
Philipp Möller
Laurent Rineau
Marc Glisse
Pierre Alliez
Stéphane Tayeb