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

67591 Commits

Author SHA1 Message Date
Efi Fogel 590711b2ff Updated 2016-05-18 15:48:56 +03:00
Efi Fogel 532a06b482 Added arr on surface 2016-04-21 00:56:52 +03:00
Efi Fogel 5677c6db62 Renamed Compare_x_at_limit and Compare_x_near_limit to Compare_x_on_boundary and Compare_c_near_boundary, resp. 2016-04-06 18:25:59 +03:00
Efi Fogel 047bc66024 ../../include/CGAL/Arr_polyline_traits_2.h 2016-04-06 18:23:49 +03:00
Efi Fogel c63193c31e Merge branch 'Aos_2-boundary_objects-efic-old' into Aos_2-boundary_objects-efic 
Conflicts:
	Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h
 2016-04-06 14:33:54 +03:00
Laurent Rineau 8e604f70f2 Merge modifications from 'releases/CGAL-4.8-branch' 
Merges the following:

> dbb2be1 Merge pull request #983 from lrineau/Mesh_3-fix_test_meshing_3D_gray_image-lrineau
> 5dcd5c7 Merge pull request #958 from gdamiand/BGL-bugfix-gdamiand
> 869e65a CGAL-4.8 announcement
 2016-04-05 11:24:19 +02:00
Laurent Rineau dbb2be1462 Merge pull request #983 from lrineau/Mesh_3-fix_test_meshing_3D_gray_image-lrineau 
Fix a test
 2016-04-04 15:54:25 +02:00
Laurent Rineau 93da6c958c Fix a test 
One cannot run `make_mesh_3` without `no_exude()`, and then use
`verify_c3t3`, that runs `refine_mesh_3`.
 2016-04-04 15:49:07 +02:00
Laurent Rineau c8e1a78a39 updated crontab (automated commit) 2016-04-04 12:31:59 +02:00
Laurent Rineau 5dcd5c778b Merge pull request #958 from gdamiand/BGL-bugfix-gdamiand 
BGL bugfix
 2016-04-04 12:23:32 +02:00
Laurent Rineau 869e65a74d CGAL-4.8 announcement 2016-04-04 12:23:05 +02:00
Laurent Rineau a92cbe2f77 OpenMesh-3.2 does not like comments in OFF files 
We have put the comments at the end of the file and it works.
 2016-04-04 11:52:02 +02:00
Andreas Fabri 18d8d97c47 CGAL::CGAL -> CGAL 2016-04-04 11:52:02 +02:00
Andreas Fabri b4c608940e Qualify generic BGL functions with CGAL:: when used outside of the CGAL namespace 2016-04-04 11:52:02 +02:00
Guillaume Damiand 790764dfa1 Replace SM by OMesh 2016-04-04 11:52:02 +02:00
Guillaume Damiand c80082a574 Bug fix in add_vertex_and_face_to_border in BGL/include/CGAL/boost/graph/Euler_operations.h. 2016-04-04 11:52:02 +02:00
Laurent Rineau 6164c91227 Merge changes to PMP from branch 'releases/CGAL-4.8-branch' 
Merges:
> 621e16ed Merge pull request #973 from janetournois/Polyhedron_demo-fix_isotropic_remeshing_plugin-jtournois
> 4d1ac46 Merge pull request #974 from janetournois/PMP-complete_remeshing_test-jtournois
 2016-04-04 11:22:09 +02:00
Laurent Rineau 621e16ed41 Merge pull request #973 from janetournois/Polyhedron_demo-fix_isotropic_remeshing_plugin-jtournois 
PMP : fix isotropic_remeshing plugin
 2016-04-04 11:19:52 +02:00
Laurent Rineau eed5768651 updated crontab (automated commit) 2016-04-04 11:18:05 +02:00
Laurent Rineau 4d1ac46990 Merge pull request #974 from janetournois/PMP-complete_remeshing_test-jtournois 
PMP : improve remeshing_test (bis)
 2016-04-04 11:16:42 +02:00
Laurent Rineau 2ae5d2cef6 Merge pull request #975 from afabri/patch-2 
Update Random_impl.h
 2016-04-01 12:03:29 +02:00
Andreas Fabri e9b3918c38 Update Random_impl.h 2016-04-01 12:02:23 +02:00
Laurent Rineau 4f599d5310 Merge pull request #959 from janetournois/PMP-isotropic_remeshing_made_verbose-jtournois 
Polyhedron demo : add verbosity to isotropic_remeshing plugin
 2016-04-01 11:17:49 +02:00
Laurent Rineau 617d5f2856 Merge pull request #843 from afabri/Random_print_seed-GF 
Print the seed of CGAL::default_random
 2016-04-01 11:02:54 +02:00
Laurent Rineau 7700b73176 Merge branch 'releases/CGAL-4.8-branch' 
Merges:
> d53efdd - Merge pull request #964 from afabri/Mesh_2-BOOST_PARAMETER_MAX_ARITY-GF
 2016-04-01 11:00:57 +02:00
Laurent Rineau d53efddbd8 Merge pull request #964 from afabri/Mesh_2-BOOST_PARAMETER_MAX_ARITY-GF 
#define BOOST_PARAMETER_MAX_ARITY early enough
 2016-04-01 11:00:06 +02:00
