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
Andreas Fabri
2443b7d1a6
Moved squared_distance(Point_3,Triangle_3
2016-03-30 16:58:22 +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
Laurent Rineau
1439796bf6
Do not draw the intersection while the plane is manipulated
...
... plus a fix in `draw_edges()`: missing call to
`compute_intersections()`, if the item was drawn in wireframe-only.
2016-03-29 18:37:18 +02:00
Laurent Rineau
3c7a5dd7b1
Fix a critical performance issue
...
As decided by `MainWindow`, the `Scene_c3t3_item::toolTip()` method is
called by `MainWindow::updateInfo()` for each `modified()` event of the
manipulated frame. While the frame is manipulated, that generates a lot
of events, and a lot of calls to `toolTip()`.
Before this commit, the call to `Scene_c3t3_item::toolTip()`
was `O(n)`. After this commit it is `O(1)`.
That speeds up a lot the drawing of the item while the frame is
manipulated!
2016-03-29 18:33:59 +02:00
Laurent Rineau
bffc38dd87
Merge pull request #961 from sloriot/Polyhedron_demo-fix_typo
...
fix typo in demo
2016-03-29 17:19:12 +02:00
Sébastien Loriot
dfd943c8e2
fix typo
2016-03-29 17:08:51 +02:00
Jane Tournois
dc3c2f9a8d
add verbosity to isotropic_remeshing
...
when it's called on several polyhedra, possibly in parallel
2016-03-29 14:57:48 +02:00
Laurent Rineau
ff515d72bb
Fix issue #954 (resource leak)
2016-03-29 13:34:44 +02:00
Laurent Rineau
d2b0900ec9
Do not call `Random(char*)` in header-only
...
Follow-up to:
> ef624f92de
> Author: Andreas Fabri <andreas.fabri@geometryfactory.com>
> Date: Wed Mar 23 13:01:21 2016 +0100
>
> No need for a constructor just for default_random
2016-03-29 12:12:37 +02:00
Laurent Rineau
fd4e0a51cc
Fix the SOVERSION
...
(Partially reverts commit 79f54a6c7c3af0a1aa1a6e845990fd06f950f63b.)
2016-03-29 12:10:37 +02:00
Laurent Rineau
145b3dbe77
Merge fixes to Surface_mesh and BGL from 4.8
...
Merge branch 'releases/CGAL-4.8-branch'. Merges:
> 0b5fa6a Merge pull request #945 from sloriot/BGL-OpenMesh_free_functions
> 681e08d Merge pull request #947 from sloriot/SM_shortest_path-fix_package_info
2016-03-29 12:01:15 +02:00
Laurent Rineau
82026459f2
Merge pull request #944 from afabri/Periodic-typos-GF
...
prefix with CGAL:: to cross link
2016-03-29 11:19:15 +02:00
Laurent Rineau
9eb6a2b5e6
Merge pull request #916 from sgiraudot/Surface_reconstruction_points_3-Fix_infinite_cells_issue-GF
...
Poisson reconstruction: bugfix query outside convex hull
2016-03-29 11:10:22 +02:00
Laurent Rineau
a67bc9822e
Merge pull request #895 from afabri/CGAL-LGPL-GF
...
Move infrastructure files into infrastructure packages and change their license
2016-03-29 11:08:43 +02:00
Laurent Rineau
f594283907
Merge pull request #892 from freud14/add-gitignore
...
Adding moc files to gitignore
2016-03-29 11:03:02 +02:00
Laurent Rineau
50b55bd27c
Merge pull request #890 from sloriot/CGAL-generate_CMakeLists-sloriot
...
Generate CMakelists
2016-03-29 11:02:17 +02:00
Laurent Rineau
80817ec3de
Merge pull request #903 from afabri/Triangulation_2-read_triangle_poly-GF
...
Read .poly files in the 2D Constrained Triangulation demo
2016-03-29 10:59:30 +02:00
Laurent Rineau
0b5fa6a4a9
Merge pull request #945 from sloriot/BGL-OpenMesh_free_functions
...
BGL functions must be in OpenMesh namespace
2016-03-29 10:51:16 +02:00
Laurent Rineau
216b298652
Fix issues in I/O of Mesh_complex_3_in_triangulation_3
...
And restore the possibility for the Polyhedron demo to load two types of
C3t3 (with `Patch_id` being `int` or `std::pair<int, int>`).
2016-03-25 15:45:28 +01:00
Maxime Gimeno
8b361c957a
Fix the bbox and clean-up
2016-03-25 12:39:55 +01:00
Jane Tournois
2bc034dee1
don't forget to map boundary halfedges
2016-03-25 10:55:07 +01:00
Jane Tournois
cc28746e18
fix the case where both faces incident to h are degenerate before the flip
...
and none of them is degenerate after the flip
2016-03-25 10:39:01 +01:00
Sébastien Loriot
f7848d686a
remove unused type
2016-03-25 10:16:21 +01:00
Maxime Gimeno
d6ea729758
Addition of a position memory for the planes
...
- When the user switch from an item to another, the planes are still in the same position as when he left.
- Addition of a label to indicate that the planes are connected to the selected image
- Fix for a segfault occuring when a plane was destroyed and the imag was selected afterwards.
2016-03-25 09:59:09 +01:00
Maxime Gimeno
52babc058f
Addition of a dialog during the planes creation.
2016-03-25 09:59:07 +01:00
Maxime Gimeno
7e422d484f
Adapt the controls
...
- When there are several segmented images with planes, the sliders adapt to the last selected one.
2016-03-25 09:59:02 +01:00
Maxime Gimeno
94f4b42bc6
Adds all planes + intersection in a group.
2016-03-25 09:58:59 +01:00
Andreas Fabri
bd923feda7
Document Default in the 3D triangulations
2016-03-25 09:46:16 +01:00
Laurent Rineau
681e08ddda
Merge pull request #947 from sloriot/SM_shortest_path-fix_package_info
...
Shortest Path: update package info
2016-03-24 17:29:43 +01:00
Sébastien Loriot
9e82d734c2
remove unused typedef and variable
2016-03-24 17:26:19 +01:00
Sébastien Loriot
b83b4465c3
update package info
2016-03-24 17:15:36 +01:00
Laurent Rineau
076c982dbf
Merge pull request #676 from bo0ts/BGL-document_dual-pmoeller
...
BGL: document Dual
2016-03-24 17:11:27 +01:00
Laurent Rineau
00e6e03d5c
Merge pull request #785 from afabri/CGAL-missing_includes-GF
...
Partial cleanup of issue #595 Part2
2016-03-24 17:02:27 +01:00