Commit Graph

64306 Commits

Author SHA1 Message Date
Clément Jamin d88eca3857 Update Kernel--Side_of_oriented_sphere_d.h
Fix the return value for the functor. 

Every model available returns Oriented_side, which is the only option
because the functor does not know the orientation of the 
sphere and we don't want to compute it (to do that, one should
use Side_of_bounded_sphere_d).
2015-09-09 11:15:12 +02:00
Laurent Rineau 022d7325a3 autotest_cgal: Do not try to use lockfile on Windows, buggy 2015-09-08 13:08:44 +02:00
Laurent Rineau f99b88d671 autotest_cgal on Windows: fix pre-compiled binaries
Also collect DLLs from sub-directories: in the Polyhedron demo, for
example, there are generated DLLs in ./implicit_functions/
2015-09-08 13:07:32 +02:00
Laurent Rineau 5dfea470e7 autotest_cgal: small modification for Cygwin
In case of Cygwin, use cygpath on CGAL_REFERENCE_CACHE_DIR
2015-09-08 13:07:20 +02:00
Laurent Rineau d2293994ba Merge pull request #321 from sloriot/Nef_3-doc_bug_fix
Nef_3: fix minor bug in documentation
2015-09-08 11:27:15 +02:00
Laurent Rineau 90c4720eee Merge pull request #320 from lrineau/CGAL_ipelets-fix_warning_after_assert_assertion-GF
Fix warning, after the replacement assert/CGAL_assertion
2015-09-08 11:12:01 +02:00
Sébastien Loriot 32c28ee329 fix doc 2015-09-07 16:07:53 +02:00
Laurent Rineau ac47d7ac24 Fix a stupid typo: CGAL_USE 2015-09-07 15:42:24 +02:00
Sébastien Loriot 37b9b8e7bf force update of the display
mimic what is done for load(istream)

Trivial bug fix for demo
2015-09-07 15:12:21 +02:00
Laurent Rineau c3926316ce Fix warning, after the replacement assert/CGAL_assertion
When CGAL_assertion is defined to the empty macro, then the variable
'ok' triggers a warning:

include/CGAL/CGAL_Ipelet_base_v7.h:848:14: warning: variable 'ok' set but not used [-Wunused-but-set-variable]
         bool ok=true;
              ^

See for example
https://cgal.geometryfactory.com/CGAL/Members/testsuite/CGAL-4.7-Ic-136/CGAL_ipelets_Demo/TestReport_lrineau_x86-64_Linux-Fedora19_g++-4.8_Release.gz
2015-09-07 15:03:43 +02:00
Laurent Rineau 7ddefbdcc8 Merge pull request #297 from afabri/CGAL-assert-GF
assert() should not be used in CGAL headers!
2015-09-07 10:58:20 +02:00
Laurent Rineau 0bc029c5b8 Revert "suppress performance warning concerning an assertion"
This reverts commit 580b65d8a5.

The warning was already fixed by commit
63ae26eb0f.
2015-09-04 13:52:45 +02:00
Andreas Fabri 0d18ccf09d Merge branch 'CGAL-assert-GF' of github.com:CGAL/cgal-dev into CGAL-assert-GF 2015-09-04 12:30:26 +02:00
Andreas Fabri 580b65d8a5 suppress performance warning concerning an assertion 2015-09-04 12:30:07 +02:00
Laurent Rineau 0e2d38cf9b Merge pull request #298 from afabri/CGAL-support_msvc2015-GF
VC2015 fixes in Straight_skeleton_2
2015-09-04 11:37:46 +02:00
Laurent Rineau 1eab366954 Merge pull request #312 from sloriot/Polyhedron_demo-stl_io_plugin_safer-sloriot
Polyhedron demo: first check that the STL file is a polygon mesh before loading it

Conflicts:
	Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt
2015-09-04 11:36:13 +02:00
Laurent Rineau 59ac9f30fc Merge pull request #293 from sloriot/PMP-fix_remove_degenerate_faces-sloriot
Polygon mesh processing:  fix remove_degenerate_faces() but do not publish it in the documentation
2015-09-04 11:24:36 +02:00
Laurent Rineau 63ae26eb0f Fix MSVC warning: conversion from size_t to bool
MSVC emits that warning:

    include\CGAL/Implicit_to_labeling_function_wrapper.h(205) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)

The fix is to explicit exactly what is tested. The following:

    CGAL_assertion(funcs.size());

is replaced by the explicit:

    CGAL_assertion(funcs.size() != 0);
