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

261 Commits

Author SHA1 Message Date
Aurélien Vialon ff94f3bf39 Arrangement_on_surface_2 ported. 2014-07-04 17:57:12 +02:00
Sébastien Loriot 5f4813b64d properties_Polyhedron_3.h is now included by graph_traits_Polyhedron_3.h 2014-07-04 17:24:05 +02:00
Aurélien Vialon 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
Sébastien Loriot ff3ad95287 remove boost:: prefix 2014-07-01 13:24:02 +02:00
Andreas Fabri e95c3d452c Switch to new BGL API in package AABB_tree 2014-05-24 08:55:43 +02:00
Sébastien Loriot 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
Sébastien Loriot 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
Sébastien Loriot 91dde8b2c0 use undirected_edges to have only one primitive per edge 2013-06-26 08:55:14 +02:00
Sébastien Loriot bb7c57af94 update AABB-tree demo to use the new primitives 2013-06-20 10:36:43 +02:00
Sébastien Loriot 7d20531b1d Convert remaining CRLF files to LF 2012-12-04 17:09:28 +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
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Laurent Rineau 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
Laurent Rineau 7f7a8dc358 merge from trunk 2011-05-16 11:28:24 +00:00
Pierre Alliez ea7b0b0735 AABB demo: save snapshot now requires selecting a filename. 2011-05-08 16:45:18 +00:00
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 77a2bead80 Add missing svn properties (keywords and eol-style). 2010-09-20 12:12:46 +00:00
Laurent Rineau 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
Stéphane Tayeb 5c3aa143ab Fix warnings. 2010-07-06 06:54:22 +00:00
Stéphane Tayeb 9c99fa19f8 AABB_demo. fix warnings: 'unsigned int' -> 'std::size_t'. 2010-07-05 07:56:40 +00:00
Stéphane Tayeb fe1cf837ce + Recompute distance function when mouse button is pressed (avoids buggy behavior if object is animated when button is pressed). 2010-05-20 07:39:30 +00:00
Stéphane Tayeb 3cfe38ec58 Fix warning. 2010-05-20 06:34:08 +00:00
Stéphane Tayeb 6b1e3d3091 + Use LF(Unix) end-of-line character and set svn:eol-style property to native. 
+ Code is the same
 2010-05-19 07:36:24 +00:00
Stéphane Tayeb 38ae830e13 + Bug fix: ensure that tree is not empty before computation related to cut plane. 2010-05-19 07:05:22 +00:00
Stéphane Tayeb d661ca9158 'Cutting plane: None' now clears cutting plane. 2010-05-19 06:52:47 +00:00
Stéphane Tayeb d8e443c68e + AABB demo: use a moving plane for distance functions 2010-05-19 06:35:59 +00:00
Pierre Alliez fe941f657c added menu entry for cut plane. 2010-03-12 20:24:43 +00:00
Pierre Alliez 8cf3b85894 demo AABB tree: adjust menu for cut plane 2010-03-05 16:01:34 +00:00
Pierre Alliez 25e5b97c9c added few things to improve the demo further after discussion with Stephane. 2010-03-03 09:21:15 +00:00
Stéphane Tayeb 5f91c4394a Fix ui file. 2010-03-03 07:58:28 +00:00
Stéphane Tayeb 436504fad6 Cosmetic: fill cutting plane with a semi-transparent color. 2010-02-25 17:37:43 +00:00
Stéphane Tayeb a1fa2d18c9 Refining a polyhedron now resets previously computed data. 2010-02-25 12:11:22 +00:00
Stéphane Tayeb 3cd9690e34 Add cutting plane feature in AABB tree demo. 2010-02-25 10:36:04 +00:00
Stéphane Tayeb f7a63d0ec5 revert r52901-52902 (moving predicate from AABB_tree to Intersections_3) 2009-11-10 16:58:02 +00:00
Stéphane Tayeb b869d0956d Move intersection predicates and constructions from AABB_tree to Intersection_3. 2009-11-09 12:10:23 +00:00
Pierre Alliez ee3be905cc AABB tree: bug fix (does not crash when no polyhedron is loaded) 2009-07-16 22:22:11 +00:00
Pierre Alliez 09a862825f AABB: one attempt to remove last remaining warning. 2009-07-15 14:06:55 +00:00
Pierre Alliez 0e25638992 AABB tree: final polishing. 2009-07-13 18:58:28 +00:00
Pierre Alliez 9336ab0d54 normalize example models. 2009-07-13 08:09:43 +00:00
Pierre Alliez 7b0b297b56 AABB tree demo data: less complex knot for lower file size. 2009-07-13 08:07:48 +00:00
Pierre Alliez 0b661beb2d AABB tree demo: added two small models. 2009-07-13 08:04:01 +00:00
Pierre Alliez 371704620e AABB tree: fix two quibbles in doc, update demo manual. 2009-07-12 12:27:08 +00:00
Pierre Alliez ee9b4f8823 more on demo manual 2009-07-11 20:17:36 +00:00
Pierre Alliez 8e805de882 AABB tree demo: copy snapshot to clipboard - we may want to add this to the polyhedron demo too. 2009-07-11 16:52:24 +00:00
Pierre Alliez 447982854c AABB tree demo: added save snapshot. 2009-07-11 16:19:10 +00:00
Pierre Alliez 288e8798da AABB tree: added short pdf user guide for the demo. 2009-07-11 07:35:03 +00:00
Pierre Alliez aa4b4fc7b3 AABB tree: update performance section with more details about memory occupancy (table here is better than a curve as the memory grows linearly) 2009-07-11 06:36:12 +00:00
Pierre Alliez 53a898b22d AABB tree: my last update on the demo. 2009-07-10 15:19:24 +00:00
Pierre Alliez ea91324fb3 AABB tree: bug fix and update description 2009-07-10 14:46:21 +00:00
Pierre Alliez bdbcbf7e1d more on benchs 2009-07-10 12:45:03 +00:00
Pierre Alliez 555c6892bd AABB tree: reduce size 2009-07-10 11:28:30 +00:00
Pierre Alliez 6f797c4b8e AABB tree demo: replace QT timer by CGAL one. 2009-07-10 08:14:42 +00:00
Pierre Alliez 4ba24506b1 aabb tree: attempt to eliminate a warning 2009-07-10 06:08:39 +00:00
Pierre Alliez a4147a7ff8 AABB tree demo: more on benchmarks 2009-07-09 14:33:41 +00:00
Pierre Alliez 953f277f91 AABB tree: no more bias for large models as the internal KD-tree is built initially and not at the first query 2009-07-09 13:25:25 +00:00
Pierre Alliez 991e936861 AABB tree: improve benchmarks. 2009-07-09 13:19:47 +00:00
Pierre Alliez 145156621d AABB tree demo: added P shortcut to menu view polyhedron and proper viewer updates. Thanks Laurent. 2009-07-09 09:35:28 +00:00
Pierre Alliez 72ef5cb900 AABB tree: intersection benchmark code made much shorter and more accurate (the random generation of queries is made once for all before benchmarking, hence the timings are more precise). 2009-07-08 22:27:55 +00:00
Laurent Rineau 60da2e471e Fix a typo. 2009-07-08 15:53:48 +00:00
Pierre Alliez 1b26c8d562 AABB tree: fix one table line of the benchmark. 2009-07-08 12:17:31 +00:00
Pierre Alliez de47ee0a27 AABB tree: do_intersect now calls the First_primitive traversal traits (much faster) 
performance section updated
 2009-07-08 12:02:28 +00:00
