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

64306 Commits

Author SHA1 Message Date
Clement Jamin b19f7107de We don't care about "i" 2015-07-09 09:37:27 +02:00
Clement Jamin e4c7d8a865 Fix most tests 2015-07-09 09:20:45 +02:00
Clement Jamin 40fd40cc0e Missing param 2015-07-09 09:20:25 +02:00
Clement Jamin b645b9b084 Compute_cross_product_3 => Construct_cross_product_vector_3 2015-07-09 08:59:06 +02:00
Clement Jamin b1a8059dc3 Fix warning 2015-07-09 08:58:43 +02:00
Clement Jamin daaa0a87d1 Update the real traits class 2015-07-09 08:58:22 +02:00
Clement Jamin 36d7bfa2c8 Compute_cross_product_3 => Construct_cross_product_vector_3 2015-07-09 08:57:27 +02:00
Clement Jamin 553b240631 Fix the traits concept 2015-07-09 08:55:55 +02:00
Clement Jamin 8be5f5d31a Restore the generators as they was before 2015-07-09 08:49:22 +02:00
Clement Jamin 6dc0ff6ada Reordering 2015-07-09 08:28:07 +02:00
Clement Jamin 545756f2fc Merge branch 'Point_set_shape_detection_3-cjamin' of github.com:CGAL/cgal-dev into Point_set_shape_detection_3-cjamin 2015-07-09 08:09:13 +02:00
Clement Jamin 0968103236 Removed warning 2015-07-09 08:08:58 +02:00
Sébastien Loriot a2c1f72164 fix compilation issue 2015-07-09 08:07:49 +02:00
Clement Jamin 5d5b60d130 Revert "Make the utilities public" 
This reverts commit 230c4aea14.
 2015-07-09 07:47:36 +02:00
Clement Jamin 230c4aea14 Make the utilities public 2015-07-09 07:45:53 +02:00
Clement Jamin 986571c5e9 Added Efficient_RANSAC_fake_traits_for_testing.h to dont_submit 2015-07-08 19:49:57 +02:00
Clement Jamin 3d4832f0b8 Restore torus => doesn't compile for now 2015-07-08 19:48:57 +02:00
Clement Jamin d6e82d7e27 Merge branch 'Point_set_shape_detection_3-cjamin' of github.com:CGAL/cgal-dev into Point_set_shape_detection_3-cjamin 2015-07-08 19:47:05 +02:00
Clement Jamin c2b35a7834 WIP: use functors from the trait class and update the concept 
Temporarily replaced the actual traits class by a fake one to test the concept
Only a few examples compile for now
 2015-07-08 19:45:54 +02:00
Clement Jamin f64caa9a93 WIP: use functors from the trait class and update the concept 
Temporarily replaced the actual traits class by a fake one to test the concept
Only a few examples compile for now
 2015-07-08 19:45:02 +02:00
Sven Oesau d73676eb8f renamed several variables to follow CGAL standard 
changed main loop: after search probability for min_points is surpassed, no more candidates are generated and the remaining ones are searched. Duplicate candidates are filtered.

added Shape_base::is_same(): compares to shapes by testing distance and normal deviation from random points from other shape
 2015-07-08 18:55:52 +02:00
Sven Oesau f550b731ce changed Shape_base::squared_distance to const 2015-07-08 18:38:09 +02:00
Laurent Rineau bbd6951161 Merge branch 'afabri/Advancing_front_surface_reconstruction-afabri' into CGAL-Qt5_support-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.cpp

There was also two "conceptual conflicts" that git-merge did not see,
in:
        Polyhedron/demo/Polyhedron/CMakeLists.txt
        Polyhedron/demo/Polyhedron/Polyhedron_demo_advancing_front_plugin.cpp

Polyhedron/demo/Polyhedron/CMakeLists.txt had to use qt5_wrap_ui instead
of qt4_wrap_ui (that lead to a CMake error), and the declaration of the plugin in
Polyhedron/demo/Polyhedron/Polyhedron_demo_advancing_front_plugin.cpp
was not using the Qt5 way (that lead to a compilation error)
 2015-07-08 17:21:36 +02:00
