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

1770 Commits

Author SHA1 Message Date
Sebastien Loriot ab704be3b5 Merge pull request #473 from janetournois/Mesh_3-fix_protection_bug-GF 
Mesh 3 : fix limit case in polylines protection
 2015-11-13 12:36:33 +01:00
Jane Tournois a5162d86e1 bugfix : deal with the limit case 
where the point to be found is almost exactly the endpoint of the polyline,
just "behind" it in terms of geodesic_distance
 2015-11-10 16:35:31 +01:00
Jane Tournois f9d16f6720 this code should not be called for a triangulation of dimension < 3 2015-11-10 16:33:58 +01:00
Maxime Gimeno 97d2c0990f Optimization for segmented images and implicit function fix. 
- The optimization plugin works for all 3 types of objects.
- All c3t3_items appeara in flat+edges by default, so the plane is not invisible.
- The IO_image_plugin filter has no All filter anymore, so it is not an option when opening an OFF
 2015-11-02 11:32:33 +01:00
Jane Tournois 31ebc6c472 use complete API of boost::optional 2015-10-30 16:06:31 +01:00
Jane Tournois adf5c63fb2 add meshing of segmented images 2015-10-29 15:40:43 +01:00
Jane Tournois b8ffee0f3a add typedef to be used in polyhedron demo 2015-10-29 14:09:22 +01:00
Maxime Gimeno a0aa8aea05 Addition of elements 
- Scene_c3t3_item cleaned
- Segfault for optimizer corrected (another one appeared, see he comment SEGFAULT)
- Scene_segmented_image_item added
- Volume_planes_plugin added
 2015-10-28 13:46:18 +01:00
Laurent Rineau cc84605c2b Merge pull request #421 from janetournois/Mesh_3-check_weights_before_optimization-jtournois 
Mesh_3 - add a precondition to global optimizers
 2015-10-16 11:45:56 +02:00
Jane Tournois 5b03df377f fix compilation 2015-10-15 15:47:52 +02:00
Jane Tournois a77b066f6b add a precondition to global optimizers 
this precondition checks that global optimizers are not run on a
triangulation with weights.
Protecting balls are an exception and don't prevent global optimizers
from running
 2015-10-15 13:11:48 +02:00
Andreas Fabri c6f11a92c0 Directly test against _MSC_VER to suppress a warning 
Add casts to suppress warnings (not seen in the tessuite as too many 'R's)
 2015-10-14 10:53:39 +02:00
Laurent Rineau 330a0e75a2 Merge pull request #385 from cjamin/CGAL_headers_only-gdamiand_cjamin 
CGAL headers only, step 0
 2015-10-13 16:37:38 +02:00
Laurent Rineau f1d7d07fc2 Merge pull request #406 from cjamin/patch-1 
cstddef.hpp does not exist anymore in latest versions of Boost
 2015-10-13 16:03:03 +02:00
Laurent Rineau 9a60df2822 Merge pull request #412 from cjamin/Profiling_tools-Use_Real_timer-cjamin 
Use Real_timer for parallel code
 2015-10-13 15:53:49 +02:00
Clément Jamin ed2bd45c02 cstddef.hpp does not exist anymore in latest versions of Boost 2015-10-08 16:36:29 +02:00
Clement Jamin 77e6772aa7 Use Real_timer in Mesh_3 since the algorithms might be parallel 
And update the doc accordingly
 2015-10-08 15:26:50 +02:00
Sébastien Loriot 8f7db42402 directly include boost config header 2015-10-07 16:19:29 +02:00
Andreas Fabri a7cf690800 include <CGAL/config.h> 2015-10-06 17:54:45 +02:00
Andreas Fabri b6dfcffa16 suppress warning 2015-10-02 08:20:45 +02:00
Guillaume Damiand cf1c0ea0ca Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin 2015-10-01 09:12:55 +02:00
Laurent Rineau 359fbc0bbb Merge pull request #323 from janetournois/Mesh_3-fix_cmakelists_zlib-GF 
Fix CMakeLists in Mesh_3 examples
 2015-09-10 09:37:15 +02:00
Jane Tournois dc3ceaef68 make message complete 2015-09-08 10:35:45 +02:00
Jane Tournois c9da338be8 move 2 examples that need zlib 2015-09-07 17:27:54 +02:00
Laurent Rineau 7ddefbdcc8 Merge pull request #297 from afabri/CGAL-assert-GF 
assert() should not be used in CGAL headers!
 2015-09-07 10:58:20 +02:00
Laurent Rineau 0bc029c5b8 Revert "suppress performance warning concerning an assertion" 
This reverts commit 580b65d8a5.

The warning was already fixed by commit
63ae26eb0f.
 2015-09-04 13:52:45 +02:00