Pierre Alliez 5388a71ce8 AABB tree: benchmark construction, memory, distances and intersections against #triangles. 2009-07-07 20:13:45 +00:00
Pierre Alliez f07daa35b9 AABB tree: benchmark also any_intersected_primitive (I forgot to call this function) 2009-07-07 14:24:50 +00:00
Pierre Alliez f7e2e92525 aabb tree: more on performance section (benchmark across kernels) 2009-07-06 21:29:36 +00:00
Pierre Alliez 656138e3ae AABB tree: enrich performance section with a summary (general comments and advices about how to put the tree at work with good performances). this is not exhaustive nor conclusive of course but I believe a documentation must also tell the obvious. 2009-07-05 20:45:08 +00:00
Andreas Fabri 1c4b39ac2e Remove some typename 2009-07-05 18:48:22 +00:00
Pierre Alliez 9772610e5f AABB tree: benchmark across kernels and updated intersection tests (more accurate). 
need to fix compilation issue with EPIC kernel (I guess one include missing)
 2009-07-05 13:58:00 +00:00
Pierre Alliez 291861ad99 AABB tree demo: slicer now uses scene bbox 2009-07-05 13:16:08 +00:00
Pierre Alliez 57ba5cc702 aabb tree demo: bbox now used for distance functions. 2009-07-05 12:57:36 +00:00
Pierre Alliez 1c6968a90a aabb tree demo: fix scene bbox 2009-07-05 12:37:44 +00:00
Pierre Alliez 25565b6f99 aabb tree demo: benchmarks more accurate as we subtract the cost of generating the random queries. 2009-07-05 12:14:28 +00:00
Pierre Alliez c621fdfb4c aabbtree: correct compilation errors and warnings on Linux 2009-07-03 21:57:42 +00:00
Pierre Alliez 8cfd4eeeba aabb tree: 
- shortened unitary tests
- one warning removed
 2009-07-03 07:18:35 +00:00
Pierre Alliez e0b5bd6f31 AABB tree: more on memory consumption 2009-07-02 22:47:36 +00:00
Pierre Alliez 95abb7f60d AABB tree: add memory consumption in perf. section. 2009-07-02 22:31:59 +00:00
Pierre Alliez 7bfcc3dd47 AABB tree demo: added menu to benchmark memory against number of facets. 
I had to add a recursive longest edge bisection algorithm to refine a mesh without changing its geometry.
 2009-07-02 21:36:22 +00:00
Camille Wormser 08cc763aa8 steeper slope at the end of the color ramp, so that we see the difference between the facet-distance and edge-distance. 
(at least on the hand model)
What do think about this?
 2009-07-02 12:25:23 +00:00
