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

1738 Commits

Author SHA1 Message Date
Laurent Rineau 253e0dddcf Fix issue #300 
Update_c3t3::operator() does not return bool!
 2015-09-03 12:59:05 +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
Maxime Gimeno 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
Maxime Gimeno 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
Laurent Rineau 04db43556f Do not warn when Qt5 is not found. 2015-07-13 15:55:41 +02:00
Laurent Rineau f9917c487e CMake 2.8.11 2015-07-13 12:36:43 +02:00
Laurent Rineau 15c1469a54 CGAL requires CMake>=2.8.11. 2015-07-10 17:01:42 +02:00
Laurent Rineau 3708b2da47 Re-add a file removed by error 
This partially reverts commit 842b3bb5b4,
reversing changes made to df76f756d4.

Only the file:

	Mesh_3/examples/Mesh_3/data/liver.inr.gz

is modified (re-added).
 2015-07-10 16:04:34 +02:00
Andreas Fabri 842b3bb5b4 static_cast, less typename, fix CMakeLists 2015-07-10 15:03:39 +02:00
Maxime Gimeno 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
Maxime Gimeno 3b8f0e471f gl functions fix 
- added a QOpenGLFunctions item to scene_item
 2015-07-10 13:45:14 +02:00
Andreas Fabri df76f756d4 static_casts; gl ->> gl.gl 2015-07-10 12:41:36 +02:00
Andreas Fabri 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
Andreas Fabri 46fac706ec fixes for VC++ 2015-07-10 12:28:27 +02:00
Laurent Rineau 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
Laurent Rineau 38657c4591 Fix a warning -Wsign-compare 2015-07-08 15:59:04 +02:00
Laurent Rineau f17d91f4e3 Fix warnings about unused variables/local types/local functions 2015-07-08 15:01:36 +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 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 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
Sébastien Loriot 722abba27b cosmetic changes to remove mentions of QT4 2015-07-07 18:00:43 +02:00
Andreas Fabri 3c46e5262d less typenames 2015-07-07 16:45:26 +02:00
Sébastien Loriot 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
Maxime Gimeno a540bef1d8 Changed() fixed. 2015-07-07 09:31:05 +02:00
Laurent Rineau 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
Maxime Gimeno 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
Andreas Fabri 8d86bebcaf Merge remote-tracking branch 'cgal-dev/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF 2015-07-01 17:25:13 +02:00
Jane Tournois cd3493d139 fix compilation 2015-07-01 14:40:22 +02:00
Andreas Fabri 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
Maxime Gimeno 0a55b1399e Mesh_3 fix post merge 2015-06-30 13:47:52 +02:00
Maxime Gimeno 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