Commit Graph

498 Commits

Author SHA1 Message Date
Jane Tournois 826b2a19c4 Merge branch 'PSP-fix_has_normal_map-GF' of https://github.com/janetournois/cgal into PSP-fix_has_normal_map-GF 2022-11-07 13:15:55 +00:00
Jane Tournois 32486e4be8 precise default normal 2022-11-07 14:14:30 +01:00
Jane Tournois a24c6ac84c
Apply suggestions from Mael's code review
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2022-11-07 14:13:18 +01:00
Sebastien Loriot 1a226ed877
Restore [revious API 2022-11-07 10:41:22 +01:00
Jane Tournois 9ed334bcf9 now normal_map is always valid
since it is created before it's used, when not available
2022-11-04 14:27:09 +01:00
Jane Tournois dcf0ea09b3 create normal_map when not already created before usage 2022-11-04 14:12:52 +01:00
Jane Tournois 0ee5493f02 revert unintended change 2022-10-25 12:53:39 +02:00
Jane Tournois e99f442830 NP_helper::has_normal_map should not always return true
look for a normal_map in the point set, and in the named parameters

# Conflicts:
#	BGL/include/CGAL/boost/graph/named_params_helper.h
#	Point_set_processing_3/include/CGAL/jet_estimate_normals.h
2022-10-25 12:12:29 +02:00
Andreas Fabri 1c28b3df45 Point_set_3: Fix typos in the reference manual page 2022-10-24 15:15:50 +01:00
Guillaume Damiand 1b1e6999e1 Review point set 3 2022-10-17 19:44:26 +02:00
Guillaume Damiand 24a8004ee0
Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2022-10-14 08:53:12 +02:00
Mostafa-ashraf19 68b031e113 Uses overloading functions instead of different fill_buffer names. 2022-10-04 18:43:14 +02:00
Mostafa-ashraf19 796ec13391 Modified GraphicBuffer class name to snake case. 2022-10-03 13:27:22 +02:00
Mostafa-ashraf19 c1037f9040 Modified Point_set_3 to use new APIs version. 2022-09-23 01:48:59 +02:00
Mael Rouxel-Labbé e93b0b28eb Misc trivial cleaning 2022-09-06 16:25:47 +02:00
Mael Rouxel-Labbé 9b265fddf8 Uniformize REQUIRED / QUIET usage:
Following this:
- CGAL: always REQUIRED
- CGAL component: COMPONENT / OPTIONAL_COMPONENT (never QUIET)
- required 3rd party: (not QUIET) + message(NOTICE "") on NOT_FOUND
- optional 3rd party: QUIET + message(STATUS "") except for Polyhedron/demo
- 3rd party components: COMPONENT / OPTIONAL_COMPONENT
                        (QUIET depending on required or optional 3rd party)
2022-09-06 16:24:27 +02:00
Mael Rouxel-Labbé 4fc486b195 Purge CMakeLists.txts from obsolete code / noise 2022-09-06 16:19:11 +02:00
Mael Rouxel-Labbé 7cb21c24b0 Uniformize message() for missing 3rd party libraries
STATUS for non-essential, NOTICE for important stuff
2022-09-06 16:07:31 +02:00
Sven Oesau 80eb8601e6
Merge branch 'CGAL:master' into Region_growing-revision-soesau 2022-09-02 16:42:41 +02:00
Sébastien Loriot e3e8545498 switch to Simple 2022-06-24 17:38:12 +02:00
Sven Oesau 17e0923058
Merge branch 'master' into Region_growing-revision-soesau 2022-06-24 11:06:56 +02:00
Sébastien Loriot ac8b6d4731 boost::is_same --> std::is_same 2022-06-10 08:18:20 +02:00
Sven Oesau 7bb0a10027 fixed friend class declaration 2022-06-09 14:27:47 +02:00
Sven Oesau 0baac6f556 bugfix Point_set_3_index is now hashable
moved Index out of Point_set_3
2022-06-09 10:33:02 +02:00
Sébastien Loriot 6691e13f36 fix partial specialization
follow up of 594d8bf38e
2022-05-23 13:50:11 +02:00
Sébastien Loriot 594d8bf38e remove tag that is not used and add a way to pass default Point and Normal maps 2022-05-18 15:23:23 +02:00
Sebastien Loriot 978d83a349
Merge pull request #6573 from sloriot/CGAL-pedantic_warnings
Fix pedantic warnings
2022-05-13 15:55:26 +02:00
Sébastien Loriot 6486844750 fix pedantic warnings 2022-05-10 11:30:39 +02:00
Laurent Rineau 2288225448 Massive update of CMake policies to version 3.23 2022-05-06 09:34:35 +02:00
Mael Rouxel-Labbé b24959c688 Add a typedef to make NP helpers work with Point_set_3 2022-04-04 11:33:27 +02:00
Andreas Fabri 440a8dfb7b Fix file name 2022-02-03 08:41:04 +00:00
Andreas Fabri 735752bec9 Do the remaining changes after Laurent's check 2022-02-03 08:02:11 +00:00
Sébastien Loriot 10b0af3092 rename macro since Named_function_parameter is part of STL_Extension 2022-01-13 14:43:34 +01:00
Sébastien Loriot 75b03e6c0a use_default_values() -> default_values() 2022-01-10 18:36:37 +01:00
Sébastien Loriot 6d3176e061 move Named_parameters class in STL_extension
helpers stay in BGL because it depends on BGL tags
2022-01-07 15:12:22 +01:00
Sébastien Loriot f7c8e4919a add static function to check for the presence of a normal map 2022-01-07 13:10:29 +01:00
Sébastien Loriot 5f1803489b replaces overloads with default NamedParameters for Point_set_processing_3
+enhancement of the NP for Point_set_processing_3
2022-01-06 15:11:23 +01:00
Sébastien Loriot a6d9b99466 move macros in BaseDoxyfile 2022-01-04 11:10:09 +01:00
Laurent Rineau 4d38f2b7b3 Merge pull request #6114 from sloriot/CGAL-cmake_clean_up
Clean cmake scripts of examples and tests
2021-11-18 12:27:19 +01:00
Guillaume Damiand 2bbcabe71b The size of argv array is now 2, ending with nullptr. 2021-11-11 17:23:37 +01:00
Guillaume Damiand ee11c858b5 The size of argv array is changed to 1 in all basic viewers. 2021-11-10 09:59:48 +01:00
Sébastien Loriot ab48f63e30 update latest cmake version tested 2021-11-09 10:58:47 +01:00
Sébastien Loriot 07421357a7 fix phrasing 2021-11-02 11:52:53 +01:00
Sébastien Loriot 08b1457649 add CGAL::CGAL_Basic_viewer target 2021-11-01 11:07:55 +01:00
Mael Rouxel-Labbé 8166579e55 Merge branch 'PM-Fix_pmaps_reference_types-GF' into PM-Fix_pmaps_reference_types_master-GF 2021-10-11 19:58:07 +02:00
Mael Rouxel-Labbé 590ddf8015 Various fixes for pmaps:
- Use `value_type` when the returned type is not a reference
- Enforce `reference = value_type` if the returned type is not
  a reference (to avoid `typename PM::reference r = get(m, k)`,
  which will take a ref to a temporary if the `reference`
  typedef is an actualy reference)
- Do not use `put_get_helper` if the property map is not a `lvalue`
  **mutable** property map: the `put()` is `map[k] = v`, which
  is broken if `operator[]` does not return a reference
- The concept `boost::lvalue_property_map_tag` requires `operator[](key)`,
  not a reference in `get(map, key)`. You can have a readable property map
  returning a reference through its `get(map, key)`, but if there is
  no `operator[]`, it's just a `boost::readable_property_map_tag`
- Some const correctness to avoid copying maps with state
  or heavy keys in `get(map, key)` / `put(map, key, value)`
- Base the category of a wrapping pmap on what it offers instead
  of just forwarding the base property map's category
- Tried to do something like mutable lvalue pmap:
  * `value_type& operator[](key&)`
  * `ref get(map, const key&)`
  * `put(map, const key&, const value_type&)`
  and non-mutable lvalue pmap:
  * `const value_type& operator[](const key&)`
  * `ref get(map, const key&)`
  but not everything fits properly...
2021-10-08 15:38:47 +02:00
Sébastien Loriot 1857a25d28 Merge remote-tracking branch 'cgal/master' into CGAL_data-moving_files 2021-10-06 13:50:31 +02:00
Sébastien Loriot 8350dea94a char* -> std::string 2021-10-04 09:49:24 +02:00
Sébastien Loriot 47028cd184 automatically move data files in data dir + update paths
Done for OFF/OBJ/STL/XYZ/PWN/PLY
2021-10-04 09:42:49 +02:00
Laurent Rineau ad79d37410 Merge pull request #6014 from MaelRL/CGAL-IO_Clarify_binary_text-GF
CGAL IO: Clarify binary warning
2021-09-29 11:46:30 +02:00
Mael Rouxel-Labbé c8cc0747fa Clarify binary warning 2021-09-27 15:33:42 +02:00
Maxime Gimeno 499301c759 More fixes 2021-08-31 16:00:37 +02:00
Sébastien Loriot 98e471849b moving files from internal to PKG/internal 2021-08-26 11:33:39 +02:00
Sébastien Loriot 0da1e5690e copyright.txt -> copyright 2021-07-29 10:07:44 +02:00
Mael Rouxel-Labbé 78ff9185b3 Harmonize ASCII usage across all packages 2021-06-23 23:34:32 +02:00
Mael Rouxel-Labbé a34debc92b Uniformize os/is/s/i stream parameter name in Stream_support/io
+ remove extra backticks in NP doc
2021-06-23 23:32:06 +02:00
Maxime Gimeno c2b7cc8f50 Fix doc 2021-06-03 12:45:38 +02:00
Sébastien Loriot 4e519a3c7a move documented IO functions in IO namespace 2021-05-05 13:15:37 +02:00
Sébastien Loriot 56025fb5f9 fix release number of depreciation 2021-05-04 14:38:47 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +02:00
Sébastien Loriot 8005f91c22 add IO namespace for Point_set_3 and Point_set_processing_3 packages 2021-05-03 19:21:57 +02:00
Maxime Gimeno c49152359c update max version of cmake and announce the new minimal in CHANGE.md 2021-04-15 15:08:54 +02:00
Laurent Rineau a72fdb7b3c Merge pull request #5352 from lrineau/CGAL-fix_CGAL_IO-GF
Fixes after the PR "CGAL I/O
2021-02-18 15:23:43 +01:00
Laurent Rineau 412881645c Merge pull request #5369 from sgiraudot/Point_set_3-Fix_broken_properties_and_types-GF
[Point Set 3] Fix broken properties and types
2021-02-18 15:23:28 +01:00
Laurent Rineau fa1a355751 Merge branch '5.1.x-branch' into 5.2.x-branch 2021-02-18 15:19:05 +01:00
Laurent Rineau adf74f81b7 Merge pull request #5369 from sgiraudot/Point_set_3-Fix_broken_properties_and_types-GF
[Point Set 3] Fix broken properties and types
2021-02-18 15:18:06 +01:00
Laurent Rineau c5ba414c72 Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno
Graphics_view: Upgrade glsl version in basic_viewer_shaders
2021-02-05 16:12:42 +01:00
Laurent Rineau b134ed8246 Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno
Graphics_view: Upgrade glsl version in basic_viewer_shaders
2021-02-05 16:07:32 +01:00
Laurent Rineau 5380ffd257 Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno
Graphics_view: Upgrade glsl version in basic_viewer_shaders
2021-02-05 16:05:55 +01:00
Maxime Gimeno 2dac31f36f Clean-up and fix doc 2021-02-05 14:14:11 +01:00
Maxime Gimeno 7bf9c14f72 Factorization 2021-01-28 10:01:52 +01:00
Maxime Gimeno 2d59464b2b remove os.precision(6) as it is the default. 2021-01-27 15:49:42 +01:00
Maxime Gimeno 41c823c083 replace default value of stream precision 2021-01-27 15:44:02 +01:00
Maxime Gimeno a85cf6ed52 Move the include in the ifdef 2021-01-26 09:45:18 +01:00
Maxime Gimeno 02d5819b5b Fixes 2021-01-26 09:35:13 +01:00
Simon Giraudot e962498b3a Add test for properties_and_types() 2021-01-18 15:49:55 +01:00
Simon Giraudot d257d999fb Fix function properties_and_types() 2021-01-18 15:49:55 +01:00
Maxime Gimeno 49f68654d6 WIP 2021-01-18 11:48:04 +01:00
Sébastien Loriot bc161f2ae9 Merge 'CGAL-Eigen3_support-5.2' 2021-01-15 10:59:20 +01:00
Sébastien Loriot f4935dc199 Merge branch 'CGAL-Eigen3_support-5.1' 2021-01-15 10:54:02 +01:00
Sébastien Loriot eecb00534e fix macro name to be consistent with find_package 2021-01-15 10:43:34 +01:00
Maxime Gimeno 04753381e5 Rename file and add ::Qt 2021-01-12 13:22:34 +01:00
Maxime Gimeno 95192d6d4b factorize context initialization 2021-01-12 13:08:58 +01:00
Maxime Gimeno 5948bc846e Try to remove Filtered_kernel from the dependencies of BGL 2021-01-11 14:11:30 +01:00
Maxime Gimeno 5d2ad68148 Add new Dependences. ATTENTION BGL is propagated through the NPs in Stream_support 2021-01-08 15:58:46 +01:00
Maxime Gimeno 2a212bb2a8 Upgrade non-compatibility sahders in Basic_viewer to glsl 150 and add a context creation before the creation of the QApp in draw_xxx examples 2021-01-07 13:06:40 +01:00
Maxime Gimeno 3b70343590 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-11-16 16:19:43 +01:00
Maxime Gimeno bced6b13f3 Fix LAS I/O 2020-10-27 11:45:17 +01:00
Mael Rouxel-Labbé cc01ecbecc Don't include and forward declare 2020-10-14 19:22:58 +02:00
Mael Rouxel-Labbé 0583a4862e Add precision support to Geomview streams 2020-10-14 15:32:27 +02:00
Mael Rouxel-Labbé 630d9eb2f6 Various fixes in IO tests (BGL/PS/PMP/SS) 2020-10-13 18:15:34 +02:00
Mael Rouxel-Labbé 52c6b36c65 Fix broken overload 2020-10-13 18:08:51 +02:00
Mael Rouxel-Labbé 13c221534d Include 'pwn' in generic point set readers 2020-10-13 18:06:51 +02:00
Mael Rouxel-Labbé c14198a992 IO doc fixes 2020-08-04 17:55:21 +02:00
Mael Rouxel-Labbé 00ca0211e1 IO documentation fixes 2020-08-04 15:47:56 +02:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Mael Rouxel-Labbé 1d016ecc7e IO doc fixes 2020-07-28 15:38:19 +02:00
Mael Rouxel-Labbé 0d66e19361 IO documentation fixes
See @sloriot's review:

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Polgyon_soup_mesh_IO/2nd_round/Answer_to_review

(+ some commits before and after this one)
2020-07-24 17:06:00 +02:00
Mael Rouxel-Labbé 2f0f61e104 Rephrase warning about std::ios::binary + add missing (LAS - always binary) 2020-07-24 09:40:13 +02:00
Mael Rouxel-Labbé 6acac6907a Add a note about letter case in generic I/O functions 2020-07-24 09:23:54 +02:00
Mael Rouxel-Labbé 69068ba28c Some more binary/ASCII fixes 2020-07-21 11:44:18 +02:00
Mael Rouxel-Labbé b08e1e0d8c Hide CGAL_DEPRECATED from the doc 2020-07-20 09:57:47 +02:00
Mael Rouxel-Labbé 26c930bc20 Uniformize whether std::string or const char* is used in the doc 2020-07-17 15:16:32 +02:00
Mael Rouxel-Labbé 6d6d959d4d Enhance doc for generic I/O functions 2020-07-17 13:37:37 +02:00
Mael Rouxel-Labbé 0d37cef30b Use std::ios::binary / CGAL::set_binary_mode for LAS 2020-07-13 16:56:53 +02:00
Mael Rouxel-Labbé 4231bc8a83 Misc I/O doc enhancements 2020-07-13 14:17:50 +02:00
Mael Rouxel-Labbé 3280b9b087 Use new IO functions 2020-06-26 17:06:42 +02:00
Mael Rouxel-Labbé ae4c2aaa9e IO doc fixes 2020-06-26 16:08:02 +02:00
Mael Rouxel-Labbé a3d8f10647 Fix circular dependency 2020-06-26 16:06:36 +02:00
Mael Rouxel-Labbé 594eb97a22 Doc improvements 2020-06-25 21:01:04 +02:00
Mael Rouxel-Labbé 50e3a838f3 Compilation fixes 2020-06-25 18:20:52 +02:00
Mael Rouxel-Labbé 26355e2e32 Uniformize capital / third person usage of \brief 2020-06-25 15:13:47 +02:00
Mael Rouxel-Labbé d5d8cca92b Various IO compilation fixes 2020-06-25 12:02:01 +02:00
Mael Rouxel-Labbé 31044f8e1e Fix not opening binary input with ios::binary when reading/writing PLY 2020-06-24 18:26:16 +02:00
Mael Rouxel-Labbé 9cca59ba36 Actually use the new IO functions + some example improvements 2020-06-23 18:24:39 +02:00
Mael Rouxel-Labbé 6e70b2cdb4 Remove duplicate function 2020-06-23 11:53:55 +02:00
Mael Rouxel-Labbé 0ae0bd74d6 Fix missing / wrong header includes 2020-06-22 13:47:16 +02:00
Mael Rouxel-Labbé 28b50b0c5d General IO doc improvements 2020-06-22 13:45:29 +02:00
Mael Rouxel-Labbé 99390110b5 Add missing overloads 2020-06-21 15:54:21 +02:00
Mael Rouxel-Labbé 24d2ee9c75 Use the new IO functions in Point_set_3 / PSP_3 examples 2020-06-21 15:06:20 +02:00
Mael Rouxel-Labbé 52d50f7d79 Doc improvements 2020-06-21 13:30:53 +02:00
Mael Rouxel-Labbé 2d49f7d702 Countless IO fixes...
Don't have the patience to split it nicely
2020-06-21 12:03:28 +02:00
Mael Rouxel-Labbé 7f70e96830 Many fixes / improvements for PS_3 / PSP_3 IO 2020-06-21 11:50:00 +02:00
Mael Rouxel-Labbé e09eb39a80 Misc cleaning 2020-06-21 11:39:14 +02:00
Mael Rouxel-Labbé 07017616ec Organize Point_set_3 I/O + various fixes along the way 2020-06-19 15:34:49 +02:00
Mael Rouxel-Labbé 6f8a895671 Merge remote-tracking branch 'mine/CGAL-Improve_NP_doc_presentation-GF' into CGAL_IO-maxGimeno 2020-06-18 15:21:27 +02:00
Mael Rouxel-Labbé 26eb7903aa Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF 2020-06-18 12:46:46 +02:00
Maxime Gimeno ea53a8d70d Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-06-17 14:25:21 +02:00
Maxime Gimeno f83de97125 Add missing doc 2020-06-17 14:03:13 +02:00
Maxime Gimeno 25c8313859 Replace IO functions in examples and fix Surface_mesh read_OFF() 2020-06-16 14:36:24 +02:00
Maxime Gimeno ff63531c3d fix extension detection 2020-06-11 16:17:32 +02:00
Mael Rouxel-Labbé 071565467d Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF 2020-06-03 19:01:46 +02:00
Simon Giraudot 89285f1feb Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-05-28 08:53:17 +02:00
Mael Rouxel-Labbé fb8463f470 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-05-22 15:17:56 +02:00
Maxime Gimeno 20898e4b31 fix functions calls 2020-05-14 13:46:57 +02:00
Mael Rouxel-Labbé 038869cab9 Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF 2020-05-12 15:12:21 +02:00
Maxime Gimeno 034297db86 Finish I/O for point_sets 2020-05-12 11:19:47 +02:00
Maxime Gimeno b75130c839 WIP write point_set 2020-05-11 16:04:48 +02:00
Maxime Gimeno 03487c4ce5 WIP Point_set 2020-05-11 14:12:14 +02:00
Maxime Gimeno 386fbb760d WIP point_set functions 2020-05-07 16:46:01 +02:00
Simon Giraudot fefdd13f45 Merge remote-tracking branch 'mine/PSP-Cluster_points-GF' into PSP-Cluster_points-GF 2020-05-06 08:59:40 +02:00
Maxime Gimeno 049439fa6b Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-04-30 16:47:58 +02:00
Simon Giraudot a94cb6bc1e Add missing dependency 2020-04-27 10:06:16 +02:00
Sébastien Loriot c5af2b25f3 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-04-22 13:27:29 +02:00
Sébastien Loriot 157bdbda08 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-04-22 13:26:52 +02:00
Maxime Gimeno ba86b13ac9 Massive addition of enable/disable_ifs 2020-04-17 16:05:43 +02:00
Simon Giraudot 589eb8c01f Fix warnings with float kernel 2020-04-16 09:23:40 +02:00
Simon Giraudot 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +02:00
Mael Rouxel-Labbé 16092f53d6 Update doc about NPs 2020-04-05 17:56:11 +02:00
Mael Rouxel-Labbé fc79510388 Regroup NP aliases into the base doxyfile.in 2020-04-04 17:26:32 +02:00