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

1172 Commits

Author SHA1 Message Date
Sébastien Loriot e5b72ac5b3 Merge branch 'old/gsoc2014-VCM_3-jmeyron' into gsoc2014-VCM_3-jmeyron 
Conflicts:
	Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp
	BGL/examples/BGL_arrangement_2/primal.cpp
	BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.hpp
	Installation/changes.html
	Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
 2014-11-05 16:11:35 +01:00
Laurent Rineau 908d608072 Merge branch 'releases/CGAL-4.5-branch' 
Conflicts:
	Installation/changes.html
 2014-10-20 14:46:36 +02:00
Laurent Rineau 70b5a14c9a Fix the picking 
There was two problems:
  - the handling of glPushName()/glPopName was not consistent,
  - the splatting MUST be deactivated during a picking.
 2014-10-16 15:48:06 +02:00
Andreas Fabri 525312a64b Replace a 'border' of a closed surface. 
Approved by the release manager
 2014-10-03 08:52:36 +02:00
Sébastien Loriot d79eeddfb9 Merge branch 'Polyhedron_demo-mesh_3_write_c3t3_boundary-GF' 
Adding functions to export the boundary of a 3D mesh embedded in a C3T3
  See Features/Small_Features/Mesh_3_output_to_off

Successfully tested in CGAL-4.6-Ic-26
Approved by the interim release manager
 2014-09-29 08:31:07 +02:00
Sébastien Loriot 024bd2724f add output_facets_in_complex_to_off and update test and demo 2014-09-24 12:05:02 +02:00
Sébastien Loriot 684104c032 add 2 overloads of output_boundary_of_c3t3_to_off in the C3T3 class 
also update the demo plugin to use one of them
 2014-09-24 08:26:18 +02:00
Sébastien Loriot 543761cd31 add context menu in c3t3 to extract the boundary of the 3D mesh 2014-09-24 08:26:18 +02:00
Sébastien Loriot e4e65dceda import file to write the surface of a subdomain into a file 
use it in the demo, with writting in a .off for now
 2014-09-24 08:26:18 +02:00
Sébastien Loriot 7bf22dc6f8 rename Deform_mesh -> Surface_mesh_deformation 2014-09-23 10:39:57 +02:00
Jocelyn MEYRON af3fd69dd1 divide the vcm_estimate_edges into a vcm_compute and construct_mst 2014-09-15 15:10:50 +02:00
Jocelyn MEYRON 663e41741b doc for vcm normals and feature edges estimation 2014-08-14 17:35:25 +02:00
Andreas Fabri d6053a3741 export gl_splat target if glew is here 
trivial bugfix for master
 2014-08-12 07:06:02 +02:00
Andreas Fabri bb2b50427c Add target_link_libraries for splatting 
trivial bug fix for master
 2014-08-11 18:03:32 +02:00
Sébastien Loriot 2e713e9324 macro prefixed with __ are no longer allowed with recent opengl 
trivial bugfix for master
 2014-08-10 15:52:59 +02:00
Laurent Rineau c42216e48b Fix for CMake 3.0 
Trivial fix for master.
 2014-08-06 17:05:41 +02:00
Sébastien Loriot 1480755a86 mouse binding API change was done in QGLviewer 2.5.1 
trivial bugfix for master
 2014-08-01 16:45:29 +02:00
Jocelyn MEYRON 51c1236ad8 Add different methods for features estimation 2014-07-31 09:38:34 +02:00
Sébastien Loriot 06da6b80b9 Merge branch 'Polyhedron_demo-point_item_knows_if_it_has_normals-local' 
Tested in CGAL-4.5-Ic-106

Approved by the release manager (interim)
 2014-07-28 09:15:17 +02:00
Sébastien Loriot 494f558a7a Merge branch 'BGL-fix_split_edge-local' 
Tested in CGAL-4.5-Ic-106

Approved by the release manager (interim)
 2014-07-28 09:13:49 +02:00
Sébastien Loriot 3afe426098 add a boolean to indicate if a point set has normals 
this allows better filtering of applicable plugins and avoid confusion
 2014-07-24 17:00:59 +02:00
Sébastien Loriot 8dac29f1d7 off_to_xyz computes the normals if the off is a valid polyhedron 2014-07-24 16:07:34 +02:00
Sébastien Loriot 62c1359c56 add a plugin to split a polyhedron into one item per connected component 2014-07-24 15:04:34 +02:00
Sébastien Loriot f7cad6db65 bug in the doc of Polyhedron_3::split_edge inducing a bug in Euler::split_edge 2014-07-24 13:26:36 +02:00
Jocelyn MEYRON a6adefb0c3 Finish documentation for vcm_estimate_normals + Add a variant with a number of neighbors. 2014-07-23 14:23:48 +02:00
Laurent Rineau 26861f733d Merge branch 'Polyhedron-fix_demo_feature_A_B-lrineau' 
Bug-fix for the polyhedron demo. The A/B selection was no longer working
for a while.

Tested in CGAL-4.5-Ic-100.
Approved by the Release Manager.
 2014-07-21 12:02:24 +02:00
Laurent Rineau 156a4b3f9b Merge branch 'Mesh_3-compare_index-GF' 
Add determinism to the sequential version of Mesh_3.

Small feature:
  http://cgal.org/wiki/Features/Small_Features/Mesh_3_deterministic
Was pre-approved 14 May 2014.

Tested in CGAL-4.5-Ic-100.
Approved by the Release Manager.
 2014-07-21 12:00:16 +02:00
Sébastien Loriot 3a202ce200 Merge branch 'Polyhedron_demo-fix_recenter_scene-local' 
Tested in CGAL-4.5-Ic-100
Approved by the release manager
 2014-07-21 08:24:05 +02:00
