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 962 MiB
Commit Graph

2024 Commits

Author SHA1 Message Date
Sébastien Loriot 37b9b8e7bf force update of the display 
mimic what is done for load(istream)

Trivial bug fix for demo
 2015-09-07 15:12:21 +02:00
Laurent Rineau 1eab366954 Merge pull request #312 from sloriot/Polyhedron_demo-stl_io_plugin_safer-sloriot 
Polyhedron demo: first check that the STL file is a polygon mesh before loading it

Conflicts:
	Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt
 2015-09-04 11:36:13 +02:00
Laurent Rineau 9bae0c0e63 Merge pull request #270 from sgiraudot/Polyhedron_demo-WLOP_plugin-sgiraudot 
Polyhedron demo point set processing plugins
 2015-09-03 17:22:54 +02:00
Sébastien Loriot 4931c8c889 first check that the stl file is a polygon mesh before loading it 2015-09-03 15:17:14 +02:00
Laurent Rineau cf74c64c46 Merge pull request #307 from CGAL/Polyhedron_demo-fix_reset_color-sloriot 
be more permissive for color reset
 2015-09-03 12:50:16 +02:00
Maxime Gimeno 1533deff99 Textures Fix 
- Use texture2D instead of texture in the shaders to have it in gglsl 1.2 and not 1.3.
 2015-09-02 12:14:37 +02:00
Sebastien Loriot 79685a263f be more permissive for color reset 
This enables the reset to work after a coloration per connected component
 2015-09-01 17:27:04 +02:00
Simon Giraudot ae1f64c9a2 Change ACTIVATE_CONCURRENCY tag in CMakeLists of Polyhedron demo 2015-08-31 10:58:16 +02:00
Simon Giraudot 8f98d9dc0a Fixed indentation issues 2015-08-31 10:09:54 +02:00
Laurent Rineau 1710531e06 Fix the color of edges of Scene_polygon_soup_item 
Fixes #301.
 2015-08-28 17:18:04 +02:00
Laurent Rineau 278a28016a Merge branch 'CGAL-Qt5_support-GF' 
Fixes #265, fixes #254.
 2015-08-27 16:37:37 +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
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
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
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
Simon Giraudot 9bed4d0453 Fix UI name mistake 2015-08-11 17:13:59 +02:00
Simon Giraudot afc6d4b2bf Integration of bilateral smoothing plugin for Polyhedron demo 2015-08-11 16:09:57 +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 3291077b16 hole_filling fix 
- The QMap wasn't updated when the visualizer is deleted.
 2015-08-11 12:11:16 +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 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
Sébastien Loriot 57b8f164f4 change the plane definition to match the detection of parallel planes 2015-08-07 15:56:40 +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
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
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 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
Sébastien Loriot 867bfec715 do not draw polylines larger 2015-08-06 12:43:28 +02:00