fc68989e60
Use Simple_cartesian<double> to greatly enhance the performance.
2016-07-05 15:58:43 +02:00
1cde972cdb
Remove whitespace at end of lines
2016-06-29 11:04:29 +02:00
8ac37cc7df
Add missing link with glu in demo.
2016-06-02 12:25:39 +02:00
10469f9c4e
Update with master
2016-05-25 10:58:55 +02:00
524a8da107
Remove glu from all the CMakeLists
2016-04-14 09:29:50 +02:00
a528ff0847
Remove commented line
2016-03-09 14:42:24 +01:00
dff63d83d3
Correct the problem of cmake qt5 macro not available in header only when configuring cgal_qt5.
...
To solve this problem, we added in the macro check_cgal_component the find package of qt5 if we are configuring cgal_qt5.
2016-03-09 10:44:15 +01:00
c27ff9e85c
Rename some cmake variables
2016-03-09 10:42:46 +01:00
221c9462db
Should be set, not message
2016-03-09 10:37:58 +01:00
561b1f2a38
Do not need cgal_include_moc_files macro
2016-03-09 10:37:58 +01:00
16a19eb33e
Ok for demo for aabbtree
2016-03-09 10:37:57 +01:00
78cde742ce
Work on demo with qt5; ok for AABBtree (but need to be improved)
2016-03-09 10:35:22 +01:00
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
2d65524aea
All last demonstrations ported to Qt4or5. Need to check working of it on Linux.
2014-08-12 22:12:42 +02:00
ff94f3bf39
Arrangement_on_surface_2 ported.
2014-07-04 17:57:12 +02:00
5f4813b64d
properties_Polyhedron_3.h is now included by graph_traits_Polyhedron_3.h
2014-07-04 17:24:05 +02:00
ab909badb9
Demonstrations AABB_tree, Alpha_shapes_3 and Circulat_kernel_3 ported. Working on Mesh_3, Polyhedron and Periodic_3_triangulation_3.
2014-07-03 15:07:00 +02:00
ff3ad95287
remove boost:: prefix
2014-07-01 13:24:02 +02:00
e95c3d452c
Switch to new BGL API in package AABB_tree
2014-05-24 08:55:43 +02:00
0864336a66
remove compatibility with original polyhedron primitives
...
there is no need to maintain such an artificial compatibility, the old
primitives are still in CGAL.
2013-07-29 17:17:56 +02:00
9c0808cad1
fix name of classes that do not respect CGAL naming conventions
...
AABB_HalfedgeGraph_segment_primitive -> AABB_halfedge_graph_segment_primitive
AABB_FaceGraph_triangle_primitive -> AABB_face_graph_triangle_primitive
2013-07-23 17:46:50 +02:00
91dde8b2c0
use undirected_edges to have only one primitive per edge
2013-06-26 08:55:14 +02:00
bb7c57af94
update AABB-tree demo to use the new primitives
2013-06-20 10:36:43 +02:00
7d20531b1d
Convert remaining CRLF files to LF
2012-12-04 17:09:28 +01:00
2db4effa7e
CMake: Fix the handling of cmake_policy
...
That is a followup-to my commit last year:
| ------------------------------------------------------------------------
| r63198 | lrineau | 2011-04-28 19:45:22 +0200 (Thu, 28 Apr 2011) | 5 lines
|
| Try to fix my last revision about cmake_policy, with CMake-2.6.x
|
| CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
| x.y.z is greater than the current CMake version.
|
| ------------------------------------------------------------------------
The following check:
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
is useless just after a call to:
cmake_minimum_required(VERSION 2.6.2)
The script used to fix that was:
#!/usr/bin/env perl
$replacement=<<'END';
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
cmake_policy(VERSION 2.8.4)
else()
cmake_policy(VERSION 2.6)
endif()
END
while(<>) {
if(/if\("\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6\)/) {
while(<>) {
if(/^endif\(\)/) {
print "$replacement";
while(<>) {
print;
}
exit 0
}
}
}
print;
}
2012-08-22 12:35:03 +00:00
8f59fd9592
Turn QPL into LGPLv3+
2012-01-13 16:33:35 +00:00
88ef561715
Fix the call to Q_INIT_RESOURCE
...
For resources that are shipped by the CGAL_Qt4 library, one need to call
CGAL_QT4_INIT_RESOURCES, a macro that calls CGAL_Qt4_init_resources
(exported by the CGAL_Qt4 DLL)
2011-10-11 09:51:29 +00:00
7f7a8dc358
merge from trunk
2011-05-16 11:28:24 +00:00
ea7b0b0735
AABB demo: save snapshot now requires selecting a filename.
2011-05-08 16:45:18 +00:00
3c02e07b23
Try to fix my last revision about cmake_policy, with CMake-2.6.x
...
CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
x.y.z is greater than the current CMake version.
2011-04-28 17:45:22 +00:00
c97205f085
Global handling of CMake policies (second part)
...
We declare
cmake_minimum_required(VERSION 2.6.2)
but we also use
cmake_policy(VERSION 2.8.4)
to declare that our CMake scripts are OK with all the defaults of CMake policies
as of CMake-2.8.4. That shuts down the warnings of CMake-2.8.4.
That way, we no longer need any declaration of specific policies.
Those two lines must be present and maintained in all our CMakeLists.txt
files (the one for the libraries, and also the one for examples and demos,
and maybe tests).
2011-04-28 10:55:56 +00:00
ca5c92e034
Global maintenance of CMakeLists.txt: CMake minimal version is -2.6.2
...
The documentation of CGAL says that the minimal version of CMake must be
CMake-2.6.2.
- change cmake_minimum_required to VERSION 2.6.2
- no longer any need for the policy CMP0003 (was for 2.4.x)
- no longer any need for CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS (was for 2.4)
2011-04-27 17:58:27 +00:00
77a2bead80
Add missing svn properties (keywords and eol-style).
2010-09-20 12:12:46 +00:00
af3ad196a0
Global fix of all uses of qt4_generate_moc: the destination file path must be absolute.
2010-08-11 13:24:20 +00:00
5c3aa143ab
Fix warnings.
2010-07-06 06:54:22 +00:00
9c99fa19f8
AABB_demo. fix warnings: 'unsigned int' -> 'std::size_t'.
2010-07-05 07:56:40 +00:00
fe1cf837ce
+ Recompute distance function when mouse button is pressed (avoids buggy behavior if object is animated when button is pressed).
2010-05-20 07:39:30 +00:00
3cfe38ec58
Fix warning.
2010-05-20 06:34:08 +00:00
6b1e3d3091
+ Use LF(Unix) end-of-line character and set svn:eol-style property to native.
...
+ Code is the same
2010-05-19 07:36:24 +00:00
38ae830e13
+ Bug fix: ensure that tree is not empty before computation related to cut plane.
2010-05-19 07:05:22 +00:00
d661ca9158
'Cutting plane: None' now clears cutting plane.
2010-05-19 06:52:47 +00:00
d8e443c68e
+ AABB demo: use a moving plane for distance functions
2010-05-19 06:35:59 +00:00
fe941f657c
added menu entry for cut plane.
2010-03-12 20:24:43 +00:00
8cf3b85894
demo AABB tree: adjust menu for cut plane
2010-03-05 16:01:34 +00:00
25e5b97c9c
added few things to improve the demo further after discussion with Stephane.
2010-03-03 09:21:15 +00:00
5f91c4394a
Fix ui file.
2010-03-03 07:58:28 +00:00
436504fad6
Cosmetic: fill cutting plane with a semi-transparent color.
2010-02-25 17:37:43 +00:00
a1fa2d18c9
Refining a polyhedron now resets previously computed data.
2010-02-25 12:11:22 +00:00
3cd9690e34
Add cutting plane feature in AABB tree demo.
2010-02-25 10:36:04 +00:00
f7a63d0ec5
revert r52901-52902 (moving predicate from AABB_tree to Intersections_3)
2009-11-10 16:58:02 +00:00
b869d0956d
Move intersection predicates and constructions from AABB_tree to Intersection_3.
2009-11-09 12:10:23 +00:00
Maxime Gimeno
Laurent Rineau
Guillaume Damiand
Clement Jamin
Andreas Fabri
Sébastien Loriot
Jane Tournois
Aurélien Vialon
Laurent Rineau
Pierre Alliez
Stéphane Tayeb