Camille Wormser 81d2b1bcd7 remove some compilation warnings 2009-07-02 12:03:18 +00:00
Pierre Alliez 92760b731a AABB demo: removed status bar 2009-07-01 21:00:02 +00:00
Pierre Alliez 1d6e776431 AABB tree: some more cleanup. 2009-07-01 20:49:03 +00:00
Pierre Alliez bc80ee2e5c AABB tree: point out some (level 4) warnings for L.Rineau. 2009-07-01 20:23:41 +00:00
Pierre Alliez 08e9db05ae aabb tree demo: better option for inside points + ascii progress bar. 2009-07-01 20:12:40 +00:00
Pierre Alliez dffabd3115 aabb tree demo: 
- shorter code for benchmarking 
- benchmarking duration made as an option
 2009-07-01 19:58:06 +00:00
Pierre Alliez 514f1e8973 AABB tree demo: better file structuring and cleanup. 2009-07-01 19:08:48 +00:00
Pierre Alliez ef1864d6af AABB tree demo: 
- added color ramps for signed and unsigned distance functions (thermal for unsigned, and red/blue for signed)
- fix moc warning issue (thanks Manuel Caroli)
- fix strange value in performance section of user manual (we now understand that the KD-tree is making something really nasty only for large point sets - and we'll investigate the KD tree more)
 2009-07-01 12:55:33 +00:00
Pierre Alliez c74f3dbb59 aabb tree demo: added thermal color ramp for unsigned distance function 2009-07-01 11:56:25 +00:00
Camille Wormser a09dfcf193 un mot dans la sortie pour expliquer qu'il ne faut pas tenir compte du premier appel (pour le moment) 2009-07-01 08:11:07 +00:00
Camille Wormser 2d951c676f calls the first distance benchmark two times: the first one is used to populate the cache... 2009-07-01 08:07:09 +00:00
Pierre Alliez 8c1a65f2ac aabb tree demo: added signed and unsigned distance functions to facets, unsigned to edges. 2009-06-30 22:06:04 +00:00
Pierre Alliez 78d040c39a aabb tree demo: fix one strange compilation error that happens only with VC2005 (took me hours to understand that it's probably a compiler bug). 
benchmark distance queries in the demo and updated user manual (perf section)
 2009-06-30 21:18:31 +00:00
Pierre Alliez 9c96611659 aabb tree demo: add one small hand model 2009-06-30 20:19:03 +00:00
Pierre Alliez 98118bddce aabb tree demo: distance benchs (strange compilation issue on Windows) 2009-06-30 12:15:06 +00:00
Pierre Alliez 125d8cab6b aabb tree: attempt to fix compilation issue 2009-06-30 08:42:01 +00:00
Pierre Alliez 154bfac3f6 aabb tree: added plane queries in the performance section and demo. 2009-06-29 21:23:13 +00:00
Pierre Alliez bf70fa2c9e more on AABB demo (simple unsigned distance function to facets) 
must fix compilation issue
 2009-06-29 20:17:33 +00:00
Pierre Alliez 5c0b091370 more on AABB demo 2009-06-29 17:00:29 +00:00
Pierre Alliez 1dfddba18a more on AABB demo 2009-06-29 15:55:58 +00:00
Pierre Alliez 8b2c3807de moved AABB demo, thanks Laurent for pointing this out. 2009-06-29 13:00:44 +00:00
Pierre Alliez b18696af81 more on AABB demo 2009-06-29 11:46:43 +00:00
Laurent Rineau b037450304 Fix a VC++-ism. 2009-06-29 11:20:39 +00:00
Pierre Alliez e220203a60 aabb demo: more code cleanup 
one attempt to add shortcut for a menu
 2009-06-28 21:15:31 +00:00
Pierre Alliez eb8b4c0c73 aabb demo: more code cleanup 2009-06-28 20:19:46 +00:00
Pierre Alliez 891219e704 aabb tree demo: change data models, remove two unnecessary files. 2009-06-28 19:59:58 +00:00
Pierre Alliez 21e59e43d8 aabb tree demo: simplified menus (only two for benchmarking distances and intersections) 
the demo must stay as simple as possible.
 2009-06-28 19:44:02 +00:00
Pierre Alliez 0c22c8e729 aabb tree : added menu to generate and display a set of points intersecting the edges of a polyhedron. 2009-06-28 18:07:17 +00:00
Pierre Alliez c2e51c88d4 aabb tree : added menu to generate and display a set of points intersecting the facets of a polyhedron. 
more view and edit menus.
 2009-06-28 07:53:44 +00:00
Pierre Alliez 071f2f6a55 aabb tree : added menu to generate and display a set of segments intersecting the facets of a polyhedron. 2009-06-28 07:15:26 +00:00
Pierre Alliez 56ff4a3a32 aabb tree qt-based demo: added menu to generate and display a set of points inside a polyhedron. 
next to come: signed and unsigned distance functions, and benchmarking of distances, intersection to both edges and facets.
 2009-06-27 21:41:06 +00:00
Pierre Alliez 360f2a73d7 aabb tree: initial qt-based demo 2009-06-27 20:33:46 +00:00