2015-09-04 11:14:56 +02:00
Laurent Rineau 9bae0c0e63 Merge pull request #270 from sgiraudot/Polyhedron_demo-WLOP_plugin-sgiraudot
Polyhedron demo point set processing plugins
2015-09-03 17:22:54 +02:00
Sébastien Loriot 4931c8c889 first check that the stl file is a polygon mesh before loading it 2015-09-03 15:17:14 +02:00
Andreas Fabri 311d4d9120 fix order of template arguments, and document parameter C 2015-09-03 14:31:26 +02:00
Laurent Rineau fc7636b1ea Merge pull request #311 from afabri/Filtered_kernel-Equal_Vector_3-GF
No need for a filtered predicate for Equal_3()(Vector_3, Vector_3)
2015-09-03 14:14:14 +02:00
Laurent Rineau 35d63a2fb4 Merge pull request #302 from gdamiand/STL_extension-isused_test-gdamiand
STL Extensions: add test for is_used
2015-09-03 13:48:20 +02:00
Laurent Rineau 69706c7de9 Merge pull request #127 from gdamiand/Combinatorial_map_save_load-gdamiand
Combinatorial_map: add save/load functionality in the LCC demo
2015-09-03 13:43:36 +02:00
Sébastien Loriot b5f44b3960 forgot to remove from the cmakelist example using a non documented function 2015-09-03 13:07:46 +02:00
Laurent Rineau 253e0dddcf Fix issue #300
Update_c3t3::operator() does not return bool!
2015-09-03 12:59:05 +02:00
Laurent Rineau cf74c64c46 Merge pull request #307 from CGAL/Polyhedron_demo-fix_reset_color-sloriot
be more permissive for color reset
2015-09-03 12:50:16 +02:00
Laurent Rineau 3b7f63f2e9 Merge pull request #310 from maxGimeno/CGAL_texture_fix_GF
Polyhedron demo, fix the use of texture2D in a shader
2015-09-03 12:39:57 +02:00
Guillaume Damiand e2656f9600 Remove glu link in cmake 2015-09-03 12:35:42 +02:00
Guillaume Damiand 9b4b3ee846 More cleanup plus do not recenter the scene at each modification. 2015-09-03 12:32:20 +02:00
Jane Tournois 45baa96c6e msvc does not support explicit conversion of optionals : fix it 2015-09-03 10:22:32 +02:00
Andreas Fabri 9a3e39a330 No need for a filtered predicate for Equal_3::operator()(Vector_3,Vector_3) 2015-09-02 16:13:14 +02:00
Maxime Gimeno 1533deff99 Textures Fix
- Use texture2D instead of texture in the shaders to have it in gglsl 1.2 and not 1.3.
2015-09-02 12:14:37 +02:00
Laurent Rineau ee52ce70c1 Merge pull request #305 from gdamiand/CMap-docfix-gdamiand
Add the ConstHandle concept, and document handles in Combinatorial_map
2015-09-02 10:23:20 +02:00
Sebastien Loriot 79685a263f be more permissive for color reset
This enables the reset to work after a coloration per connected component
2015-09-01 17:27:04 +02:00
Laurent Rineau 7a6f7ee044 updated crontab (automated commit) 2015-09-01 13:18:03 +02:00
Guillaume Damiand 2711acd67c Update is_used test. 2015-08-31 20:45:08 +02:00
Guillaume Damiand 586eb0a266 Update doc of XXX_handle (documentation bug fix). 2015-08-31 17:28:36 +02:00
Guillaume Damiand 816dda0c23 Add const handle concept. 2015-08-31 17:21:58 +02:00
Simon Giraudot ae1f64c9a2 Change ACTIVATE_CONCURRENCY tag in CMakeLists of Polyhedron demo 2015-08-31 10:58:16 +02:00
Simon Giraudot 8f98d9dc0a Fixed indentation issues 2015-08-31 10:09:54 +02:00
Guillaume Damiand 6f1850a55a Remove unused code 2015-08-31 09:18:26 +02:00
Guillaume Damiand 56b5057449 Add test in STL_Extension for is_used. 2015-08-31 08:56:45 +02:00
Guillaume Damiand 2387fcf2a5 Remove is_used from Combinatorial map test. 2015-08-31 08:34:17 +02:00
Guillaume Damiand 98b36b260e Update light parameters 2015-08-31 08:18:04 +02:00
Guillaume Damiand 24840dbd5c Improve drawing code in LCC demo. 2015-08-29 14:43:52 +02:00
Laurent Rineau 1710531e06 Fix the color of edges of Scene_polygon_soup_item
Fixes #301.
2015-08-28 17:18:04 +02:00
Laurent Rineau db6b844cc8 Merge remote-tracking branch 'cgal/releases/CGAL-4.6-branch'
A non-modifying merge, to register that `master` is ahead of
`CGAL-4.6-branch`.

Conflicts:
	Arrangement_on_surface_2/include/CGAL/Arr_polyline_traits_2.h
	Maintenance/release_building/BUGFIX_NUMBER
	Maintenance/release_building/public_release_name
2015-08-28 16:25:33 +02:00
Sébastien Loriot aed4e8b2fc fix doc typos 2015-08-28 15:36:29 +02:00
Andreas Fabri a4351336d2 integrate Laurent's comments 2015-08-28 15:09:37 +02:00