a9f2278c5b
Better position for light.
2015-11-04 11:29:59 +01:00
3f206e9b60
Improve drawing.
2015-11-03 17:36:52 +01:00
a21da00c9d
Improve drawing
2015-11-02 15:14:50 +01:00
ef9f1d4973
Merge branch 'LCC-examples_qt5-gdamiand-old' into LCC-examples_qt5-gdamiand
2015-11-02 14:48:46 +01:00
5d9d9d660d
Merge pull request #450 from gdamiand/CMap-marks_with_exceptions-sbrandel
...
C map marks with exceptions sbrandel
2015-11-02 09:12:42 +01:00
58d3eb9893
Update the viewer (not yet finished).
2015-10-30 21:32:44 +01:00
afeb0eb4d2
Do not use using declaration but a typedef.
2015-10-29 07:41:55 +01:00
d02357fb9c
Remplace int by size_type for mark
2015-10-28 18:56:46 +01:00
06731095ae
Add using declaration for Exception_no_more_available_mark.
2015-10-28 11:19:02 +01:00
38a28fd78c
Bug fix: reserve a mark before to use it.
2015-10-16 07:28:43 +02:00
97f44c5749
Add smoth display mode in LCC demo.
2015-10-02 15:01:19 +02:00
2ee49ba5f3
Update basic viewer and corresponding examples; remove one example since it is now in the demo.
2015-10-02 14:44:42 +02:00
558fbb7f04
Improve triangulation method
2015-10-02 12:05:58 +02:00
43d4380537
Update drawing function to allow to draw faces with holes.
2015-10-01 19:21:47 +02:00
0f7bb719f3
Merge branch 'CMap-marks_with_exceptions-sbrandel-old' into CMap-marks_with_exceptions-sbrandel
2015-10-01 18:31:45 +02:00
b5c34bf9cc
Ok for qt5 viewer
2015-10-01 16:55:55 +02:00
8e39e7e4d7
Merge branch 'LCC-examples_qt5-gdamiand-OLD' into LCC-examples_qt5-gdamiand
2015-10-01 13:41:15 +02:00
6e214c5f4a
remove Qt3 demos and empty dontsubmit files
2015-09-30 12:51:40 +02:00
09766139ec
Fix a warning about moc
...
The warning was:
Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp:0: Note: No relevant classes found. No output generated.
2015-09-17 15:38:28 +02:00
e2656f9600
Remove glu link in cmake
2015-09-03 12:35:42 +02:00
9b4b3ee846
More cleanup plus do not recenter the scene at each modification.
2015-09-03 12:32:20 +02:00
98b36b260e
Update light parameters
2015-08-31 08:18:04 +02:00
24840dbd5c
Improve drawing code in LCC demo.
2015-08-29 14:43:52 +02:00
921416603f
Reintegrate LCC demo save/load in the new qt5 version ok.
2015-08-28 14:43:07 +02:00
600e7b1b30
Start to merge with the new qt5 version of the LCC demo (nyf).
2015-08-28 11:51:48 +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
ee2b0b2011
Transparent facets fix
...
- set the alpha value to 1 in the shaders to insure opaque color.
2015-08-13 11:56:04 +02:00
52a35d4d8d
Random displaying fix
...
- The bounding box was set before being initialized.
2015-08-13 08:55:10 +02:00
3a5d0a79fc
Mesa Fix
...
- Replaced the 3.3 context by a 2.1 context
- Set the shaders version to 120
2015-08-10 10:11:29 +02:00
e413b0c45a
GLSL Version changed
...
- Shaders specify version 140 (opengl 3.1) instead of 330. This should fix the "GLSL 3.30 is not supported" error.
2015-08-06 15:19:36 +02:00
d3f2e9cba2
LCC viewer uses now qt5.
2015-08-05 18:26:19 +01:00
508b467203
Merge branch 'CGAL-Qt5_support-GF'
2015-08-05 11:23:40 +02:00
55c30d0808
Qt::AA_UseDesktopOpenGL is usable from Qt-5.3 only
2015-08-04 10:55:26 +02:00
cb0bdd3ad2
Remove warnings about unused moc files
...
Should fix #194 .
2015-08-03 16:27:28 +02:00
1b14d447e5
SEGFAULT Fix
...
- the iterator he_circ was looping wrong. I changed he_circ_end(he_circ) in
he_circ_end = lcc.darts_of_orbit<1>(dartIter).end();
2015-08-03 12:57:45 +02:00
5d2c892dbe
Merge pull request #149 'lrineau/Polygon_mesh_processing-GF'
...
Add various functions to manipulate polygon meshes
2015-07-17 14:50:56 +02:00
50595505c4
Merge branch 'Fix_warnings-GF'
...
Fixes warnings in various packages
Successfully tested in CGAL-4.7-Ic-87
Approved by the release Manager
2015-07-17 14:21:21 +02:00
aa72eaa371
Merge pull request #154 from maxGimeno/CGAL-Qt5_support-GF
...
Qt5 support, GSoC 2014
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Qt5_support
In this commit, I have fixed the permissions of the file:
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/points
In this commit, I have also modified:
Installation/changes.html
2015-07-17 14:13:37 +02:00
10dddcc881
init base class to avoid a warning with clang
2015-07-16 17:45:52 +02:00
590106f5fc
Changes in the other demos due to Polygon_mesh_processing package (PMP)
2015-07-16 17:27:17 +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
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
6c46be1d01
static_casts
2015-07-09 13:17:41 +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
32a8cb7d0c
Changed system fixed.
...
- Problem remaining : OFF aren't displayed when loaded.Scene need an additional scene_changed to display OFFs.
2015-07-07 09:07:04 +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
662408b2f8
Improve merge coplanar faces method.
2015-07-01 15:21:35 +02:00
7f0b73634a
Remove typename outside templace class
2015-07-01 07:28:37 +02:00
fbfd47896b
Remove the use of glu tesselator to draw non convex faces.
2015-06-30 14:22:53 +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
cf563fa834
Disable non flat rendering; add casts to solve problem of gluTessCallback on win32.
2015-06-25 16:09:51 +02:00
d67542fb59
Add is_xxx_used in cmap for dart and attributes; add tests in CMap and LCC.
2015-06-22 16:50:56 +02:00
ff15468079
Remove flag in cmake, pushed by error
2015-06-22 16:02:32 +02:00
6395db7d5e
Increase the size of the first column.
2015-06-18 09:55:35 +02:00
a57e127412
Remove warnings
2015-06-17 09:45:59 +02:00
37b0d2256c
* Better drawing when scene was empty.
...
* Bug fix in triangulate all faces
2015-06-16 12:14:47 +02:00
0a92fae044
Do not modify the user point of view after each operation.
2015-06-16 08:53:45 +02:00
da8fbde03c
Bug fix in merge coplanar faces
2015-06-16 08:39:00 +02:00
d0cb5d35f5
Bug fix when changing the visible property of a volume.
2015-06-16 07:57:45 +02:00
50fabbec8d
Add delaunay triangulation of faces
2015-06-15 22:59:00 +02:00
4bae2612d8
* Modify load to not take into account the typeid of attributes
...
* Update the demo to draw non convex faces
2015-06-15 21:14:02 +02:00
1797dc57e0
* add one more import
...
* bugfix in drawing fuction (to draw a volume in wireframe)
2015-06-15 16:18:05 +02:00
1867f5b096
Add save/load in the demo.
2015-06-15 14:53:00 +02:00
25b2727381
mark type modified from int to size_type, exception thrown in get_new_mark and test added in the test-suite
2015-06-12 15:11:04 +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
98bbdbfc2d
Move functor that detect non void attributes and point in CGAL namespace (before they were in internal); add a missing void typedef.
2015-05-15 19:58:37 +02:00
c5d196f78c
remaining demos
2015-05-06 18:53:44 +02:00
8fc89ebf86
WIP : non-triangle facets management
...
- Sometimes at run time nothing is displayed
for the entire life of the program, sometimes
it's ok but a message is displayed about the
scene radius which is negative
- Voronoi crashes for points sets in 3D (wrong map,
darts xxx does not have a vertex or something similar)
and displays nonsense for 2D set points
2015-04-10 14:29:05 +02:00
7b2f0ebe89
WIP : Upgrade to OpenGL 3 with Qt wrappers
...
- de-activated the light for the points and lines
- rendering with shaders
- need of non-triangle facets management
2015-04-10 09:43:21 +02:00
41464f142f
type of boolean marks modified from int to size_type in both Combinatorial_map and Linear_cell_complex
2015-04-01 15:36:34 +02:00
60b47f0978
Succesfully upgraded to Qt5
2015-04-01 12:18:59 +02:00
0310953938
undo a redundant change in import_from_triangulation_3
2015-04-01 11:02:47 +05:30
78dd583dac
fixes issue of infinite vertex in import_from_triangulation_3
2015-03-31 14:18:41 +05:30
52dc3b265d
Merge remote-tracking branch 'remotes/cgal-public-dev/gsoc2014-CGAL-Qt5_support-vialon' into to-qt5
...
All CMake files modified by the branch 'gsoc2014-CGAL-Qt5_support-vialon' have been reset.
Conflicts:
GraphicsView/demo/Polygon/CMakeLists.txt
GraphicsView/src/CGAL_Qt4/CMakeLists.txt
GraphicsView/src/CGAL_Qt4/GraphicsView.qtmoc.cmake
Installation/cmake/modules/CGALConfig_binary.cmake.in
Installation/cmake/modules/CGALConfig_install.cmake.in
Installation/cmake/modules/CGAL_Macros.cmake
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp
Mesh_3/demo/Mesh_3/CMakeLists.txt
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_edit_polyhedron_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_join_polyhedra_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt
Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_average_spacing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_inside_out_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_local_spacing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_off_plugin.cpp
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
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_smoothing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_helper.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene.cpp
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
2015-03-30 16:02:51 +02:00
93ceb66149
Remove -Wall for demo
2015-03-04 13:36:53 +01:00
c0e4987190
Add wall option for lcc demo
2015-03-03 11:13:25 +01:00
fd4162a5a1
Bug fix in size function in ranges
2015-03-03 10:37:37 +01:00
2ee8f25ba6
Update the undocumented function write_off to allow the export of mesh with dimension higher than 2
2015-02-27 13:57:52 +01:00
9a6ed32a15
Merge branch 'Combinatorial_map-update_attributes-sbrandel'
...
- corresponding to small feature "Combinatorial map update attributes"
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Combinatorial_map_update_attributes
- succesfully tested, release number CGAL-4.6-lc-99
- Approved by the Release Manager
Conflicts:
Installation/changes.html
2015-01-08 14:48:47 +01:00
e2c433bd7e
One more remove^Crailing whitespace.
2015-01-06 15:53:51 +01:00
60c9eb8cbc
Remove trailing whitespace.
2015-01-06 15:52:41 +01:00
4d6a8573f5
Add one example.
2015-01-06 12:24:50 +01:00
31f97645d9
Finalize doc + example.
2015-01-05 18:37:50 +01:00
090f2f5cfd
Remove warning
2015-01-02 18:50:49 +01:00
32464de4a5
Update demo for Menger, Sierpinski Carpet and Sierpinski Triangle.
2014-12-28 17:15:02 +01:00
237c4b87fb
Remove warnings.
2014-12-27 20:12:51 +01:00
029724ab67
Add example file
2014-12-25 08:20:52 +01:00
d851f35651
Remove warnings; wrong use of typename and template in viewer; default argument for example.
2014-12-25 08:20:00 +01:00
69b53d262d
Improve demo drawing.
2014-12-24 09:18:55 +01:00
34e9139cde
Update viewers.
2014-12-24 08:19:09 +01:00
bdc0dee6ce
Update operations to use are_attributes_automatically_managed
2014-12-23 22:15:49 +01:00
0860cf5012
Remove trailing whitespaces
2014-12-23 21:52:15 +01:00
Guillaume Damiand
Sebastien Loriot
Andreas Fabri
Laurent Rineau
Maxime Gimeno
Sébastien Loriot
Sylvain Brandel
Pranav