Commit Graph

64122 Commits

Author SHA1 Message Date
Andreas Fabri a4351336d2 integrate Laurent's comments 2015-08-28 15:09:37 +02:00
Andreas Fabri 884be65abc remove typedef 2015-08-28 15:04:55 +02:00
Andreas Fabri 061732d439 fix indentation 2015-08-28 15:04:08 +02:00
Andreas Fabri 86dd2f7111 VC2015 needs the container template argument for Polygon_2 and Polygon_with_holes 2015-08-28 14:36:37 +02:00
Andreas Fabri ab2ad75091 Qualifying with CGAL:: solves the problem, but is it the bestsolution? 2015-08-25 16:19:56 +02:00
Jane Tournois d52bbfaef9 fix the iterator type in mutable_priority_queue,
boost 1.59 still contains this bug too
2015-08-17 15:51:19 +02:00
Jane Tournois 629983854e attempt to fix the use of "inline"
the warning C4396 happens for these functions on msvc2015

----------------------------------------------
Compiler Warning (level 2) C4396
Visual Studio 2008
"name" : the inline specifier cannot be used when a friend declaration refers to a specialization of a function template

A specialization of a function template cannot specify any of the inline specifiers. The compiler issues warning C4396 and ignores the inline specifier.
To correct this error
    Remove the inline, __inline, or __forceinline specifier from the friend function declaration.
----------------------------------------------
2015-08-11 17:14:46 +02:00
Jane Tournois 7974986da1 avoid warning about conversion
warning C4311: 'type cast': pointer truncation from 'double *' to 'long'
2015-08-11 17:12:26 +02:00
Jane Tournois feb76b7439 add missing namespaces for msvc2015
avoid ambiguity of calls
2015-08-11 15:48:55 +02:00
Jane Tournois c19d370265 fix missing namespaces
fix compilation of advancing front for msvc 2015
2015-08-11 15:29:16 +02:00
Sébastien Loriot ce786f9edd Merge branch 'CGAL-Qt5_support-GF'
Fixes various issues in demos
      Improve runtime of Side_of_triangle_mesh
2015-08-07 12:13:41 +02:00
Jane Tournois b399e8fd3f fix double to float conversion warning
(and avoid a bunch of divisions)
2015-08-07 12:02:37 +02:00
Sébastien Loriot ab99da0ce2 use CGAL_PI to avoid issue with MSVC and M_PI 2015-08-07 08:30:06 +02:00
Sébastien Loriot ca19447002 fix warnings detected by clang 2015-08-06 19:39:35 +02:00
Sébastien Loriot db4c217d4b make the item created from a selection the selected item 2015-08-06 19:18:19 +02:00
Sébastien Loriot de61f7c933 fix color display bug of the selection 2015-08-06 19:14:40 +02:00
Sébastien Loriot dd55213c85 make sure the selection item is selected when modifying the selection 2015-08-06 19:12:33 +02:00
Laurent Rineau f5eec04da9 Trivial fix for g++-5.1 C++11 2015-08-06 17:43:38 +02:00
Laurent Rineau 548ae00633 Compose CGAL-4.7-beta1 2015-08-06 17:43:26 +02:00
Laurent Rineau 86796b9f46 Merge pull request #256 from bo0ts/Kernel-fix_issue_129-pmoeller
Stop-gap solution for issue #129
2015-08-06 17:42:41 +02:00
Sébastien Loriot 88c2ce6b69 force the display of newly created items 2015-08-06 16:59:52 +02:00
Sébastien Loriot 1a21950c37 make a selection item newly created automatically selected 2015-08-06 16:59:15 +02:00
Sébastien Loriot 001cabc022 when creating a new sdf/segmentation item, keep the polyhedron selected 2015-08-06 16:53:56 +02:00
Sébastien Loriot 63dca733dc Scene::setSelectedItem is now connected to MainWindow::selectSceneItem 2015-08-06 16:49:25 +02:00
Sébastien Loriot 5de888d9dc Revert "move update of the status outside of the constructor"
This reverts commit 6378a51191.

The commit was incorrect and was introducing a huge performance issue
2015-08-06 15:27:55 +02:00
Maxime Gimeno e413b0c45a GLSL Version changed
- Shaders specify version 140 (opengl 3.1) instead of 330. This should fix the "GLSL 3.30 is not supported" error.
2015-08-06 15:19:36 +02:00
Maxime Gimeno 970e767bbf GL security enhancement
- Version of the shaders added and depth test enabled at each draw.
2015-08-06 15:05:00 +02:00
Maxime Gimeno 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
Maxime Gimeno 4b9c090363 Polyline points color fix
- The color of the points of the polylines in points renderingMode was not the good one. It is now.
2015-08-06 13:02:52 +02:00
Maxime Gimeno 2bf6835ccb Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-08-06 13:01:38 +02:00
Sébastien Loriot 867bfec715 do not draw polylines larger 2015-08-06 12:43:28 +02:00
Philipp Möller 47cae427d7 Add a description of the issue 2015-08-06 12:35:59 +02:00
Maxime Gimeno 797ff3f65b Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-08-06 12:34:42 +02:00
Laurent Rineau 0bd24e0dd3 Trivial CMake fix for issue #243
Fix #243: "Bug in the export() commands in demo/Polyhedron/CMakeLists.txt"
2015-08-06 12:34:07 +02:00
Sébastien Loriot 4cf774bc27 remove unused variable bis 2015-08-06 12:33:25 +02:00
Sébastien Loriot b6b78427d0 fix error introduced in a previous commit 2015-08-06 12:30:31 +02:00
Maxime Gimeno 4119600ba3 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-08-06 12:28:28 +02:00
Sébastien Loriot 120f5f801d remove debug output 2015-08-06 12:27:53 +02:00
Sébastien Loriot a950c55065 remove unused parameter 2015-08-06 12:26:59 +02:00
Maxime Gimeno 12eb36c01e Clean up 2015-08-06 12:18:15 +02:00
Philipp Möller 5f99e2da4e Make FT typedef public
This way we no longer trigger a hard error in strict C++03.
This is only a stop-gap solution. The actual issue is that the internal
namespace is full with unrelated components and does not fulfill its
purposee as an SFINAE barrier anymore.

Fixes #129
2015-08-06 12:17:17 +02:00
Philipp Möller 27ac9b621a Add test case for issue 129 2015-08-06 12:17:16 +02:00
Maxime Gimeno f90f19a666 Polylines Fix
- fixing the FlatPlusEdges return from the last commit.
2015-08-06 12:12:10 +02:00
Maxime Gimeno 4dd4e516d2 Spheres 4th position removed
- Useless bool to be removed
2015-08-06 11:54:29 +02:00
Maxime Gimeno 251cc372c2 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-08-06 11:35:17 +02:00
Maxime Gimeno 875d1a479e Shortest_path Fix
- Source Points bigger and polylines made a little thicker to make them visible
when they are rendered over an edge.
2015-08-06 11:33:06 +02:00
Sébastien Loriot 296935e1f3 factorize the code to create a sphere 2015-08-06 11:19:26 +02:00
Sébastien Loriot 56976db665 reduce the number of containers used and simplify a bit the code 2015-08-06 10:16:16 +02:00
Sébastien Loriot 1a96343a17 fix control vertex group coloring 2015-08-06 10:16:16 +02:00
Maxime Gimeno ccedb330aa Polylines Spheres fixed
- The FlatPlusEdges mode has been replaced by the Flat mode and the wireframed spheres has been fixed.
2015-08-06 10:10:07 +02:00