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

68862 Commits

Author SHA1 Message Date
Sebastien Loriot fc44ee3051 Merge pull request #1180 from sloriot/BGL-fix_edge_hash 
fix edge hash
 2016-06-24 13:24:27 +02:00
Sébastien Loriot db2f60f636 improve Hash test 2016-06-24 13:23:44 +02:00
Sebastien Loriot eed19486ef Merge pull request #1192 from maxGimeno/Euler_operations_improvements-GF 
Polyhedron_demo : Selection tool improvements
 2016-06-23 13:45:55 +02:00
Sebastien Loriot 60ce6420c1 Merge pull request #1196 from sloriot/Polyhedron_demo-deform_widget_with-tabs 
use tabs to reduce the size of the deformation widget
 2016-06-23 13:44:27 +02:00
Sébastien Loriot bbf007c41f fix doc typos 2016-06-22 21:54:43 +02:00
Maxime Gimeno 90999805be Fix merge. 2016-06-22 17:40:02 +02:00
Sébastien Loriot a3d10e51f5 use tabs to reduce the size of the deformation widget 2016-06-22 16:52:43 +02:00
Sebastien Loriot 749e40fce9 Merge pull request #1115 from lrineau/Mesh_3-connected_components_for_images-GF 
Mesh_3: connected components for 3D images
 2016-06-22 14:52:10 +02:00
Maxime Gimeno c129c1329f Merge branch 'Euler_operations_improvements-GF-old' into Euler_operations_improvements-GF 2016-06-22 14:30:58 +02:00
Maxime Gimeno e3cd2143f2 Fixes facet display: 
- Re-computes normal maps after an operation that changes the number of facets.
 2016-06-22 14:28:47 +02:00
Maxime Gimeno 89cedf65cb Robustifies the highlighting 2016-06-22 14:28:38 +02:00
Maxime Gimeno e937c803a0 Removes the Hover events in edition mode. 2016-06-22 14:28:27 +02:00
Maxime Gimeno 67e6ac76f6 Fix the facets display 
- Keeps the selected facets in front of the polyhedron's facets.
 2016-06-22 14:28:17 +02:00
Maxime Gimeno 526473dca8 Keep the last selection mode in memory when erasing a scene_selection_item 2016-06-22 14:28:09 +02:00
Maxime Gimeno ccccfc03c1 Enhancement 
- Addition of a feature to select all non triangle facets.
 2016-06-22 14:27:55 +02:00
Maxime Gimeno a256f151f5 Makes the resulting point of collapse edge and join vertices the center of the original edge. 2016-06-22 14:27:45 +02:00
Maxime Gimeno 902bb2b8ce Merge branch 'Euler_operations_improvements-GF-old' into Euler_operations_improvements-GF 2016-06-22 14:27:33 +02:00
Maxime Gimeno 32fe11acee Clean-up and fix segfault 2016-06-22 14:15:03 +02:00
Maxime Gimeno cfa4796fa6 Fix for Move_vertex 2016-06-22 14:14:54 +02:00
Maxime Gimeno fcc2a94cbb Addition of doc pictures in the plugin 2016-06-22 14:13:52 +02:00
Maxime Gimeno 0d796d29f2 Addition of a tool to move a vertex in the edition_mode. 2016-06-22 14:04:17 +02:00
Maxime Gimeno 36c131b276 Fix for the singleshot in selection mode. 2016-06-22 14:03:09 +02:00
Maxime Gimeno b743c76bb1 change polygon_offset to display selected facets even with the camera in the default position. 2016-06-22 14:02:58 +02:00
Maxime Gimeno cc2e262d69 Cannot use singleshot for facet selection, somehow it discards the right event. 2016-06-22 14:02:47 +02:00
Maxime Gimeno adc43ed8ba Fluidifiy the selection 2016-06-22 14:02:32 +02:00
Maxime Gimeno 1013d4ff84 Addition of a highlighting system in the edit mode. 2016-06-22 13:59:28 +02:00
Sébastien Loriot ec69b336e8 Merge remote-tracking branch 'cgal/releases/CGAL-4.8-branch' 2016-06-22 13:20:25 +02:00
Sebastien Loriot ec7838ddf2 Merge pull request #1189 from sloriot/SMSP-fix_for_source_on_edge 
Fix for source on edge
 2016-06-22 13:19:04 +02:00