Sébastien Loriot 45f7298ce7 Merge branch 'Polyhedron_demo-import_splatting-GF' 
Tested in CGAL-4.5-Ic-100
Approved by the release manager

Conflicts:
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp
 2014-07-21 08:23:36 +02:00
Laurent Rineau bea14d40cc Add the EOF 2014-07-21 08:21:16 +02:00
Sébastien Loriot bd09fccc48 top and reset timer before starting it again 2014-07-19 10:50:07 +02:00
Laurent Rineau 3deb8e7910 Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF 
Create an integration branch for 'Mesh_3-compare_index-GF': a new branch
created from 'master', where I merged the previous version of
'Mesh_3-compare_index-GF'.

There was a conflict with two features recently merged into 'master' for
CGAL-4.5:

- the move of two files from include/CGAL/Mesh_3/ to include/CGAL/. See
  the small feature:
    http://cgal.org/wiki/Features/Small_Features/New_constructor_in_Label_mesh_domain_3_and_new_function_wrapper

- parallelism for Triangulation_3 and Mesh_3:
    http://cgal.org/wiki/Features/Parallel_Mesh_3

Conflicts:
	Combinatorial_map/include/CGAL/Cell_attribute.h
	Mesh_3/include/CGAL/Implicit_mesh_domain_3.h
	Mesh_3/include/CGAL/Labeled_image_mesh_domain_3.h
	Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
	Mesh_3/test/Mesh_3/test_meshing_3D_image.cpp
	Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
	Mesh_3/test/Mesh_3/test_meshing_polyhedron_with_features.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_type.h
	STL_Extension/include/CGAL/Compact_container.h
	STL_Extension/test/STL_Extension/test_Compact_container.cpp

I also modified the following files during the conflict resolution:

	Linear_cell_complex/include/CGAL/Cell_attribute_with_point.h
	Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
 2014-07-18 15:47:14 +02:00
Jocelyn MEYRON 0a0c31e6f9 Fix VCM normal estimation plugin + Add first (non working) version of VCM features estimation 2014-07-18 15:13:46 +02:00
Laurent Rineau a0da371e2a Fix a runtime bug 
The dynamic type of my `model` object is no longer a `Scene`, but that
it a proxy model for the scene!
 2014-07-17 19:53:12 +02:00
Laurent Rineau be31b7a334 Cosmetic change 
Use this-> instead of the name of the base class.
 2014-07-17 19:52:13 +02:00
Sébastien Loriot 788f8def91 add warning message 2014-07-17 16:54:38 +02:00
Sébastien Loriot 27d34d9e75 Merge branch 'Orient-Polyhedron_3-iyaz' into Polyhedron_demo-fix_orient_polygon_soup-local 
Conflicts:
	Operations_on_polyhedra/include/CGAL/triangulate_polyhedron.h
 2014-07-17 16:29:52 +02:00
Sébastien Loriot f02af68d48 recenter scene first update the bbox 2014-07-17 15:55:48 +02:00
Sébastien Loriot 9684d475ab naive way to check a point set has normals used to set valid rendering modes 2014-07-17 13:53:01 +02:00
Sébastien Loriot b819d5024f scene texture item does not support splatting rendering mode 2014-07-17 12:02:09 +02:00
Sébastien Loriot a5eb8dc1c2 fix color issue for the point set and the splatting 2014-07-17 11:31:06 +02:00
Sébastien Loriot 6ed1ba826e Merge branch 'to-be-tested/Stop_testing_taucs-sloriot' 
Taucs, Lapack and Blas supports are no longer tested

Approved by the Release Manager
Tested in CGAL-4.5-Ic-97

Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
 2014-07-16 20:19:21 +02:00
Sébastien Loriot 756f502914 introduce the splatting taken from the Point set demo 
glew.h needs to be included before gl.h, thus the change
  of some include directives

  There is still a lighting/color bug that I need to fix
 2014-07-16 08:32:22 +02:00
Jocelyn MEYRON e6b4c7664a VCM normal estimation plugin 2014-07-15 14:53:51 +02:00
Sébastien Loriot d5f7ba8ff3 fix a bug introduced in 31042b8d 
glDrawElements call expect unsigned int!

trivial bug-fix for master
 2014-07-10 00:22:08 +02:00
Sébastien Loriot 16441b0f6d Merge branch 'Surface_modeling-integration_with_BGL-GF' 
Introduces the Surface modeling package that allows
  to deform a triangulated surface mesh

Successfully tested in CGAL-4.5-Ic-90
Approved by the Release Manager

Conflicts:
	Installation/changes.html
 2014-07-08 19:53:36 +02:00
Sébastien Loriot 2aadba50d7 Merge branch 'BGL-redesign_final-GF' 
Introduces a redesign of the CGAL extension of the BGL API

Successfully tested in CGAL-4.5-Ic-90
Approved by the Release Manager

Conflicts:
	Surface_mesh_segmentation/test/Surface_mesh_segmentation/test_compute_sdf_values_and_segment_exact_rational.cpp
 2014-07-08 19:45:16 +02:00
Sébastien Loriot 86f2ed6b0b Allow to use segmentation and AABB-tree by including only Polyhedron_3.h 2014-07-04 17:24:07 +02:00
Sébastien Loriot 39c073948e when using HalfedgeGraph or FaceGraph API, graph_traits must be included 2014-07-04 17:24:07 +02:00
Sébastien Loriot 5f4813b64d properties_Polyhedron_3.h is now included by graph_traits_Polyhedron_3.h 2014-07-04 17:24:05 +02:00