Laurent Rineau 59f7b09fae Fix remaining CMake warnings about CMP0043 2015-07-08 17:08:35 +02:00
Laurent Rineau 9ab4859647 Remove '#pragma message("scene_EXPORTS is defined")' 2015-07-08 17:08:34 +02:00
Maxime Gimeno cac3fb7414 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_smoothing_plugin.cpp
 2015-07-08 16:31:13 +02:00
Maxime Gimeno 8e4f08139e Fix : when multiple objects are rendered in a different rendering Model, they don't mess up contextual_changed() anymore. 2015-07-08 16:28:26 +02:00
Laurent Rineau 3a0ea1bea5 Fix a warning in CMake 2015-07-08 16:06:34 +02:00
Laurent Rineau ede49f1b48 Fix a warning -Wnarrowing 2015-07-08 16:00:01 +02:00
Laurent Rineau 38657c4591 Fix a warning -Wsign-compare 2015-07-08 15:59:04 +02:00
Laurent Rineau f377b424ec Fix a runtime warning from Qt5 
Andreas reported the following warning on console of the Polyhedron
demo:
> QIODevice::read (QFile,
> "C:\cgal\git\Polyhedron\demo\Polyhedron\VC12QT5\autostart.js"): device
> not open

This should be fixed, now.
 2015-07-08 15:46:54 +02:00
Laurent Rineau f17d91f4e3 Fix warnings about unused variables/local types/local functions 2015-07-08 15:01:36 +02:00
Laurent Rineau a642c37ba1 Fix a warning that looks like a real error 2015-07-08 14:43:21 +02:00
Andreas Fabri bed7eb1eb3 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-08 14:06:15 +02:00
Andreas Fabri 28571dcb21 getInteger -> getInt 2015-07-08 14:05:55 +02:00
Laurent Rineau f931cf643c Fix a compilation 
The removal of the Qt4 code had side-effects. In Qt5, the method is
QInputDialog::getInt instead of QInputDialog::getInteger
 2015-07-08 14:01:09 +02:00
Sébastien Loriot e0f094d7da add missing const 2015-07-08 13:24:51 +02:00
Maxime Gimeno db13ac73a7 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-08 13:11:29 +02:00
Maxime Gimeno 76a1911042 A viewer to specify the OpenGL context for QGLViewer's constructor 2015-07-08 13:10:11 +02:00
Andreas Fabri 27024787be QGraphicsItem is no longer an interface 2015-07-08 13:07:35 +02:00
Maxime Gimeno 278e9d9829 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 
Conflicts:
	Circular_kernel_3/demo/Circular_kernel_3/Circular_kernel_3.cpp
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h
 2015-07-08 12:40:14 +02:00
Maxime Gimeno c29b3cb700 Inline function used to define an OpenGL context for openGL 3.3. 2015-07-08 12:18:15 +02:00
Maxime Gimeno f76bb19734 Windows fix 
- add an attribute at the application in the main() function
- add a custom context to the viewer
 2015-07-08 12:16:51 +02:00
Sébastien Loriot a8a16dc20b add missing parenthesis 2015-07-08 11:45:50 +02:00
Sébastien Loriot e4277165c6 make an assertion tagged as expensive 2015-07-08 11:44:10 +02:00
Andreas Fabri d8db3809e2 Merge branch 'gsoc13-CurveSkeleton-new_package-xgao' of github.com:CGAL/cgal-public-dev into gsoc13-CurveSkeleton-new_package-xgao 2015-07-08 10:30:16 +02:00
Sébastien Loriot b17eb11138 avoid output on cout 2015-07-08 10:25:42 +02:00
Sébastien Loriot 44d4005d8a qt 4 -> qt 5 2015-07-08 09:49:46 +02:00
Sébastien Loriot 1d4358e052 update qt urls 2015-07-08 09:48:45 +02:00
Sébastien Loriot e199f546d4 remove QT4 specific code 2015-07-07 19:36:04 +02:00