Sébastien Loriot
09b624111b
add two other primitives
2012-05-11 09:47:17 +00:00
Sébastien Loriot
899525f493
doc: *deprecate polyhedron_primitives
...
*document 3 new primitives
2012-05-11 09:28:14 +00:00
Sébastien Loriot
6c2ef90a21
remove default constructor
2012-05-10 16:41:23 +00:00
Sébastien Loriot
8a3d8e1d01
rename cache_primitive -> cache_datum
2012-05-10 16:18:33 +00:00
Sébastien Loriot
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
Sébastien Loriot
388d53e0a3
correct enable_if
2012-05-10 08:19:38 +00:00
Sébastien Loriot
31d6ebe9bf
*add primitive types for HalfedgeGraph and FaceGraph (wip)
...
*clean up triangle and segment primitive
2012-05-09 17:11:09 +00:00
Sébastien Loriot
008d297172
typos
2012-05-09 12:28:05 +00:00
Sébastien Loriot
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
Sébastien Loriot
6e72bfd1a7
add a point property map to access reference_point, with a default that uses datum()
2012-05-04 14:59:14 +00:00
Sébastien Loriot
ed6ac1f4fd
rename Property maps template parameter
...
set primitive caching to false by default
2012-05-04 14:49:27 +00:00
Sébastien Loriot
58156fb1e9
merge from next
2012-05-04 12:24:50 +00:00
Philipp Möller
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
Laurent Rineau
b435af6afd
Add svn:eol-style=native. Rewrite EOLs accordingly.
2012-02-15 13:03:09 +00:00
Laurent Rineau
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
Laurent Rineau
09d86739d0
Recode eol of two files: dos2unix, and add the eol-style=native svn property
2012-02-14 10:43:34 +00:00
Laurent Rineau
6c962ecf31
Remove warnings: do use variables
2012-01-23 12:11:13 +00:00
Laurent Rineau
a37c74d534
Add license files, per package
2012-01-16 15:54:22 +00:00
Laurent Rineau
2af2160942
Turn \ccLicenseQPL into \ccLicenseGPL
2012-01-13 17:13:55 +00:00
Laurent Rineau
8f59fd9592
Turn QPL into LGPLv3+
2012-01-13 16:33:35 +00:00
Laurent Rineau
5b5dd33848
merge changes from next
2012-01-09 12:33:39 +00:00
Laurent Rineau
6c8dc2c2d6
Added by error
2011-11-26 00:08:56 +00:00
Laurent Rineau
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
Laurent Rineau
1ea6830233
New version of Do_intersect_3 static filter
...
This time we hope it is correct.
2011-11-18 15:34:26 +00:00
Philipp Möller
66ef67491a
benchmark now uses filtering to focus more on intersections
2011-11-18 15:26:32 +00:00
Philipp Möller
407c3a1fec
The example now uses the new API
2011-11-18 14:19:38 +00:00
Philipp Möller
b516d75bd5
* AABB tree documentation doesn't talk about metafunctions anymore
2011-11-16 17:46:28 +00:00
Philipp Möller
60b309246a
Reworked the examples to fit the new API
2011-11-16 17:08:00 +00:00
Philipp Möller
ca483965fc
Documentation is cleaner
2011-11-16 14:04:45 +00:00
Laurent Rineau
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
Philipp Möller
376b6309f4
Adapted AABB_tree to the new concept and documented the API changes
2011-11-15 17:13:09 +00:00
Philipp Möller
51100ae07c
Added a benchmark for any_intersection and all_intersection to compare object vs optional<variants>
2011-11-14 18:00:57 +00:00
Philipp Möller
bddbfcc8e4
Adapted AABB_tree for new intersections
2011-11-10 16:00:22 +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
Sébastien Loriot
554f62d411
remove executable property from copyright files
2011-10-03 08:18:16 +00:00
Andreas Fabri
0ba746503d
Add a file with the copyright holder(s) to the package_info
2011-09-29 15:54:43 +00:00
Andreas Fabri
77b9fd79db
Remove ETHZ copyright, as Camille's contribution during his postdoc was minor
2011-09-29 15:34:00 +00:00
Laurent Rineau
fdb7ea6c6b
prepare ccPkgHowToCiteCgal for CGAL-3.10 (in 2012)
2011-09-28 16:15:05 +00:00
Sébastien Loriot
dad46fe794
remove not need CMakeLists.txt's
2011-09-27 08:51:49 +00:00
Laurent Rineau
2446abcdd9
Change the title of the chapter of AABB Tree
2011-09-23 14:57:04 +00:00
Sébastien Loriot
e91475e722
DOC BUGFIX: typo
2011-09-09 09:02:50 +00:00
Sébastien Loriot
8104f41823
DOC BUG_FIX:
...
accelerate_distance_queries(begin,end) never had a third parameter.
2011-09-09 08:58:44 +00:00
Sébastien Loriot
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
Sébastien Loriot
c93ba3a215
remove temporary comment
2011-09-08 16:03:23 +00:00
Sébastien Loriot
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
Sébastien Loriot
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
Sébastien Loriot
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
Sébastien Loriot
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
Sébastien Loriot
cec38470a7
remove exe property
2011-09-06 09:52:23 +00:00
Sébastien Loriot
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
Andreas Fabri
f38a57003a
Add an example that takes arrays of doubles and indices to store points and triangles
2011-08-17 11:00:16 +00:00
Sébastien Loriot
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
Sébastien Loriot
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
Laurent Rineau
ac9877372d
Update all PkgDescription files to CGAL-3.9
2011-06-27 14:31:45 +00:00
Sébastien Loriot
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
Sébastien Loriot
ca13392880
CGAL -> \cgal\
2011-05-30 12:36:57 +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
0631943153
Uniform capitalization in our CMake script: use lowercase for commands
2011-04-28 10:36:18 +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
Marc Glisse
7543ecc606
make g++46 quiet
2011-04-12 10:23:53 +00:00
Laurent Rineau
72f323a5dd
The bbox() of AABB_tree can return a const reference.
2011-04-07 12:54:35 +00:00
Laurent Rineau
da95064578
Update the \ccPkgHowToCiteCgal tag for CGAL-3.8 (2011).
2011-02-24 15:21:10 +00:00
Andreas Fabri
9d666b52a8
Don't link to the global function do_intersect from the arrangement package
2011-02-15 12:18:10 +00:00
Andreas Fabri
b31c054bc0
Don't link to the global function 'insert' from the arrangement package
2011-02-15 12:16:08 +00:00
Laurent Rineau
6f390c482e
Add a missing #include of OpenGL headers.
2011-01-10 16:26:44 +00:00
Sébastien Loriot
7e1efcddb2
typo
2011-01-10 10:51:29 +00:00
Sébastien Loriot
12e8540bbe
merge from candidate branch.
2011-01-10 10:46:16 +00:00
Laurent Rineau
8b08eb2b5b
Fix -pedantic error.
2010-09-28 21:23:13 +00:00
Laurent Rineau
77a2bead80
Add missing svn properties (keywords and eol-style).
2010-09-20 12:12:46 +00:00
Sébastien Loriot
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
Sébastien Loriot
4aa953888f
all polyhedron primitives to be constructed from non compact container iterators
2010-08-31 13:45:38 +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
813d775fba
Add missing #include.
2010-07-08 07:35:44 +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
Andreas Fabri
44a0da017c
ADD FT to disambiguate float/double
2010-06-22 11:43:10 +00:00
Andreas Fabri
ed0b940802
too many additional inculde paths
2010-06-21 15:39:16 +00:00
Andreas Fabri
54f913051c
int -> size_type/std::size_t
2010-06-21 15:38:26 +00:00
Sébastien Loriot
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
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
afdd14bb62
Fix compilation on x86-64_Linux-2.6_llvm-clang-with-g++-4.4.1_F11: use fully qualified name for cross_product call.
2010-05-20 07:02:05 +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
Laurent Rineau
a65e49133b
Fix: in <CGAL/AABB_intersections.h>,
...
Kernel::Do_intersect_3()(Triangle_3, Bbox_3) was available
but not Kernel::Do_intersect_3()(Bbox_3, Triangle_3).
2010-05-05 14:54:49 +00:00
Pierre Alliez
961ab97aa1
fix img size
2010-04-01 18:51:33 +00:00
Sébastien Loriot
15557626cc
remove not needed break instructions (avoid warning with g++ (Debian 4.3.4-6) 4.3.4)
2010-03-31 08:45:58 +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
Andreas Fabri
0758e61952
fix for the case that one of the triangle vertices is on the plane
2010-02-25 11:55:20 +00:00
Stéphane Tayeb
3cd9690e34
Add cutting plane feature in AABB tree demo.
2010-02-25 10:36:04 +00:00
Sylvain Pion
85dc12f2a7
Remove empty lines at beginning and end of files
...
(apply Scripts/developer_scripts/remove_empty_lines.pl).
2010-02-01 12:55:28 +00:00
Laurent Rineau
5e4c755bdb
Merged revisions 53668-53669,53678-53679,53682-53686 via svnmerge from
...
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch
........
r53668 | yvinec | 2010-01-19 11:00:41 +0100 (Tue, 19 Jan 2010) | 3 lines
added changes for Mesh_3
........
r53669 | yvinec | 2010-01-19 11:04:38 +0100 (Tue, 19 Jan 2010) | 3 lines
fixed page layout in Changes for Mesh_3
........
r53678 | spion | 2010-01-20 13:32:36 +0100 (Wed, 20 Jan 2010) | 2 lines
Link AK_d and reorder to have Modular close to NT.
........
r53679 | lrineau | 2010-01-20 13:37:23 +0100 (Wed, 20 Jan 2010) | 9 lines
Merge from trunk:
| New Revision: 53666
| Author: sloriot
| Date: 2010-01-19 08:41:16 +0100 (Tue, 19 Jan 2010)
|
| Log message:
|
| remove warnings
........
r53682 | lrineau | 2010-01-20 14:31:41 +0100 (Wed, 20 Jan 2010) | 2 lines
Simplify the URL to CORE, so that "_" is not in the URL (Pb with manual tools)
........
r53683 | lrineau | 2010-01-20 14:42:23 +0100 (Wed, 20 Jan 2010) | 3 lines
Fix the package description of AK (fix the bib label and the version of
CGAL)
........
r53684 | lrineau | 2010-01-20 14:45:53 +0100 (Wed, 20 Jan 2010) | 1 line
clean PkgDescription.tex
........
r53685 | lrineau | 2010-01-20 15:01:09 +0100 (Wed, 20 Jan 2010) | 3 lines
- Update PkgDexcription.tex to year 2010.
- Add manual-3.6.bib
........
r53686 | lrineau | 2010-01-20 15:03:10 +0100 (Wed, 20 Jan 2010) | 1 line
Update the biblio shipped in manual tools, using manual-3.6.bib
........
2010-01-20 14:07:18 +00:00
Laurent Rineau
a3da7084aa
Merged revisions 53684 via svnmerge from
...
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.5-branch
........
r53684 | lrineau | 2010-01-20 14:45:53 +0100 (Wed, 20 Jan 2010) | 1 line
clean PkgDescription.tex
........
2010-01-20 14:05:12 +00:00
Stéphane Tayeb
90288a058b
Move do_intersect(Bbox,Bbox/Line/Ray/Seg) and intersection(Triangle,Line/Ray/Seg) to Intersections_3.
2009-12-18 15:13:30 +00:00
Stéphane Tayeb
b33dd92a52
Update headers of test files.
2009-12-18 14:59:36 +00:00
Stéphane Tayeb
e476966856
Change License to LGPL. Fix Copyrights.
2009-12-18 14:35:34 +00:00
Stéphane Tayeb
2f80a28b5e
Don't call intersection on degenerate objects in test-suite.
2009-12-18 10:42:09 +00:00
Stéphane Tayeb
cab2982563
Implement Sylvain's comments:
...
+ add missing includes
+ avoid object copies
+ replace CGAL_kernel_assertion(false) by CGAL_error()
+ use is() function of CGAL::Object
+ improve style (remove spaces, white lines...)
2009-12-16 17:03:17 +00:00
Stéphane Tayeb
3b5bfbc3a4
Merge r53417 from 3.5-branch/AABB_tree
...
r53417 | stayeb
Fix PkgDescription.tex: add bib link.
2009-12-15 14:26:28 +00:00
Stéphane Tayeb
ab503ac11f
* Fix triangle_other test
...
* Fix Triangle_3_Ray_3_intersection.h header
2009-11-24 13:07:45 +00:00
Stéphane Tayeb
7ff50b95a0
* Rename test files which have to be moved to kernel
...
* Fix header protection names
2009-11-20 17:02:39 +00:00
Stéphane Tayeb
836d042180
Fix previous commit (thanks to compiler cache...).
2009-11-20 16:57:44 +00:00
Stéphane Tayeb
6550224744
Move and rename files (prepares integration into kernel).
2009-11-20 16:38:02 +00:00
Stéphane Tayeb
854fef2f8a
* Update (triangle, seg/line/ray) intersection computation
...
* Enrich (triangle, seg/line/ray) test suite
* Minor formatting change in Bbox_3_line_3_do_intersect.h
2009-11-20 13:09:08 +00:00
Stéphane Tayeb
ef8a51e15a
Fix distance bound in test.
2009-11-20 07:52:25 +00:00
Stéphane Tayeb
4f50028d7b
Minor formatting clean.
2009-11-18 08:51:51 +00:00
Stéphane Tayeb
5e4f15878f
Fix AABB_tree distance test.
2009-11-18 08:03:09 +00:00
Stéphane Tayeb
640f56604e
Minor fix in test suite.
2009-11-17 16:57:29 +00:00
Stéphane Tayeb
c095f38e66
Rewrite (seg/ray/line - bbox) predicates without divisions.
2009-11-17 16:41:57 +00:00
Stéphane Tayeb
3f1a416bc0
Fix syntax error.
2009-11-16 12:48:11 +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
6d4f0d0c34
Remove old tests from CMakeLists.txt.
2009-11-09 12:19:10 +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
ca4f73b860
fix #ifdefs
2009-10-29 10:42:53 +00:00
Laurent Rineau
83912b2952
Massive fix of svn:keywords properties, and $URL$ keyword.
2009-10-20 08:59:26 +00:00
Laurent Rineau
7bf0990dbb
Minor fix: the correct way to construct a FT from 0 or 1, that is
...
documented to work with all FT, is FT(0)/FT(1), and not
(FT)(0.0)/(FT)(1.0). The concept Field refines FromIntConstructible:
See:
http://www.cgal.org/Manual/last/doc_html/cgal_manual/Algebraic_foundations_ref/Concept_Field.html
and follow the "refines" chain until:
http://www.cgal.org/Manual/last/doc_html/cgal_manual/Algebraic_foundations_ref/Concept_FromIntConstructible.html
2009-10-20 07:34:13 +00:00
Stéphane Tayeb
1e4358dc07
Fix warning.
2009-10-20 07:03:58 +00:00
Stéphane Tayeb
99a5c3160a
Fix compilation error.
2009-10-15 06:40:45 +00:00
Stéphane Tayeb
aa3e601755
Computation and code factorization (to avoid early roundings).
2009-10-14 08:22:24 +00:00
Stéphane Tayeb
cfa88ab257
* Fix Triangle_3_line_3_intersection.h (implementation inspired from Triangle_3_line_3_do_intersect.h)
...
* Add test for triangle_3/line_3 intersection (should be enriched maybe) in file aabb_intersection.cpp
* Test exact_exact kernel in aabb_do_intersect_test.cpp
2009-10-09 14:09:14 +00:00
Stéphane Tayeb
c38febe8d3
Attempt to fix warning (pdflatex call).
2009-10-06 07:24:49 +00:00
Stéphane Tayeb
9ba530384f
* Fix Triangle_3_segment_3_intersection.h (implementation inspired from Triangle_3_segment_3_do_intersect.h)
...
* Add test for triangle_3 segment_3 intersection (should be enriched maybe)
* Test more kernels in aabb_do_intersect_test.cpp
2009-10-05 09:41:47 +00:00
Laurent Rineau
1e2efff110
Merged revisions 52042 via svnmerge from
...
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.5-branch
........
r52042 | lrineau | 2009-09-29 15:11:10 +0200 (Tue, 29 Sep 2009) | 2 lines
Fix the path to illustration pictures, in pkg overview.
........
2009-09-30 14:44:39 +00:00
Andreas Fabri
50230b90db
Add link to demo and link to illustrations
2009-09-28 15:27:43 +00:00
Stéphane Tayeb
b250422cd4
Add missing file aabb_do_intersect_test.cpp
2009-09-21 07:45:46 +00:00
Stéphane Tayeb
5f464aec46
Merge [r51090:51960]
...
From branches/CGAL-3.5-branch/AABB_tree to trunk/AABB_tree
r51953 | stayeb | 2009-09-16 13:17:12 +0200 (Wed, 16 Sep 2009) | 1 line
* Fix AABB_tree missing default ctor.
r51936 | stayeb | 2009-09-14 19:37:18 +0200 (Mon, 14 Sep 2009) | 2 lines
* Fix ray_bbox & line_bbox do_intersect predicates for filtered kernels
* add a small test for do_intersect(seg/ray/line, bbox) queries
r51932 | lrineau | 2009-09-14 15:32:24 +0200 (Mon, 14 Sep 2009) | 3 lines
* Fix predicates of <CGAL/AABB_intersection.h>, so that they are correctly filtered when called from the global function template CGAL::do_intersect
r51931 | stayeb | 2009-09-14 15:22:12 +0200 (Mon, 14 Sep 2009) | 1 line
* Fix bbox_3_segment_3 intersection for filtered kernels.
r51868 | lrineau | 2009-09-07 17:01:48 +0200 (Mon, 07 Sep 2009) | 2 lines
* Fix the non-filtering of BBox_3-Segment_3 intersection.
2009-09-18 12:49:03 +00:00
Sylvain Pion
5626725230
Remove a bunch of EPS files.
2009-09-18 12:27:38 +00:00
Pierre Alliez
63d3ba8f0d
default constructor.
2009-09-15 10:36:40 +00:00
Pierre Alliez
bfaee9aae4
adds default constructor.
2009-09-15 10:01:58 +00:00
Sylvain Pion
8573fe26ce
Rename CGALi to internal.
2009-08-24 17:10:04 +00:00
Laurent Rineau
ccd0fcc73f
Merged revisions 51083 via svnmerge from
...
svn+ssh://scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.5-branch
........
r51083 | stayeb | 2009-08-06 09:48:42 +0200 (Thu, 06 Aug 2009) | 1 line
Minor fix: include CGAL/intersections.h instead of CGAL/intersection_3.h.
........
2009-08-18 14:13:54 +00:00
Andreas Fabri
02d8ef6390
Capitalize words in headings
2009-08-17 13:13:54 +00:00
Pierre Alliez
63c08f1fc5
AABB tree: add pointer to Box_intersection_d (recommended by Sylvain).
2009-08-07 19:26:10 +00:00
Pierre Alliez
d987180d75
fix copyrights.
2009-08-07 18:57:08 +00:00
Sylvain Pion
7e0db3191b
Fix & homogenize Copyright header lines :
...
- Copyrigth -> Copyright
- ETHZ (Suisse) -> ETH Zurich (Switzerland)
2009-08-07 11:18:32 +00:00
Laurent Rineau
f81561f3d4
Add copyright and license header
2009-07-31 21:06:50 +00:00
Laurent Rineau
968b31d684
Move the non-documented AABB_polyhedral_oracle.h to the polyhedron demo.
2009-07-22 14:06:10 +00:00
Stéphane Tayeb
0a784e8d1f
Fix AABB_polyhedral_oracle (needed by Polyhedron_demo).
2009-07-22 08:18:13 +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
8baebaeded
some cleaning
2009-07-16 12:39:08 +00:00
Camille Wormser
6261018859
memory check
2009-07-16 12:25:46 +00:00
Camille Wormser
08978d7a11
formatting
2009-07-16 11:45:51 +00:00
Camille Wormser
b6ded1b7f4
enlever les retours a la ligne
2009-07-16 10:29:52 +00:00
Pierre Alliez
eb645bed0c
AABB tree: fix quibble in comment.
2009-07-16 06:11:29 +00:00
Pierre Alliez
cd199a7504
AABB tree: added one message to track the last remaining error in the test suite.
2009-07-16 06:07:41 +00:00
Pierre Alliez
09a862825f
AABB: one attempt to remove last remaining warning.
2009-07-15 14:06:55 +00:00
Pierre Alliez
6bd3cd7c0d
AABB tree: one attempt to obtain better spacing in html doc.
2009-07-14 07:15:05 +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
4e5658b063
AABB tree: shorten tests duration by removing largest model.
2009-07-11 15:02:27 +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
77b6a81bb1
better page layout
2009-07-10 14:36:20 +00:00
Pierre Alliez
f863c28cdb
remove outline in figure
2009-07-10 14:34:05 +00:00
Pierre Alliez
86a84af4eb
reduce image size
2009-07-10 12:46:01 +00:00
Pierre Alliez
bdbcbf7e1d
more on benchs
2009-07-10 12:45:03 +00:00
Pierre Alliez
4701db503b
reduce size of images
2009-07-10 11:30: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
cea16e2180
AABB tree: add comments about how to order the includes so that the compiler parses the intersection functions.
2009-07-09 13:36:33 +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
Stéphane Tayeb
b92c3902f5
Fix a bug for demo benchmark. KD-Tree is now build right after its construction (instead of at the first query).
2009-07-09 11:46:28 +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
4c4a7f1f7b
AABB tree: my last pass on the doc (few quibbles, and re-indent examples)
2009-07-09 08:57:55 +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
0d7cc0b6b5
Fix: AABBTraits must not require size_type. The size_type is an
...
implementation detail of the class template AABB_tree, and traits classes
cannot know that type.
2009-07-08 16:16:15 +00:00
Laurent Rineau
60da2e471e
Fix a typo.
2009-07-08 15:53:48 +00:00
Pierre Alliez
f8ca4fe940
aabb tree: fix compil issue
2009-07-08 12:38:45 +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
7b0f96ca06
aabb tree: attempt to fix warning:
...
message is Triangle_3_segment_3_intersection.h:93: warning: control reaches end of non-void function
laurent (R) - can you take a look at it?
2009-07-06 19:40:54 +00:00
Pierre Alliez
478056852a
fix doc compil. issue
2009-07-06 14:41:06 +00:00
Pierre Alliez
662a20431d
aabb tree doc: remove unused jpg files
2009-07-06 14:37:53 +00:00
Pierre Alliez
5c9d621113
AABB tree: one attempt to solve the doc compilation issue.
...
apparently the file memory.eps is doing something wrong - I am digging.
2009-07-06 14:25:59 +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
bdd40ee5dc
aabb tree: rename three custom-primitive examples and update example section of user manual.
2009-07-05 07:17:42 +00:00
Camille Wormser
9b052fbe27
Another more involved example, where the triangles are stored as a flat vector of indices,
...
referring to a vector of points.
2009-07-04 13:38:34 +00:00
Camille Wormser
e591eb6bc5
An more involved example where the triangles are stored in a flat vector of points
...
(quite common in graphics)
2009-07-04 13:18:33 +00:00
Pierre Alliez
c621fdfb4c
aabbtree: correct compilation errors and warnings on Linux
2009-07-03 21:57:42 +00:00
Camille Wormser
6f741e7ed1
a new example, where a primitive is defined from scratch.
2009-07-03 16:25:16 +00:00
Pierre Alliez
bad136d454
aabb tree: spell check y Patrick Mullen.
2009-07-03 12:31:36 +00:00
Pierre Alliez
8cfd4eeeba
aabb tree:
...
- shortened unitary tests
- one warning removed
2009-07-03 07:18:35 +00:00
Pierre Alliez
5dbc82d599
aabb doc: move figs into separate folder.
2009-07-03 06:41: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
4c3c6e3845
AABB tree: remove warnings in ascii outputs to remove warnings in the test suite.
2009-07-01 21:18:20 +00:00
Pierre Alliez
f22533c055
AABB tree: removed unused files.
2009-07-01 21:07:48 +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
18611be7bd
aabb data: normalize model.
2009-07-01 13:36:42 +00:00
Pierre Alliez
446daa069a
aabb tree : update perf. section.
2009-07-01 13:09:51 +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
0c9f65bc92
aabb tree: update teaser
2009-06-30 20:00:07 +00:00
Pierre Alliez
bb2380a55a
aabb tree teaser image
2009-06-30 13:05:29 +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
734ee1e504
aabb tree: caption of curve
2009-06-30 08:21:04 +00:00
Pierre Alliez
7da7d85386
AABB tree: add .eps file
2009-06-30 08:12:41 +00:00
Pierre Alliez
0d97e5ed13
aabb tree: correct images in doc
2009-06-30 08:11:49 +00:00
Pierre Alliez
49980a6d75
aabb tree: added curve in performance section
2009-06-30 08:07:29 +00:00
Pierre Alliez
57a3c4fd7a
AABB tree: fix doc compilation issue
2009-06-30 07:39:42 +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
35170ac299
aabb tree: added performance section [to be completed with distance queries and curves]
2009-06-29 21:06:26 +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