Andreas Fabri 0d18ccf09d Merge branch 'CGAL-assert-GF' of github.com:CGAL/cgal-dev into CGAL-assert-GF 2015-09-04 12:30:26 +02:00
Andreas Fabri 580b65d8a5 suppress performance warning concerning an assertion 2015-09-04 12:30:07 +02:00
Laurent Rineau 63ae26eb0f Fix MSVC warning: conversion from size_t to bool 
MSVC emits that warning:

    include\CGAL/Implicit_to_labeling_function_wrapper.h(205) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)

The fix is to explicit exactly what is tested. The following:

    CGAL_assertion(funcs.size());

is replaced by the explicit:

    CGAL_assertion(funcs.size() != 0);
 2015-09-04 11:14:56 +02:00
Laurent Rineau 253e0dddcf Fix issue #300 
Update_c3t3::operator() does not return bool!
 2015-09-03 12:59:05 +02:00
Andreas Fabri 1e2ff1131e assert -> CGAL_assertion 2015-08-27 16:51:55 +02:00
Laurent Rineau 278a28016a Merge branch 'CGAL-Qt5_support-GF' 
Fixes #265, fixes #254.
 2015-08-27 16:37:37 +02:00
Laurent Rineau 8035aa83ac Do not initialize estimated_bbox if not required 
`estimated_bbox` is used only by the parallel version, or if
`CGAL_SEQUENTIAL_MESH_3_ADD_OUTSIDE_POINTS_ON_A_FAR_SPHERE` is defined.
 2015-08-20 16:23:30 +02:00
Laurent Rineau eed890672b Merge branch 'CGAL-Qt5_support-GF' into CGAL_Qt5_Support_for_Mesa-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp
	Polyhedron/demo/Polyhedron/resources/shader_without_light.v
 2015-08-18 18:45:38 +02:00
Laurent Rineau 9dc8e079ad QOpenGLShaderProgram::create was introduced in Qt-5.3 
With Qt-5.2:

    error: 'class QOpenGLShaderProgram' has no member named 'create'

Anyway, that call is useless.
 2015-08-18 18:19:54 +02:00
Maxime Gimeno 95f87a3ac5 Depth test problem fix 
- Calling glEnable(GL_DEPTH_TEST) in the beginning of every draw should solve this problem.
 2015-08-13 14:08:12 +02:00
Maxime Gimeno d39d336461 Mesa Fix 
- Changed 3.3 context in 2.1 context
- set shaders version to 120
 2015-08-10 10:31:26 +02:00
Laurent Rineau 55c30d0808 Qt::AA_UseDesktopOpenGL is usable from Qt-5.3 only 2015-08-04 10:55:26 +02:00
Laurent Rineau 30e5d129f8 Remove Scene_item_with_display_list 2015-07-31 13:45:37 +02:00
Laurent Rineau bc21fe6ad7 Use findChild to get the pointer to Viewer 
Should fix #218, because the class MainWindow is no longer used.
 2015-07-30 18:45:09 +02:00
Laurent Rineau ad81d725f2 Fix the moc warning 
"No relevant classes found. No output generated."
 2015-07-29 16:38:58 +02:00
Laurent Rineau 94a793621d Remove 'QOpenGLFunctions_3_3_Core gl;' from Scene_item 
... and use the base class of Viewer instead.

See also issue #178.
 2015-07-29 16:26:41 +02:00
Laurent Rineau d2a51ce08a Change the API of Scene_item::draw 
Now, the viewer pointer type is Viewer instead if QGLViewer.
 2015-07-29 16:06:38 +02:00
Laurent Rineau a0d82358b0 Fix a warning (unneeded local typedef 'Facet') 2015-07-29 14:53:51 +02:00
Maxime Gimeno ed4663ace5 SEGFAULT Fix 
- corrected a pointer's issue.
 2015-07-29 09:10:26 +02:00
Sébastien Loriot c00da93d1d fix warning about using a bool in a switch 2015-07-22 15:49:19 +02:00
Sébastien Loriot 6dc5695989 remove unused variable warning 2015-07-22 15:47:23 +02:00
Sébastien Loriot 590106f5fc Changes in the other demos due to Polygon_mesh_processing package (PMP) 2015-07-16 17:27:17 +02:00
Sébastien Loriot 6b15ec643c Merge branch 'CGAL-Qt5_support-GF' into cgal-public-dev/Polygon_mesh_processing-GF 
Conflicts:
	Mesh_3/demo/Mesh_3/include/CGAL/gl_render.h
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/GlSplat/GlSplat.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
 2015-07-16 16:52:53 +02:00
Laurent Rineau 32a3f4b60b The `make clean` can fail when there is no target at all 2015-07-15 16:36:19 +02:00