Jane Tournois 36c3a7a758 remove unused variable 2016-04-01 10:02:21 +02:00
Jane Tournois 52b09a1e44 do not forget to reset face indices properly before remeshing 2016-03-31 15:43:07 +02:00
Jane Tournois 964e824750 make "preserve duplicates" not available on a selection_item 2016-03-31 15:17:14 +02:00
Jane Tournois 0804847e64 when remeshing a selection_item, use it instead of poly_item 2016-03-31 15:16:55 +02:00
Laurent Rineau 836ce61d39 Merge branch 'releases/CGAL-4.8-branch' 2016-03-31 12:35:23 +02:00
Jane Tournois f6e312fc86 deal with the degenerate face case, and avoid division by 0 
the only way to catch it would be to check that the result is not NaN,
probably not a good idea, in particular for vertex normals

and
Revert "deal with the case where one face incident to v is degenerate"

This reverts commit 52105868b31a2685795e92d9caf4bfe251bcf75c.
 2016-03-31 12:26:39 +02:00
Jane Tournois 650cb1d752 change the way we deal with degenerate faces 
some may remain and we don't know how to remove them yet
 2016-03-31 12:26:19 +02:00
Jane Tournois caa0aaeeb0 fix test for projection 
a vertex is reprojected if it is on PATCH, and if it is not constrained
(and this test is the filter to "continue" the loop)
 2016-03-31 12:26:01 +02:00
Jane Tournois 1e0b28601a make the flipping step more verbose (see progress) 2016-03-31 12:25:42 +02:00
Jane Tournois e3e03f06f4 deal with the case where one face incident to v is degenerate 2016-03-31 12:25:22 +02:00
Jane Tournois fd7b4cd6e1 improve remeshing_test 2016-03-31 12:25:01 +02:00
Laurent Rineau bb19fbdcde Merge pull request #966 from sgiraudot/Point_set_shape_detection_3-Bugfix_default_property_maps-GF 
Point set shape detection: bugfix default property maps
 2016-03-31 11:34:29 +02:00
Laurent Rineau ae33af9222 Merge branch 'releases/CGAL-4.8-branch' 
Merges the following fixes:
> 4025913 Merge pull request #949 from janetournois/BGL-fix_conversion_of_boundary_halfedges-jtournois
> 9c62628 Merge pull request #948 from janetournois/PMP-fix_assertion_isotropic_remeshing-jtournois
> f61402d Merge pull request #929 from sloriot/Polyhedron_demo-Isotropic_remeshing_preserve_duplicates

See also:

* https://github.com/CGAL/cgal/pull/949
* https://github.com/CGAL/cgal/pull/948
* https://github.com/CGAL/cgal/pull/929
 2016-03-31 10:55:12 +02:00
Laurent Rineau 4025913a8e Merge pull request #949 from janetournois/BGL-fix_conversion_of_boundary_halfedges-jtournois 
BGL convert_surface_mesh : convert also boundary halfedges
 2016-03-31 10:54:29 +02:00
Laurent Rineau 9c62628569 Merge pull request #948 from janetournois/PMP-fix_assertion_isotropic_remeshing-jtournois 
PMP isotropic_remeshing : fix assertion failure
 2016-03-31 10:54:19 +02:00
Laurent Rineau f61402d1d4 Merge pull request #929 from sloriot/Polyhedron_demo-Isotropic_remeshing_preserve_duplicates 
Polyhedron demo: isotropic remeshing preserves duplicated edges
 2016-03-31 10:53:12 +02:00
Laurent Rineau 0e68aca4ed Merge branch 'releases/CGAL-4.8-branch' 
Merges:
  - a change of the release date of CGAL-4.8
  - a fix of a typo in `Polyhedron/demo/Polyhedron/GlSplat/GlSplat.cpp`
 2016-03-30 17:11:36 +02:00
Laurent Rineau e7c1d74fe6 CGAL-4.8 will not be published in March, but in April 2016-03-30 17:10:24 +02:00
Simon Giraudot aaa2a41e01 Explicit propagations of property maps to Octree structures 2016-03-30 14:08:28 +02:00
Simon Giraudot be5a66ef63 Add property maps as parameters of Octree constructor 2016-03-30 14:08:00 +02:00
Andreas Fabri 920f1dba60 #define the arity, as some other file sets it too low 2016-03-30 12:22:13 +02:00
Laurent Rineau aff611cb3e Merge pull request #952 from lrineau/Mesh_3-better_binary_IO-lrineau 
Fix issues in I/O of Mesh_complex_3_in_triangulation_3
 2016-03-30 10:11:21 +02:00
Laurent Rineau 5163d5c031 Merge pull request #962 from lrineau/Polyhedron_demo-better_c3t3_item-lrineau 
Polyhedron demo: better c3t3 item
 2016-03-30 10:10:43 +02:00
Laurent Rineau c52758d590 Improve the draw of the intersection 
I have tweaked the vertex and fragment shaders, to avoid the curious
color interpolation for triangles of the intersection with the cutting
plane.

The component `color.w` is set to the signed distance to the cutting
plane (no longer any conditional in the vertex shader).

Then in the fragment shader, the drawing color is composed as such:

    if(color.w<0)
    {
      vec4 my_color = vec4(color.xzy, 1.);
      // [...]
    }
    else
      discard;
 2016-03-29 18:38:20 +02:00