Sébastien Loriot
cfe6f59802
add a method to invalidate the aabb-tree in the polyhedron item
2015-07-20 11:43:24 +02:00
Maxime Gimeno
cf70fd4d61
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
2015-07-17 14:24:01 +02:00
Maxime Gimeno
db134dfef7
Performance drop fix
...
- Added a QTime to reduce the number of calls to deform().
2015-07-17 14:22:48 +02:00
Sébastien Loriot
cffdb2ca5d
fix unused variable warning
2015-07-17 13:56:04 +02:00
Maxime Gimeno
9fee9aa3e2
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
2015-07-17 11:46:38 +02:00
Maxime Gimeno
a6ea2d94b7
Clean-up
2015-07-17 11:46:13 +02:00
Sébastien Loriot
b9be9e6725
remove Scene_item_with_display_list that is no longer used
2015-07-17 10:08:00 +02:00
Sébastien Loriot
fbeb14e5d9
remove empty file
2015-07-17 09:42:41 +02:00
Sébastien Loriot
a8741a26fe
avoid using glu when not needed
2015-07-17 09:41:15 +02:00
Sébastien Loriot
5ac79c737f
use two variable names to avoid warnings and possible issues
2015-07-17 09:40:22 +02:00
Maxime Gimeno
fb765fe7d1
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
2015-07-16 13:37:45 +02:00
Maxime Gimeno
f36cc05464
The toggling of the Show/Hide action does not trigger a changed() anymore.
2015-07-16 13:36:27 +02:00
Andreas Fabri
df34cd1986
colors are ints between 0 and 255
2015-07-16 11:36:20 +02:00
Sébastien Loriot
0d03326fb6
remove splat drawing related functions
2015-07-16 10:49:13 +02:00
Sébastien Loriot
c57483da4c
fix hidden overload warning
2015-07-16 10:48:16 +02:00
Sébastien Loriot
f25bcd32aa
fix warnings
2015-07-16 10:14:42 +02:00
Sébastien Loriot
6df729033d
fix warning
2015-07-16 09:11:41 +02:00
Sébastien Loriot
8299c9c00f
remove extra typename keywords
2015-07-16 09:09:14 +02:00
Maxime Gimeno
a571e1db8d
Clean-up
2015-07-16 08:26:41 +02:00
Andreas Fabri
498a2069ab
work on a smaller range
2015-07-15 17:51:36 +02:00
Laurent Rineau
033d36f053
Merge pull request #171 from lrineau/Installation-fix_cmake_issues-lrineau
...
Fix find_package(CGAL COMPONENTS Qt5) when Qt5 is not configured
2015-07-15 17:10: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
Laurent Rineau
bc0c30bbfd
Better display of the Qt5 configuration
2015-07-15 15:53:52 +02:00
Andreas Fabri
7d7c4feb6f
use special traits class for spheres of radius 0
2015-07-15 14:50:38 +02:00
Maxime Gimeno
5bcc14593c
Segfault fix
...
-Q_PLUGIN_METADATA was misplaced in the space_scale_plugin
2015-07-15 14:14:39 +02:00
Maxime Gimeno
c5940aab10
Use reserve to try to optimize the memory use
2015-07-15 13:53:13 +02:00
Maxime Gimeno
274245f822
Selectionned points color is red again
2015-07-15 12:48:46 +02:00
Maxime Gimeno
a2fcbefb10
trying to reduce the memory problem by reducing the calls to compute_points_and_normals;
2015-07-15 12:17:17 +02:00
Maxime Gimeno
2d7d0cf44f
Gain in memory
...
- Removed the buffers of color to use attribute values instead.
2015-07-15 11:10:41 +02:00
Maxime Gimeno
d6d4f84329
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
2015-07-15 11:10:16 +02:00
Andreas Fabri
69c3ac74ba
bug fix (was already in 4.6.1): enable polyline input
2015-07-15 10:48:10 +02:00
Maxime Gimeno
d693e45f8f
Removed the useless objects supposed to be used with splatting.
2015-07-15 10:04:14 +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
a1c9ef62d1
Fix last CMake issues in test/Installation/
2015-07-14 18:17:54 +02:00
Laurent Rineau
e43b1e42ba
Do include the export file if CMP0024 does not exist
...
With CMake-2.8.11, CMP0024 does not yet exist, and the target aliasing
feature does not exist either. So the only solution is to include the
export file.
2015-07-14 16:06:53 +02:00
Laurent Rineau
877634ba9f
Avoid multiple definitions of the target aliases
...
With -DWITH_demos:BOOL=TRUE, the CGALConfig.cmake is included multiple
times. This patch avoids that one tries to define multiple times the
same target aliases.
2015-07-14 15:59:56 +02:00
Laurent Rineau
3262264cbd
Search dependencies quietly
2015-07-14 15:12:47 +02:00
Laurent Rineau
fb4975f469
Check if the libraries are actually defined
...
In CGALConfig.cmake, the former code was just checking if
WITH_${CGAL_LIB} was TRUE. Now, the new code also checks if the target
was actually defined. If the target is not defined by WITH_${CGAL_LIB}
is ON, if probably means that one dependency of the library was not
properly configured.
2015-07-14 15:12:47 +02:00
Laurent Rineau
4ee4d8a5f7
Merge remote-tracking branch 'cgal-public-dev/CGAL-Qt5_support-GF' into CGAL-Qt5_support-GF
...
Conflicts:
Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
2015-07-14 15:05:45 +02:00
Laurent Rineau
72104a5d29
Add link_to_CGAL_Qt5
2015-07-13 17:37:52 +02:00
Laurent Rineau
6dcd671ffe
Rename the test file
...
That fixes the following CMake warning:
-- Configuring test in test/Snap_rounding_2
Requested component: Core
Requested component: MPFR
Requested component: GMP
CMake Warning (dev) at
Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake:19
(add_executable):
Policy CMP0037 is not set: Target names should not be reserved and should
match a validity pattern. Run "cmake --help-policy CMP0037" for policy
details. Use the cmake_policy command to set the policy and suppress this
warning.
The target name "test" is reserved or not valid for certain CMake features,
such as generator expressions, and may result in undefined behavior.
Call Stack (most recent call first):
buildEX/test/Snap_rounding_2/CMakeLists.txt:19
(create_single_source_cgal_program)
This warning is for project developers. Use -Wno-dev to suppress
it.
2015-07-13 16:00:26 +02:00
Laurent Rineau
04db43556f
Do not warn when Qt5 is not found.
2015-07-13 15:55:41 +02:00
Andreas Fabri
ddd3e2de63
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
2015-07-13 14:58:33 +02:00
Andreas Fabri
8a3a5e5791
Add Svg
2015-07-13 14:58:17 +02:00
Laurent Rineau
34ccb7facd
Merge pull request #133 from bo0ts/Installation-add_exports-pmoeller
...
Add a CGALExports.cmake file
Conflicts:
Installation/cmake/modules/CGALConfig_binary.cmake.in
This merge should fix the warning caused by CMP0024.
2015-07-13 12:45:19 +02:00
Laurent Rineau
f9917c487e
CMake 2.8.11
2015-07-13 12:36:43 +02:00
Laurent Rineau
6506a35e7f
It is CMake 2.8.11 that we want.
2015-07-13 12:21:54 +02:00
Laurent Rineau
0fb169701f
Copy changes.html from master, to remove conflicts
2015-07-10 18:11:11 +02:00
Laurent Rineau
f40fe0dc2d
Merge branch 'gsoc2013-Visibility_doc-hemmer' into CGAL-Qt5_support-GF
2015-07-10 18:07:26 +02:00