songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
64,306 Commits 3 Branches 156 Tags 964 MiB
Commit Graph

64306 Commits

Author SHA1 Message Date
Laurent Rineau 9e9126ef73 Merge branch 'releases/CGAL-4.6-branch' 
That is a null-merge, to register that 'master' contains
'releases/CGAL-4.6-branch'.

Done with:

    git merge -s ours releases/CGAL-4.6-branch
 2015-08-19 17:49:47 +02:00
Laurent Rineau 91bca286d3 Fix warnings with CGAL_USE 
All those variables were unused only if CGAL_NDEBUG was
defined. CGAL_USE can solve that.
 2015-08-19 17:37:46 +02:00
Laurent Rineau 4463e53d0a Revert "add a dependency on the Qt5::QSQLiteDriverPlugin" 
This reverts commit 156b267d85.

Conflicts:
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt

The reason is that our demo does not depend on QtSql or any QtSql
plugin. For details, see:

   https://github.com/CGAL/cgal/issues/254#issuecomment-132605984
 2015-08-19 15:57:35 +02:00
Simon Giraudot 05e0965655 Fix warnings of possible loss of data converting std::size_t to unsigned int 2015-08-19 15:22:17 +02:00
Laurent Rineau 8c9b4975bc Fix a typedef 2015-08-18 18:46:51 +02:00
Laurent Rineau c9f16f8984 Define the OpenGL functions typedefs 
- PFNGLDRAWARRAYSINSTANCEDARBPROC
   - PFNGLVERTEXATTRIBDIVISORARBPROC

Definitions found in glext.h from Mesa.
 2015-08-18 18:46:02 +02:00
Laurent Rineau eed890672b Merge branch 'CGAL-Qt5_support-GF' into CGAL_Qt5_Support_for_Mesa-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp
	Polyhedron/demo/Polyhedron/resources/shader_without_light.v
 2015-08-18 18:45:38 +02:00
Laurent Rineau 9dc8e079ad QOpenGLShaderProgram::create was introduced in Qt-5.3 
With Qt-5.2:

    error: 'class QOpenGLShaderProgram' has no member named 'create'

Anyway, that call is useless.
 2015-08-18 18:19:54 +02:00
Laurent Rineau 5d99700c3d Merge pull request #277 from janetournois/Polygon_mesh_processing-GF 
Polygon mesh processing - Eigen 3.2 needed for fairing
 2015-08-18 18:07:23 +02:00
Laurent Rineau c957fdfe44 Merge pull request #278 from MoniqueTeillaud/patch-1 
Update changes.html
 2015-08-18 14:23:17 +02:00
Monique Teillaud 48a728791e Update changes.html 
move misplaced entry for 4.5 (mesh3 -> triangulation3)
 2015-08-17 18:16:10 +02:00
Jane Tournois 7b93b844f2 integrate the complete test inside the static assert 
to avoid inconsistencies between different compilers
 2015-08-17 16:49:01 +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
Laurent Rineau 47e8da32cf Merge pull request #276 from mpkh/missing-includes 
Add missing std headers
 2015-08-17 12:31:50 +02:00
Jane Tournois 1f91bd8a77 avoid compilation of tests and examples that use fairing when Eigen < 3.2 2015-08-17 12:23:09 +02:00
Jane Tournois aef04b7dce make compilation more explicit when Eigen < 3.2 is used 2015-08-17 12:08:50 +02:00
mpkh f130b2183a Add missing std headers 2015-08-17 12:26:34 +04:00
Maxime Gimeno a3addbfd9b Fix 
- Polyhedron : spaces in a shader made it invalid
- Circular Kernel : green intersection spheres are back : wrong attribute in the draw function
- Alpha Shapes : "in" remained in the shaders.
 2015-08-14 13:56:43 +02:00
Simon Giraudot fbf99e3a35 Fix testsuite error on Picasso: filename too long 2015-08-14 10:49:23 +02:00
Sébastien Loriot f6e86631a7 prevent from closing and reopening the stream 2015-08-13 16:21:18 +02:00
Simon Giraudot e75dd99047 update of cgal_test_with_cmake with new plugins 2015-08-13 15:02:06 +02:00
Maxime Gimeno 95f87a3ac5 Depth test problem fix 
- Calling glEnable(GL_DEPTH_TEST) in the beginning of every draw should solve this problem.
 2015-08-13 14:08:12 +02:00
Maxime Gimeno ee2b0b2011 Transparent facets fix 
- set the alpha value to 1 in the shaders to insure opaque color.
 2015-08-13 11:56:04 +02:00
