0a37521263
Revert "Fix for the context"
...
This reverts commit 552aaa159f
2016-02-11 14:16:04 +01:00
552aaa159f
Fix for the context
2016-02-09 14:48:26 +01:00
ec0928c044
Fix for AABB_demo
...
- The scene was not initialized when viewer->initializeGL() wwas called (still because OS X calls initialzeGL() during the setupUI instead of the first draw)
2016-01-19 17:13:06 +01:00
a41165b6eb
various
2016-01-05 18:04:14 +01:00
078afb18b3
Alpha_shapes_2
2015-12-31 16:19:26 +01:00
61072a8e75
Clean-up
2015-08-10 09:04:01 +02:00
71b0fd8d31
Replaced the OpenGL 3 3 Core context by a 2_1 context.
2015-08-10 08:46:09 +02:00
970e767bbf
GL security enhancement
...
- Version of the shaders added and depth test enabled at each draw.
2015-08-06 15:05:00 +02:00
fd38d1192b
Plane manipulated secured
...
- Should resolve all the remaining problems about the manipulated frame, except for the wheels events.
- Added glEnable(GL_DEPTH_TEST) to the draw() function of the viewer to avoid errors in certain cases
2015-08-06 14:47:21 +02: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
839d09e82a
ManipulatedFrame fps fix
...
- I used the startTimer(0) to cadence the calls to cutting_plane()
- Now if the plane is spinning, the fast_distance is used.
2015-08-04 09:03:15 +02:00
87a406ab81
Fix a warning with MSVC
...
> aabb_tree_demo\Scene.cpp(1313) : warning C4138: '*/' found outside of comment
Trivial bug-fix.
2015-07-30 13:04:29 +02:00
6dc5695989
remove unused variable warning
2015-07-22 15:47:23 +02:00
012110cfa5
fix warning for windows
2015-07-21 15:59:03 +02:00
cffdb2ca5d
fix unused variable warning
2015-07-17 13:56:04 +02:00
04db43556f
Do not warn when Qt5 is not found.
2015-07-13 15:55:41 +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
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
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
8c391c1cdf
Windows context problems fixed
...
- Called setAttribute(Qt::AA_UseDesktopOpenGL) in the main function.
2015-07-07 15:31:18 +02:00
620abb640d
WIP : still on the windows OGL context
2015-07-07 15:23:15 +02:00
ce6e05e8bd
WIP : forcing windows to use the right opengl context.
2015-07-07 15:12:41 +02:00
47e827764a
Trying to force the context to use OpenGL3_3_Core.
2015-07-07 13:42:37 +02:00
22dbcfaa2c
Still on that SIGSEGV
2015-07-07 11:50:05 +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
870795d79d
Add some info display
2015-07-07 11:22:01 +02:00
8b02b4f914
Still trying to fix that SIGSEGV with glGenTextures
2015-07-07 11:18:14 +02:00
9c501a57d4
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
2015-07-07 10:59:42 +02:00
b0d87a9236
Fix for the SIGSEGV at runtime
...
- initializeOpenGLFunction and GglGenTextures() have been moved to draw to be sure they have a working context.
2015-07-07 10:58:30 +02:00
1aa3ca438e
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
2015-07-07 10:46:55 +02:00
795a0bfafe
static_casts
2015-07-07 10:46:43 +02:00
d442644c8d
Fix for the SIGSEGV at the runtime
...
- draw only if the vectors of vertices aren't empty.
2015-07-07 10:43:52 +02:00
2c8bb3f978
changed() fixed
...
- are_buffers_initialized = true instead of ==true in initialize_buffers().
2015-07-07 08:36:17 +02:00
85afa81ebd
Changed() fixed.
2015-07-07 08:33:47 +02:00
f5ddbfdf96
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
2015-07-07 08:24:24 +02:00
12501598bb
Changed() fix and texture ID generation.
2015-07-07 08:21:56 +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
1a3e0e001b
add dependendency on svg
2015-07-06 16:31:56 +02:00
74ff5ae85c
Clean-up
...
- Scene_item_with_display_list removed
- Program initializing functions being moved to scene_item to lighten-up the code of each object (Only polyhedron_item concerned at this stage)
2015-06-12 14:46:05 +02:00
ba4ede5f50
Clean-up
...
- removed the unused functions and dependencies
- Replaced QGLBuffer by QOpenGLBuffer
2015-04-24 12:54:05 +02:00
965f2ab77b
Upgrade of AABB_Tree_demo to OpenGL ES with Qt 5 wrappers.
...
- used qt wrapper for the gestion of the shaders.
- used OpenGL ES 3 for the gestion of the texture.
- the texture doesn't have the "FLAT" mode while moving anymore.
2015-04-08 11:13:16 +02:00
69a534ae37
WORK IN PROGRESS
...
- Added vao gestion, draws everything but the cutting plane.
2015-04-03 16:43:52 +02:00
0ce6f75bc4
WORK IN PROGRESS
...
- Added qt shader material
- only drawing a red triangle for now
2015-04-03 14:54:35 +02:00
85c8e7e270
Upgrade of AABB_Tree Demo to Qt5
...
- setBackgroudColor was called too soon(in the constructor of the viewer), now called in InitializeGL
2015-04-02 11:54:06 +02:00
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
df9e315536
Correction of some problem (SDK Windows, REQUIERED thing...) and add of comments for findQt5.cmake.
2014-08-15 02:57:48 +02:00
Maxime Gimeno
Andreas Fabri
Laurent Rineau
Sébastien Loriot
Jane Tournois
Aurélien Vialon