7cc1543c84
remove unused typedefs
2016-01-11 15:40:36 +01:00
f5cbf206b8
Merge branch 'Mesh_3-merge-manifold-meshing-thread' into Mesh_3-manifold_criterion-lrineau
2016-01-11 13:14:25 +01:00
f0ed1101c0
Use CGAL_assume instead of CGAL_assertion
...
That is an attempt to fix a warning:
```
../include/CGAL/utility.h:101:33: warning: 'index2' may be used uninitialized in this function [-Wmaybe-uninitialized]
: first(a), second(b), third(c)
^
In file included from ../include/CGAL/Mesh_3/Mesher_3.h:35:0,
from ../include/CGAL/refine_mesh_3.h:32,
from ../include/CGAL/make_mesh_3.h:30,
from ../test/Mesh_3/test_c3t3_extract_subdomains_boundaries.cpp:9:
../include/CGAL/Mesh_3/Refine_facets_manifold_base.h:162:17: note: 'index2' was declared here
int index1, index2;
^
```
2016-01-11 13:10:04 +01:00
d5a5a56ac0
Remove debug ouput
...
A file `polylines.cgal.txt` was created during the computation.
2016-01-11 12:06:11 +01:00
8245efd76b
Merge pull request #601 from lrineau/Polyhedron-Mesh_3_plugin__add_Meshing_thread-lrineau
...
Polyhedron, Mesh 3 plugin: add the meshing threads
2016-01-11 11:20:26 +01:00
02db40d559
Merge pull request #610 from afabri/Polyhedron_demo-missing_include-GF
...
std::ofstream is used without the header being included
2016-01-11 10:40:07 +01:00
41a30023f9
std::ofstream is used without the header being included
2016-01-09 09:45:36 +01:00
689fcea368
Fix a compilation: <iostream> not included
...
Anyway, we do not want that file to be created.
2016-01-08 19:01:40 +01:00
bd315dc0a5
Merge remote-tracking branch 'lrineau/Polyhedron-Mesh_3_plugin__add_Meshing_thread-lrineau' into Mesh_3-merge-manifold-meshing-thread
...
Conflicts:
Polyhedron/demo/Polyhedron/Plugins/Mesh_3_plugin/Mesh_3_plugin.cpp
Polyhedron/demo/Polyhedron/Plugins/Mesh_3_plugin/Mesh_3_plugin_cgal_code.cpp
2016-01-08 17:55:21 +01:00
4638645a01
Merge PR #597 into Mesh_3-manifold_criterion-lrineau
...
Conflicts:
Polyhedron/demo/Polyhedron/Plugins/Mesh_3_plugin/Mesh_3_plugin.cpp
Polyhedron/demo/Polyhedron/Plugins/Mesh_3_plugin/Mesh_3_plugin_cgal_code.cpp
2016-01-08 17:41:02 +01:00
8d0d9e00c5
Emphasize with * and not with backquote; backquote function calls
2016-01-08 17:23:44 +01:00
006642e32a
Fix the commit "Try to fix warnings from VC++"
...
"-1" is used as a sentinel value for `v->cached_number_of_components()`.
2016-01-08 16:58:11 +01:00
7fa7db80d4
Add output to Avizo file format
2016-01-08 16:30:07 +01:00
ccb31e40ff
Re-enable the meshing thread
...
The Mesh_3 plugin is also renamed to Mesh_3_plugin, like the same of its
file.
2016-01-08 15:10:09 +01:00
9730e2bd8e
fix a copy-paste error in a comment
2016-01-08 14:34:44 +01:00
5deefd79bf
Fix Meshing_thread
...
- re-add the possibility to stop the thread,
- re-add the display of the meshing progress.
That disappeared when the parallelism was merged into CGAL.
2016-01-08 14:34:44 +01:00
25b2330fb0
Try to fix warnings from VC++
...
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(227): warning C4267: 'initializing': conversion from 'size_t' to 'const int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(227): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(503): warning C4267: 'initializing': conversion from 'size_t' to 'const int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(503): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(517): warning C4267: 'initializing': conversion from 'size_t' to 'const int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(517): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(518): warning C4267: 'return': conversion from 'size_t' to 'int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(561): warning C4267: 'initializing': conversion from 'size_t' to 'const int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(561): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(814): warning C4267: 'initializing': conversion from 'size_t' to 'const int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(814): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(815): warning C4267: 'initializing': conversion from 'size_t' to 'const int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(815): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(855): warning C4267: 'initializing': conversion from 'size_t' to 'const int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(855): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(857): warning C4267: 'initializing': conversion from 'size_t' to 'const int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(857): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
2016-01-07 16:38:11 +01:00
f3bc10ef81
Merge pull request #549 from afabri/Polyhedron-clipping_in_shader-GF
...
Improve C3T3 item and meshing of a segmented image
2016-01-07 13:49:16 +01:00
e64ae35a6e
Merge pull request #542 from bo0ts/Documentation-release_build2-pmoeller
...
Allow to build the documentation in a release
2016-01-07 09:21:46 +01:00
e354ba6d37
remove examples that are in dont_submit
2016-01-07 09:19:06 +01:00
b1a0f01027
Fix compilation error with clang, again
2016-01-06 17:35:25 +01:00
8542eb2fe9
Fix compilation error (clang)
...
> /Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h:632:25: error: declaration of 'Tr' shadows template parameter
> template<class Tr, class Cr, class MD, class C3T3_, class Ct, class C_>
2016-01-06 17:28:52 +01:00
2a7fb19d3e
Fix compilation error (missing header)
2016-01-06 16:50:08 +01:00
772772d7b7
Fix the -Wsign-compare
...
There was a warning in a CGAL_assertion.
2016-01-06 15:50:27 +01:00
a776df173b
fix license header
2016-01-06 15:25:01 +01:00
dd8f33adc5
Merge pull request #559 from lrineau/Mesh_3-remove_estimated_bbox-lrineau
...
Add bbox() to MeshDomain_3
2016-01-06 14:35:01 +01:00
d3e610f188
harcode again that the image word type is unsigned char for a segmented image and perform static_cast
2016-01-06 13:06:51 +01:00
6eacaa7868
cosmetic fix: display the iterations on 1 line only
2016-01-05 17:41:56 +01:00
b023f6c33a
Test the manifold criterion, in Sequential mode
2016-01-05 17:41:28 +01:00
8324d8eceb
bug-fix: invalidate the "manifold info" after refine().
...
The global optimizers destroy the manifold info. It must be invalidated.
2016-01-05 17:40:40 +01:00
432b52636a
Override the debuginfo too
...
That way, the manifold mesher level displays also the number of bad
edges/vertices.
2016-01-05 17:40:01 +01:00
56bfaa2746
merge
2016-01-05 17:06:04 +01:00
b116b8ed5b
move polylines_to_protect.h into CGAL/Mesh_3/
2016-01-05 16:42:07 +01:00
7b53a337af
Merge pull-request #483 from 'janetournois/Mesh_3-gray_level_image_oracle-lrineau'
...
Conflicts:
.gitignore
Mesh_3/include/CGAL/IO/File_medit.h
2016-01-05 14:58:18 +01:00
d34b240e5e
WIP: seems to work
...
I will test with the 3D gray level images...
2016-01-05 14:55:42 +01:00
397ac28143
WIP, new milestone: compiles with Refine_facets_manifold_base
2016-01-05 12:45:22 +01:00
b754453b44
WIP: Refine_facets_3_base compiles
2016-01-04 17:08:27 +01:00
7a22788e73
Fix typos
...
- *a* bounding box
- return*s*
2016-01-04 13:06:25 +01:00
44a14a4289
Merge pull request #566 from lrineau/Mesh_3-remove_Boost.Parameters_warnings-lrineau
...
Remove Mesh_3 warnings in Boost.Parameters
2015-12-29 16:47:38 +01:00
d212432a56
avoid hardcoding the Image_word_type
2015-12-22 16:53:26 +01:00
dd955cef30
Merge pull-request #483 from 'janetournois/Mesh_3-gray_level_image_oracle-lrineau'
...
Mesh 3 : add gray level image oracle
2015-12-18 16:46:46 +01:00
94b3204038
work in progress
...
one more step:
- inverse the arguments,
- specify the argument Base_.
2015-12-18 15:44:21 +01:00
c7f0d9cd9d
Merge pull request #566 from lrineau/Mesh_3-remove_Boost.Parameters_warnings-lrineau
...
Remove Mesh_3 warnings in Boost.Parameters
2015-12-18 14:56:15 +01:00
e0f8f4f85f
Refresh the branch Mesh_3-manifold_criterion-lrineau
...
For the moment, the manifold feature is no longer working.
Merge remote-tracking branch 'cgal-dev/Mesh_3-manifold_criterion-lrineau' into Mesh_3-manifold_criterion-lrineau
Conflicts:
Mesh_3/include/CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h
Mesh_3/include/CGAL/Mesh_3/Mesher_3.h
Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
Polyhedron/demo/Polyhedron/Polyhedron_3.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
2015-12-18 14:55:20 +01:00
d8c2f1a851
Remove Mesh_3 warnings in Boost.Parameters
2015-12-18 14:44:56 +01:00
71b4e9c515
Use CGAL_FULL_VERSION in all Doxyfile.in
2015-12-17 16:33:28 +01:00
312962f429
Bug-fix: do not store a reference to a temp object
2015-12-17 12:20:16 +01:00
2af8d42ed3
Add bbox() to MeshDomain_3
2015-12-16 11:52:52 +01:00
d1b3937a88
Edges management
...
- The shader of the edges of the base item discards the edges when it should
- The facets of the cutplane have edges
- The grid is displayed in all the rendering modes
2015-12-14 10:47:34 +01:00
d4dd0c1b28
merged branch that deals with 1D features on the sides of a cube
2015-12-13 11:07:12 +01:00
8cdef0eadc
Merge pull request #506 from sloriot/Mesh_3-document_ImageIO_required
...
document the need to link with ImageIO
2015-12-10 21:02:51 +01:00
60dbff189d
Merge pull request #534 from afabri/Polyhedron_3-improve_mesh_3_plugin-GF
...
Polyhedron 3 improve mesh 3 plugin gf
2015-12-10 21:01:00 +01:00
3d772e9d9d
Generic reference to the doc dir
2015-12-10 17:05:51 +01:00
81a8f982dc
Handle the easy INPUT cases
...
If INPUT is just PKG/doc/PKG, handle it automatically.
2015-12-10 17:00:26 +01:00
b97ccb832b
capitalize file name
2015-12-09 10:28:55 +01:00
18bbaede12
Integrate code for respecting polylines on an Image_3
2015-12-09 06:30:15 +01:00
b623100175
split the dual() functions; make the power test check for the absence of weights
2015-12-08 11:27:14 +01:00
b3b21809c6
Avoid calling make_object as it is expensive: It calls new/delete
2015-12-07 15:42:02 +01:00
d26903170c
Do not use std::endl in output_to_medit
2015-12-06 12:34:25 +01:00
1985df8c89
change inclusion order to avoid error concerning BOOST_PARAMETER_MAX_ARITY
2015-12-04 08:48:57 +01:00
bba935108e
Make sure that Mesh_3/global_parameters.h gets included before Polyhedron_3.h
2015-12-03 10:13:03 +01:00
247ba0056c
Include Mesh_3/global_parameters.h earlier
2015-12-02 10:59:26 +01:00
dd17f1ad5d
Set BOOST_PARAMETER_MAX_ARITY to the needed value in the concerned packages
2015-12-01 17:05:53 +01:00
f7efee8977
fix the use of the default number of initial points
...
it depends on the type of domain
2015-11-24 12:23:45 +01:00
eedee33c44
clean up mesh_3 package directory
2015-11-24 01:15:05 +01:00
e58f9a3537
document the need to link with ImageIO
2015-11-23 23:32:54 +01:00
44f940164a
add to mesh_3_options the ability to set the number of initial points from make_mesh_3
...
this is an undocumented internal feature
mainly for testing purposes
2015-11-23 16:48:15 +01:00
7a904dd370
fix VC++ max() error
2015-11-18 08:18:49 +01:00
bb85ae0179
Merge pull request #474 from afabri/BGL-suppress_warning-GF
...
suppress warning in boost as this has to be solved upstream
2015-11-17 13:21:05 +01:00
3f308a48af
Merge branch 'Mesh_3-gray_level_image_oracle-lrineau-old' into Mesh_3-gray_level_image_oracle-lrineau
2015-11-17 11:16:53 +01:00
2ce8b07ec0
Define BOOST_PARAMETER_MAX_ARITY in <CGAL/config.h>
...
This macro has to be larger than the default value
and it must be set before including <boost/parameter.hpp>
Instead of setting it to 12 in the packages that
need it, we do this in <CGAL/config.h> and produce
an error if a user has set it to a value < 12
2015-11-16 11:21:31 +01:00
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
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
f9d16f6720
this code should not be called for a triangulation of dimension < 3
2015-11-10 16:33:58 +01:00
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
31ebc6c472
use complete API of boost::optional
2015-10-30 16:06:31 +01:00
adf5c63fb2
add meshing of segmented images
2015-10-29 15:40:43 +01:00
b8ffee0f3a
add typedef to be used in polyhedron demo
2015-10-29 14:09:22 +01:00
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
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
258efef761
fix the case where trilinear_interpolation is not used
...
here transform() returns true or false whether the voxel value (not interpolated)
is less (default functor) than the input isovalue
this error was shown by a conversion "float to int" warning
2015-10-15 17:29:18 +02:00
58dc3c0fbb
fix a bug in C3T3_helpers for Mesh_3 global optimizers
...
handle the case, with global optimisers, in which
a point is moved to the same location as an existing vertex,
which is not old_vertex
it belongs to the case where there is a topological change
(because of the removal of old_vertex) but
find_conflicts(new_location) does not find any conflict
2015-10-15 17:13:47 +02:00
5b03df377f
fix compilation
2015-10-15 15:47:52 +02:00
4b2e0301e0
fix compilation
2015-10-15 15:47:02 +02:00
3c0169c6e2
Merge branch 'Mesh_3-check_weights_before_optimization-jtournois' into Mesh_3-gray_level_image_oracle-lrineau
2015-10-15 13:19:32 +02:00
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
90fb441d09
add meshing_3D_gray_images test and data
2015-10-15 11:42:46 +02:00
e3c396d219
add random generator as parameter for determinism
2015-10-15 10:58:34 +02:00
8ba792f40c
add copyright
2015-10-15 10:48:21 +02:00
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
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
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
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
9dc31b52e4
add documentation of parameters
2015-10-13 15:38:35 +02:00
761b69c5c5
add documentation for Gray_image_mesh_domain_3
2015-10-13 15:14:18 +02:00
70b9a83f60
fix conversion warning
2015-10-13 12:38:37 +02:00
0e26773f5d
insert \n in the stream instead of \endl
2015-10-13 09:15:21 +02:00
e9fc33d6a1
add example data
2015-10-12 10:42:28 +02:00
5a28ef7067
fix error due to deprecation
...
file has moved from include/CGAL/Mesh_3 to include/CGAL
2015-10-12 10:05:47 +02:00
039ddb0e4f
Merge branch 'Mesh_3-gray_level_image_oracle-lrineau-old' into Mesh_3-gray_level_image_oracle-lrineau
...
Conflicts:
.gitignore
2015-10-12 08:49:52 +01:00
ed2bd45c02
cstddef.hpp does not exist anymore in latest versions of Boost
2015-10-08 16:36:29 +02:00
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
8f7db42402
directly include boost config header
2015-10-07 16:19:29 +02:00
a7cf690800
include <CGAL/config.h>
2015-10-06 17:54:45 +02:00
b6dfcffa16
suppress warning
2015-10-02 08:20:45 +02:00
cf1c0ea0ca
Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin
2015-10-01 09:12:55 +02:00
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
dc3ceaef68
make message complete
2015-09-08 10:35:45 +02:00
c9da338be8
move 2 examples that need zlib
2015-09-07 17:27:54 +02:00
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
0bc029c5b8
Revert "suppress performance warning concerning an assertion"
...
This reverts commit 580b65d8a563ae26eb0f
2015-09-04 13:52:45 +02:00
0d18ccf09d
Merge branch 'CGAL-assert-GF' of github.com:CGAL/cgal-dev into CGAL-assert-GF
2015-09-04 12:30:26 +02:00
580b65d8a5
suppress performance warning concerning an assertion
2015-09-04 12:30:07 +02:00
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
253e0dddcf
Fix issue #300
...
Update_c3t3::operator() does not return bool!
2015-09-03 12:59:05 +02:00
984d9a4090
Add an example that remeshes a polyhedral surface
...
Using Mesh_3 only, instead of Surface Mesher, remesh a polyhedral
surface.
2015-08-31 13:03:56 +02:00
1e2ff1131e
assert -> CGAL_assertion
2015-08-27 16:51:55 +02:00
278a28016a
Merge branch 'CGAL-Qt5_support-GF'
...
Fixes #265 , fixes #254 .
2015-08-27 16:37:37 +02:00
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
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
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
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
d39d336461
Mesa Fix
...
- Changed 3.3 context in 2.1 context
- set shaders version to 120
2015-08-10 10:31:26 +02:00
55c30d0808
Qt::AA_UseDesktopOpenGL is usable from Qt-5.3 only
2015-08-04 10:55:26 +02:00
30e5d129f8
Remove Scene_item_with_display_list
2015-07-31 13:45:37 +02:00
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
ad81d725f2
Fix the moc warning
...
"No relevant classes found. No output generated."
2015-07-29 16:38:58 +02:00
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
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
a0d82358b0
Fix a warning (unneeded local typedef 'Facet')
2015-07-29 14:53:51 +02:00
ed4663ace5
SEGFAULT Fix
...
- corrected a pointer's issue.
2015-07-29 09:10:26 +02:00
c00da93d1d
fix warning about using a bool in a switch
2015-07-22 15:49:19 +02:00
6dc5695989
remove unused variable warning
2015-07-22 15:47:23 +02:00
590106f5fc
Changes in the other demos due to Polygon_mesh_processing package (PMP)
2015-07-16 17:27:17 +02:00
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
32a3f4b60b
The `make clean` can fail when there is no target at all
2015-07-15 16:36:19 +02:00
a1cf35a982
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
2015-07-15 08:21:33 +02:00
e3b1db9869
Segfault fix :
...
- made textureId mutable
- moved the initialization of textureId in the draw function with the initialization of the QOpenGLFunctions
2015-07-15 08:20:04 +02:00
04db43556f
Do not warn when Qt5 is not found.
2015-07-13 15:55:41 +02:00
f9917c487e
CMake 2.8.11
2015-07-13 12:36:43 +02:00
15c1469a54
CGAL requires CMake>=2.8.11.
2015-07-10 17:01:42 +02:00
3708b2da47
Re-add a file removed by error
...
This partially reverts commit 842b3bb5b4df76f756d4
2015-07-10 16:04:34 +02:00
842b3bb5b4
static_cast, less typename, fix CMakeLists
2015-07-10 15:03:39 +02:00
9bb28e331e
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
2015-07-10 13:46:04 +02:00
3b8f0e471f
gl functions fix
...
- added a QOpenGLFunctions item to scene_item
2015-07-10 13:45:14 +02:00
df76f756d4
static_casts; gl ->> gl.gl
2015-07-10 12:41:36 +02:00
135f70c65a
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
2015-07-10 12:28:49 +02:00
46fac706ec
fixes for VC++
2015-07-10 12:28:27 +02:00
3ec0c69f8f
We want 2.8.10 for all demos
...
Previous versions are not tested by the CGAL daily test suite.
2015-07-09 17:50:22 +02:00
38657c4591
Fix a warning -Wsign-compare
2015-07-08 15:59:04 +02:00
f17d91f4e3
Fix warnings about unused variables/local types/local functions
2015-07-08 15:01:36 +02:00
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
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
1d4358e052
update qt urls
2015-07-08 09:48:45 +02:00
e199f546d4
remove QT4 specific code
2015-07-07 19:36:04 +02:00
722abba27b
cosmetic changes to remove mentions of QT4
2015-07-07 18:00:43 +02:00
3c46e5262d
less typenames
2015-07-07 16:45:26 +02:00
84dfabf3b4
remove REQUIRED keyword for CGAL_Qt5 in demos
...
The handling should be with a status message
2015-07-07 11:23:46 +02:00
a540bef1d8
Changed() fixed.
2015-07-07 09:31:05 +02:00
e5bcdc5f3e
Update all CMakeLists.txt
...
- CMake 2.8.11 or later is now required
- GLEW is no longer used by demo/Polyhedron/
2015-07-06 18:14:34 +02:00
2bf6e15e96
ifdef SCENE_SEGMENTED_IMAGE_GL_BUFFERS_AVAILABLE Fix
...
- Removed the GLEW dependency in the CMakeList and the includes
- Moved the definition of SCENE_SEGMENTED_IMAGE_GL_BUFFERS_AVAILABLE to if(Qt5_FOUND) in the CMAkeList
2015-07-02 10:00:54 +02:00
8d86bebcaf
Merge remote-tracking branch 'cgal-dev/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF
2015-07-01 17:25:13 +02:00
cd3493d139
fix compilation
2015-07-01 14:40:22 +02:00
20c1b1a1f6
Merge branch 'Polygon_mesh_processing-GF-old' into Polygon_mesh_processing-GF
...
Conflicts:
BGL/include/CGAL/boost/graph/Euler_operations.h
BGL/include/CGAL/boost/graph/iterator.h
Documentation/doc/Documentation/Doxyfile.in
Documentation/doc/Documentation/dependencies
Polyhedron/demo/Polyhedron/Polyhedron_demo_point_inside_polyhedron_plugin.cpp
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
Polyhedron/demo/Polyhedron/Selection_widget.ui
2015-07-01 13:52:44 +02:00
0a55b1399e
Mesh_3 fix post merge
2015-06-30 13:47:52 +02:00
a0e7a60973
Merge remote-tracking branch 'cgal/master' into CGAL-Qt5_support-GF
...
Conflicts:
Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
Alpha_shapes_3/demo/Alpha_shapes_3/MainWindow.cpp
Alpha_shapes_3/demo/Alpha_shapes_3/Viewer.h
GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
GraphicsView/demo/Bounding_volumes/CMakeLists.txt
GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
GraphicsView/demo/Generator/CMakeLists.txt
GraphicsView/demo/GraphicsView/CMakeLists.txt
GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
GraphicsView/demo/Stream_lines_2/CMakeLists.txt
GraphicsView/demo/Triangulation_2/CMakeLists.txt
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
Mesh_3/demo/Mesh_3/CMakeLists.txt
Mesh_3/demo/Mesh_3/include/CGAL_demo/Scene_item_with_display_list.h
Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_join_and_split_polyhedra_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h
Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
Polyhedron/demo/Polyhedron/Scene_plane_item.h
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
Polyhedron/demo/Polyhedron/Scene_polylines_item.h
Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
Surface_mesher/demo/Surface_mesher/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/MainWindow.cpp
2015-06-30 09:17:26 +02:00
76cf7e789f
Merge remote-tracking branch 'cgal/releases/CGAL-4.6-branch'
...
- Merge pull request #140 from
lrineau/Mesh_3-demo_fix_QGLViewer-2.6.0-lrineau
Fix for libQGLViewer>=2.6.0
Conflicts:
Installation/changes.html
2015-06-28 18:25:04 +02:00
ad01608c2c
Fix for libQGLViewer>=2.6.0
...
Fix #138
2015-06-26 18:04:25 +02:00
32f0c9b37b
rename Point_inside_polygon_mesh to Side_of_triangle_mesh
...
and document it
2015-06-25 11:51:45 +02:00
22242f69c7
Merge pull request #125 from lrineau/Mesh_3-fix_with_gcc44_cpp11-lrineau
...
Fix a compilation error with gcc44 -std=c++0x
Conflicts:
Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
2015-06-18 17:31:09 +02:00
3fbc191693
Revert parts of "On Polygon_mesh_processing_OpenMesh-GF: fairing pour openmesh"
...
This reverts commit eb23730432aaeeef35b85feb013942175ae504f8, reversing
changes made to 1f0191190bcd9dfce903cf5af155ee114d00ac4b.
Only undo the permission changes
Conflicts:
Polygon_mesh_processing/examples/Polygon_mesh_processing/hole_filling_example_OM.cpp
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Weights.h
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/fair_impl.h
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_hole.h
2015-06-17 17:59:42 +02:00
b221fd0328
Fix an incoherent indentation
2015-06-17 12:24:01 +02:00
21a699368d
Fix a compilation error with gcc44 -std=c++0x
...
Should fix issue https://github.com/CGAL/cgal/issues/121
The error was that the "domain" class returns a `CGAL::Point_3<K>`, the
triangulation uses `CGAL::Weighted_point<CGAL::Point_3<K>, double>`, and
one piece of code from Mesh_3 in <CGAL/Mesh_3/Refine_facets_3.h> uses an
implicit conversion from
tuple<something_A, something_B, CGAL::Point_3<K> >
to
tuple<something_A, something_B, CGAL::Weighted_point<P, double> >
and plugs that into a `boost::optional`. For some reason, the g++-4.4
compiler does not like that, but recent g++ compilers accept the code.
The fix is to use an explicit conversion from `Point_3` to
`Weighted_point<Point_3, double>`.
2015-06-17 12:21:15 +02:00
7bb2046372
This should solve issue #41 .
...
(cherry picked from commit bc125c525c
2015-06-17 12:07:51 +02:00
195f11a98f
Explicitely call the constructor of Surface_patch to prevent compilation failures with g++.
...
(cherry picked from commit f9e4a9faff
2015-06-17 12:04:13 +02:00
40c629a3b4
Merge pull request #90 from janetournois/Mesh_2-add_optimizers-GF
...
Add optimizer methods in Mesh_2
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/lloyd_optimize_mesh_2
2015-06-10 11:57:53 +02:00
fae635d2fb
Merge pull request #73 from afabri/CGAL-Qt_no_keywords-GF
...
All Qt4-based demos now use `-DQT_NO_KEYWORDS`
2015-05-26 12:32:40 +02:00
ce8806b19b
Merge remote-tracking branch 'cgal-dev/CGAL-Qt_no_keywords-GF' into Mesh_2-add_optimizers-GF
...
Conflicts:
GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
2015-05-19 09:07:08 +02:00
7cabb0c508
Merge branch 'rebase/Mesh_2-add_optimizers-GF-old' into rebase/Mesh_2-add_optimizers-GF
...
Conflicts:
GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui
Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h
2015-05-19 09:01:20 +02:00
83c415bca9
move Mesh_optimization_return_code from Mesh_3 to Mesh_2
...
Mesh_3 already depends on Mesh_2,
but not the other way around
2015-05-19 08:54:36 +02:00
617c8de2c6
Merge pull request #51 from SLopezBRGM/master
...
simple fixes to use generic indexes for subdomains and surfacepatches
2015-05-18 11:03:51 +02:00
6c4785a29c
On Polygon_mesh_processing_OpenMesh-GF: fairing pour openmesh
2015-05-13 16:10:21 +02:00
a4d5f768fb
Mesh_3 demo
2015-05-06 16:18:32 +02:00
2f27db0234
changes such that the Mesh_3 demo works with -DQT_NO_KEYWORDS
2015-05-05 12:32:49 +02:00
53d52b4287
Merge pull request #62 from afabri/CGAL-fix_Index_links-GF
...
Escape the word Index with '%'
2015-04-27 09:26:39 +02:00
ed3298ee2f
Merge branch 'Polyhedron-new_opengl_REBASED_to_ignore_reindentations-gf' into CGAL-Qt5_support-GF
...
Conflicts:
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_selection_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
2015-04-27 08:50:06 +02:00
89348a1ab9
cut_plugin fixed
...
- replaced the missing modified files by the originals
- added a reference to a vector of floats in traits so that it fills it instead of drawing the bboxes
2015-04-24 15:59:23 +02:00
ba4ede5f50
Clean-up
...
- removed the unused functions and dependencies
- Replaced QGLBuffer by QOpenGLBuffer
2015-04-24 12:54:05 +02:00
551ad0a36b
SIGSEGV at closure time fixed
...
- moved the initializeOpenGLFunction() call from the scene to the viewer
2015-04-24 11:17:10 +02:00
711dc354c0
Upgrade of Volume_plane_intersection
...
- shader management
2015-04-24 10:49:56 +02:00
75c0fd6201
Upgrade of Volume_plane.h
...
- Modification of the shader management to be OpenGL 3.3 instead of 1.2
- Qt Wrappers
- Quads made in triangles : transformend the slice value from 64000 to 63999 to be a multiple of 3
- Bordures of the volume planes renderd by a shader
2015-04-24 09:14:13 +02:00
52382276a8
Escape the word Index with '%'
2015-04-23 12:04:35 +02:00
4400c15291
Upgrade of Segmented_image_item
...
- Shader management usng the existing vbos
- Replacing GLEW by QOpenGLFunctions
- Quads added as 2 triangles
2015-04-22 14:07:00 +02:00
efce0dcd4a
Upgrade of Scene_implicit_function_item
...
- shader management
- Qt5 wrappers
- draw colors in a texture
2015-04-21 16:08:12 +02:00
8662fa5c6a
Upgrade of Mesh3_demo Scene_c3t3_item
...
- shader management
- no more draw_edges or draw(int), everything is done in draw
2015-04-21 12:16:30 +02:00
ba0fb47874
Upgrade of Mesh_3 Polyhedorn_item
...
- Added shader management.
2015-04-20 15:30:59 +02:00
03858e9109
Upgrade of Mesh_3 Polygon_soup_item
...
- Addded an argument viewer to every type of draw in the demo
- added shader management
- removed the glPolygonMode on the scene because it is not usable in OpenGL ES
- draws the lines and the points instead
2015-04-20 14:16:08 +02:00
067647eebf
Replacing the use of operator!= by !( operator== ) when comparing domain or surface indexes.
...
This is link to issue #37 .
2015-04-16 10:12:50 +02:00
bc125c525c
This should solve issue #41 .
2015-04-14 21:31:18 +02:00
49a56c5a79
Fine grained range includes
2015-04-13 17:26:36 +02:00
Andreas Fabri
Laurent Rineau
Sebastien Loriot
Sébastien Loriot
Jane Tournois
Philipp Möller
Maxime Gimeno
Clément Jamin
Clement Jamin
Guillaume Damiand
Simon