Sébastien Loriot 7216473436 add a warning in case of isolated vertices in an OFF loaded in a polyhedron 2015-08-13 10:00:11 +02:00
Maxime Gimeno 52a35d4d8d Random displaying fix 
- The bounding box was set before being initialized.
 2015-08-13 08:55:10 +02:00
Sébastien Loriot 6b8d5ebce5 change the bound for the filtering 2015-08-12 11:04:17 +02:00
Simon Giraudot 7fd7005641 Upsampling plugin for Polyhedron demo 2015-08-11 17:25:57 +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
Simon Giraudot 9bed4d0453 Fix UI name mistake 2015-08-11 17:13:59 +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
Simon Giraudot afc6d4b2bf Integration of bilateral smoothing plugin for Polyhedron demo 2015-08-11 16:09:57 +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
Simon Giraudot 9cc40133ec Fix shader error (removed spaces before #version) 2015-08-11 15:18:40 +02:00
Simon Giraudot a05f4b8ad1 Merge branch 'Polyhedron_demo-WLOP_plugin-sgiraudot-old' into Polyhedron_demo-WLOP_plugin-sgiraudot 2015-08-11 14:48:13 +02:00
Simon Giraudot b4de19ab2c Active concurrency in CMakeList 2015-08-11 14:39:55 +02:00
Maxime Gimeno 9257bf2c03 DrawText fix 
- Must disable the polygon offset after drawing so that it does not disturb the postdraw function.
 2015-08-11 14:19:01 +02:00
Maxime Gimeno e3c53da311 No holes fix 
- If the visualizer was created with an item without a hole, the QMap was not
   updated when the visualizer was destroyed.
 2015-08-11 12:20:27 +02:00
Maxime Gimeno 3fe5538855 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-08-11 12:11:55 +02:00
Maxime Gimeno 3291077b16 hole_filling fix 
- The QMap wasn't updated when the visualizer is deleted.
 2015-08-11 12:11:16 +02:00
Maxime Gimeno 4256bcc2a8 hole_filling fox 
- The QMap wasn't updated when the visualizer is deleted.
 2015-08-11 12:01:31 +02:00
Maxime Gimeno b4d7511346 get_hole_visualizer() fix 
- Use a QMap instead of a linear search
 2015-08-11 11:27:09 +02:00
Maxime Gimeno 140f7c26ed Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-08-11 08:58:56 +02:00
Maxime Gimeno 52eefe1a55 ShortestPath not seen fix 
- Change of DepthFunc to be in mode less or equal, so that if two lines
  overlap, only the last drawn will be displayed. As the shortest path is
  always drawn after the item, it is the one displayed and not the edge
  on wich it is.
 2015-08-11 08:54:11 +02:00
Sébastien Loriot bd1b89cdf4 Fix a loop preventing the selection of several items 
MainWindow::selectionChanged() was calling Scene::setSelectedItem that
was connected to MainWindow::selectionChanged(). We introduce a new
function that does not trigger the call to selectionChanged

Bug fix of
  |--
  |commit 63dca733dc
  |Author: Sébastien Loriot <sebastien.loriot@cgal.org>
  |Date:   Thu Aug 6 16:49:25 2015 +0200
  |
  |    Scene::setSelectedItem is now connected to MainWindow::selectSceneItem
  |--
 2015-08-11 08:15:46 +02:00
Sébastien Loriot 0f83711bab each time an item is removed, the skeletonization functor will be deleted 
it might look rather extreme but indices of items are internally used
so it's the safest way
 2015-08-11 07:52:26 +02:00
Maxime Gimeno 03eee8987e Mesa Fix : 
- context set to 2.1
- shaders versions set to 120
- fetch and set the ARB extensions for instanced Rendering
- displays points instead of spheres if the extensions cannot be found
 2015-08-10 16:12:47 +02:00
Maxime Gimeno 43e675903a Antialiasing fix 
- The polylines were drawn in draw() instead of draw_edges(), which messed up
  the blending, as it should be done with the color of the facets but in
  draw they are not displayed yet.
 2015-08-10 15:03:51 +02:00
Maxime Gimeno db28896b15 Mesa Fix : 
- context set to 2.1
- shaders versions set to 120
- fetch and set the ARB extensions for instanced Rendering
- displays points instead of spheres if the extensions cannot be found
- anti-aliasing problem with polyline fixed : calling lines durind draw instead of
  draw_edges messes the blending. The blending of the lines must be done with the facets
  colors and thus the lines must be drawn AFTER the facets.
 2015-08-10 14:48:42 +02:00
Maxime Gimeno 88e41a6bf7 Mesa Fix : 
- context set to 2.1
- shaders versions set to 120
 2015-08-10 11:17:24 +02:00