Sebastien Loriot e819e65f96 Merge pull request #1187 from maxGimeno/Fix_deformation-GF 
Polyhedron_demo: Enhance deformation
 2016-06-22 13:18:31 +02:00
Sebastien Loriot 5ce3ccb9bd Merge pull request #1191 from sloriot/ImageIO-remove_gl_functions 
ImageIO no longer needs openGL
 2016-06-22 13:17:13 +02:00
Sebastien Loriot 3d8d50fa47 Merge pull request #1183 from sloriot/CMake-Install_relocable 
Make CGAL installation relocable
 2016-06-22 13:16:33 +02:00
Laurent Rineau 378e22aa24 Fix a warning with -DCGAL_NDEBUG 2016-06-22 12:41:26 +02:00
Sébastien Loriot 79ad1b2dc6 Merge pull request #1141 from janetournois/PMP-isotropic_remeshing_smoothing_options-jtournois 
PMP isotropic_remeshing : smoothing options
 2016-06-22 11:46:05 +02:00
Jane Tournois f4634b23cc don't remesh when roi_facets is empty 2016-06-21 12:23:28 +02:00
Jane Tournois 74d1f946dd display the target edge length to help reproduce 2016-06-21 11:26:11 +02:00
Jane Tournois 85744d3c63 the validity of the vertex_is_constrained_map should be fixed 
the problem was that we can't control which of va and vb will be vkept
when collape_edge is called
now it's clear wrt the constrained map
 2016-06-21 11:19:41 +02:00
Jane Tournois cd616d73af this include does not need to be in the .h 2016-06-21 11:19:25 +02:00
Sébastien Loriot d5cd488b8b remove functions using the deprecated direct draw mode in ImageIO 2016-06-21 09:55:07 +02:00
Maxime Gimeno 13c5d7e51e Robustifies remeshing. 2016-06-20 17:22:59 +02:00
Sébastien Loriot a6bccbca40 handle the case when source and target are in the interior of the same edge 2016-06-20 17:00:57 +02:00
Sébastien Loriot b2d2e85d5a swap barycentric coordinates on the edge when seen from the other side 2016-06-20 14:53:25 +02:00
Maxime Gimeno 4f8b200f98 Fix segfault when trying to remesh a null_face(). 2016-06-20 14:45:38 +02:00
Maxime Gimeno 14ffea2872 Fix the freeze when opening the plugin with the option "Remesh after deformation" on. 2016-06-20 14:19:27 +02:00
Jane Tournois ef1b16e201 remove typename in excess 
Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.cpp
 2016-06-20 14:19:27 +02:00
Maxime Gimeno e8204f617b Fix expand_or_reduce 
- It won't convert existing roi to ctrl vertices anymore.
 2016-06-20 14:19:27 +02:00
Maxime Gimeno 915ba72c05 Fix the control_points in remeshing. 2016-06-20 14:19:27 +02:00
Maxime Gimeno 4eed022c69 Implementation of the selection propagation. 2016-06-20 14:19:27 +02:00
Maxime Gimeno 8b69b6330a Save the control vertices when deforming. 2016-06-20 14:13:47 +02:00
Sebastien Loriot b02e5c6b7c Merge pull request #1184 from maxGimeno/Fix_images_issues_in_mesh_3_plugin-GF 
Polyhedron_demo: Fix images issues in mesh 3 plugin
 2016-06-20 09:40:53 +02:00
Sebastien Loriot 71ae9fba50 Merge pull request #1186 from janetournois/Polyhedron_demo-fix_meshing_dialog-jtournois 
Polyhedron demo - various small fixes for Mesh_3 plugin
 2016-06-17 17:06:44 +02:00