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
ee3be905cc
AABB tree: bug fix (does not crash when no polyhedron is loaded)
2009-07-16 22:22:11 +00:00
09a862825f
AABB: one attempt to remove last remaining warning.
2009-07-15 14:06:55 +00:00
0e25638992
AABB tree: final polishing.
2009-07-13 18:58:28 +00:00
9336ab0d54
normalize example models.
2009-07-13 08:09:43 +00:00
7b0b297b56
AABB tree demo data: less complex knot for lower file size.
2009-07-13 08:07:48 +00:00
0b661beb2d
AABB tree demo: added two small models.
2009-07-13 08:04:01 +00:00
371704620e
AABB tree: fix two quibbles in doc, update demo manual.
2009-07-12 12:27:08 +00:00
ee9b4f8823
more on demo manual
2009-07-11 20:17:36 +00:00
8e805de882
AABB tree demo: copy snapshot to clipboard - we may want to add this to the polyhedron demo too.
2009-07-11 16:52:24 +00:00
447982854c
AABB tree demo: added save snapshot.
2009-07-11 16:19:10 +00:00
288e8798da
AABB tree: added short pdf user guide for the demo.
2009-07-11 07:35:03 +00:00
aa4b4fc7b3
AABB tree: update performance section with more details about memory occupancy (table here is better than a curve as the memory grows linearly)
2009-07-11 06:36:12 +00:00
53a898b22d
AABB tree: my last update on the demo.
2009-07-10 15:19:24 +00:00
ea91324fb3
AABB tree: bug fix and update description
2009-07-10 14:46:21 +00:00
bdbcbf7e1d
more on benchs
2009-07-10 12:45:03 +00:00
555c6892bd
AABB tree: reduce size
2009-07-10 11:28:30 +00:00
6f797c4b8e
AABB tree demo: replace QT timer by CGAL one.
2009-07-10 08:14:42 +00:00
4ba24506b1
aabb tree: attempt to eliminate a warning
2009-07-10 06:08:39 +00:00
a4147a7ff8
AABB tree demo: more on benchmarks
2009-07-09 14:33:41 +00:00
953f277f91
AABB tree: no more bias for large models as the internal KD-tree is built initially and not at the first query
2009-07-09 13:25:25 +00:00
991e936861
AABB tree: improve benchmarks.
2009-07-09 13:19:47 +00:00
145156621d
AABB tree demo: added P shortcut to menu view polyhedron and proper viewer updates. Thanks Laurent.
2009-07-09 09:35:28 +00:00
72ef5cb900
AABB tree: intersection benchmark code made much shorter and more accurate (the random generation of queries is made once for all before benchmarking, hence the timings are more precise).
2009-07-08 22:27:55 +00:00
60da2e471e
Fix a typo.
2009-07-08 15:53:48 +00:00
1b26c8d562
AABB tree: fix one table line of the benchmark.
2009-07-08 12:17:31 +00:00
de47ee0a27
AABB tree: do_intersect now calls the First_primitive traversal traits (much faster)
...
performance section updated
2009-07-08 12:02:28 +00:00
5388a71ce8
AABB tree: benchmark construction, memory, distances and intersections against #triangles.
2009-07-07 20:13:45 +00:00
f07daa35b9
AABB tree: benchmark also any_intersected_primitive (I forgot to call this function)
2009-07-07 14:24:50 +00:00
f7e2e92525
aabb tree: more on performance section (benchmark across kernels)
2009-07-06 21:29:36 +00:00
656138e3ae
AABB tree: enrich performance section with a summary (general comments and advices about how to put the tree at work with good performances). this is not exhaustive nor conclusive of course but I believe a documentation must also tell the obvious.
2009-07-05 20:45:08 +00:00
1c4b39ac2e
Remove some typename
2009-07-05 18:48:22 +00:00
9772610e5f
AABB tree: benchmark across kernels and updated intersection tests (more accurate).
...
need to fix compilation issue with EPIC kernel (I guess one include missing)
2009-07-05 13:58:00 +00:00
291861ad99
AABB tree demo: slicer now uses scene bbox
2009-07-05 13:16:08 +00:00
57ba5cc702
aabb tree demo: bbox now used for distance functions.
2009-07-05 12:57:36 +00:00
Sébastien Loriot
Maxime Gimeno
Andreas Fabri
Laurent Rineau
Aurélien Vialon
Laurent Rineau
Pierre Alliez
Stéphane Tayeb