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

1942 Commits

Author SHA1 Message Date
Laurent Rineau 508b467203 Merge branch 'CGAL-Qt5_support-GF' 2015-08-05 11:23:40 +02:00
Sébastien Loriot 5db1450981 avoid segfault when several items are erased at the same time 2015-08-04 18:48:43 +02:00
Maxime Gimeno 69fd6e1266 Picking Fix 
- With the new drawing system, the frustum was not modified by gluPickMatrix anymore. This commit make the shader use this matrix.
 2015-08-04 12:22:15 +02:00
Laurent Rineau 55c30d0808 Qt::AA_UseDesktopOpenGL is usable from Qt-5.3 only 2015-08-04 10:55:26 +02:00
Sébastien Loriot 6de3260215 force the display of the intersecting faces 2015-08-03 16:42:38 +02:00
Sébastien Loriot 90a5e0e56e do trigger the redraw 2015-08-03 16:39:40 +02:00
Sébastien Loriot 59b06b3101 Merge branch 'CGAL-Qt5_support-GF' 
Fix the corefinement plugins and remove warnings
 2015-08-01 16:05:23 +02:00
Sébastien Loriot 7f2b86d360 fix the fix bb39544d for the stitching plugin 
the definition of a border vertex was reversed
 2015-07-31 16:56:33 +02:00
Laurent Rineau 6ce9023f73 Merge pull request #223 from lrineau/Polyhedron_demo-Point_set_selection-GF 
Polyhedron demo, add a demo point set selection plugin
 2015-07-31 14:51:59 +02:00
Maxime Gimeno 086ffc763e Display fixed 
- One normal per vertex and not one per facet
 2015-07-31 14:30:49 +02:00
Laurent Rineau 56cecfaec2 Merge branch 'CGAL-Qt5_support-GF' 2015-07-31 14:30:18 +02:00
Maxime Gimeno 0077565843 Upgrading Scene_combinatorial_map_item to Programmable_Pipeline 2015-07-31 14:14:39 +02:00
Laurent Rineau cf64acbd15 Remove the include of <QOpenGLFunctions_3_3_Core> 
Now, only the Viewer class uses <QOpenGLFunctions_3_3_Core>.
 2015-07-31 14:06:35 +02:00
Sébastien Loriot 07a81b4429 remove no longer used opengl code for drawing nef 2015-07-31 12:06:59 +02:00
Sébastien Loriot 0319548f96 Merge remote-tracking branch 'cgal-dev/Shape_detection-cleanup-GF' 
Improve the Point set shape detection plugin for the polyhedron demo
  Tested in CGAL-4.7-Ic-101
 2015-07-30 17:47:17 +02:00
Sébastien Loriot 6546fa02dc Merge branch CGAL-Qt5-GF 
Improve the Qt5 support in CGAL demos

  Tested in CGAL-4.7-Ic-101
  Approved by the release manager

Conflicts:
	AABB_tree/demo/AABB_tree/Scene.cpp
 2015-07-30 17:39:50 +02:00
Andreas Fabri 152b083f8a no typename in non-template functions 2015-07-30 14:42:14 +02:00
Simon Giraudot 7c87bf9457 Fixed outdated files problem 2015-07-30 14:21:56 +02:00
Simon Giraudot ca0325fb6e Fixed visualization bug 2015-07-30 13:57:12 +02:00
Maxime Gimeno 2664804224 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-30 12:26:49 +02:00
Maxime Gimeno 33e35f5d44 SEGFAULT Fix 
- when deleting a Scene_edit_polyhedron_item WHILE manipulating a frame, a segfault
occured because a bad manipulated frame was sent to the viewer. Calling setVisible(false)
 in the destructor of the item calls setManipulatedFrame(NULL) and fixex the problem.
 2015-07-30 12:24:10 +02:00
Simon Giraudot 204d3ec2af * Right clic to cancel selection 
* Stop spinning when selection starts
 2015-07-30 12:01:44 +02:00
Simon Giraudot 3db148e73d Free form selection and visualization working (still some bugs) 2015-07-30 10:42:33 +02:00
Simon Giraudot f68d3f8dee Rectangle selection working 
(Visualization of selection-rectangle not working)
 2015-07-29 15:37:46 +02:00
Laurent Rineau 7f84d345a9 Enable the three last plugins 
Q_PLUGIN_METADATA was missing.

See
http://doc.qt.io/qt-5/plugins-howto.html#the-low-level-api-extending-qt-applications

Fix #209
 2015-07-29 14:25:22 +02:00
Laurent Rineau 1d2657b069 Revert "Segfault fix", and change the API of Scene_item and Viewer_interface 
This reverts commit 28b8c3bf6b.

I have removed the qFunc member from `Scene_item`. Now, the only
`QOpenGLFunctions_3_3_Core` object is the base class of the
`Viewer` (accessible through the interface `Viewer_interface`).

All calls to OpenGL functions are now done using the `viewer` pointer.
 2015-07-29 13:02:58 +02:00
Laurent Rineau 64410e1e8b Remove the spurious #include of moc files 
Fix #194 : Qt5 moc reports a lot of notes "No relevant classes found"
 2015-07-29 12:15:22 +02:00
Simon Giraudot 02a4678159 Point set selection widget and global selection tools (all, clear, revert, new objet, etc.) 2015-07-29 10:35:11 +02:00
Andreas Fabri 52de475f55 encode the cylinder radius in the item name 2015-07-28 23:04:24 +02:00
Andreas Fabri e5bf00b9d8 Add a filter for cylinders with too big radius 2015-07-28 17:27:18 +02:00
Sebastien Loriot b30ac099a9 Merge pull request #195 from afabri/Polyhedron_demo-fix_stitching_plugin-GF 
fix compilation for VC++
 2015-07-28 17:17:00 +02:00
Andreas Fabri 05d201ea61 Add checkboxes for the shapes 2015-07-28 16:56:20 +02:00
Laurent Rineau 0a9eaa3808 Simplify the CMakeLists.txt 
I remove the very old hack I have used, very long ago, before the
branch-build was designed.

I also remove from include_directories():

    ../../../Advancing_front_surface_reconstruction/include
 2015-07-28 15:56:57 +02:00
Laurent Rineau 8be7c27063 Merge remote-tracking branch 'cgal-public-dev/CGAL-Qt5_support-GF' into CGAL-Qt5_support-GF 
...aka refresh the branch from 'master'.

Conflicts:
	AABB_tree/demo/AABB_tree/Scene.cpp
	Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.cpp
 2015-07-28 15:30:17 +02:00
Andreas Fabri bb39544dcd fix compilation for VC++ 2015-07-27 14:35:56 +02:00
Sébastien Loriot f34ac07fa9 draw the bbox of control vertices when deforming 2015-07-27 14:29:45 +02:00
Maxime Gimeno 9b2f8ebad4 Cutting plane fix 
- Added a timer event to specify when cut() must be called or not, which makes
the plane manipulation far smoother.
 2015-07-24 10:55:12 +02:00
Sébastien Loriot 0343f70578 fix detection of borders plugin 
if the vertices are not filtered they'll show up as isolated polylines
  Trivial bug fix in a demo for master
 2015-07-21 17:40:23 +02:00
Maxime Gimeno 28b8c3bf6b Segfault fix 
- calling delete on a Q_OBJECT is not recommanded. In the Scene's destructor, delete was called
for every Scene_item, which made the destructor of the ShaderPrograms QMap fail. I replaced
delete by deleteLater(), which seems to have corrected the problem.
 2015-07-20 14:10:35 +02:00
Sebastien Loriot acd57e5779 Merge pull request #185 from sloriot/Polygon_mesh_processing-GF 
Fix warnings in Polygon_mesh_processing
 2015-07-20 13:17:22 +02:00
Maxime Gimeno 5ab90bbf7a Performance fix 
- Stop setting the color of each edge to black, which could be quite long for a big item,
and set the attribute value of the shader to black instead.
 2015-07-20 11:52:43 +02:00
Sébastien Loriot 22aff712b1 do not connect the modif signal of the manipulated frame to deform to boost perf 2015-07-20 11:44:59 +02:00
Sébastien Loriot cfe6f59802 add a method to invalidate the aabb-tree in the polyhedron item 2015-07-20 11:43:24 +02:00
Laurent Rineau 08666dce25 Merge pull request #179 from afabri/CGAL-add_hash-GF 
Add boost::hash and std::hash

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/hash

Conflicts:
	Installation/changes.html
 2015-07-17 15:39:18 +02:00
Sébastien Loriot 5d2c892dbe Merge pull request #149 'lrineau/Polygon_mesh_processing-GF' 
Add various functions to manipulate polygon meshes
 2015-07-17 14:50:56 +02:00
Sébastien Loriot 0140746292 remove non-needed typedef 2015-07-17 14:43:07 +02:00
Sébastien Loriot 1e743cf0ae remove extra ; 2015-07-17 14:42:04 +02:00
Sébastien Loriot 2668d83d4e Merge pull request #150 from 'cjamin/Point_set_shape_detection_3-cjamin' 
Add an algorithm to fit geometric primitives on a point set

Conflicts:
	Installation/changes.html
	Polyhedron/demo/Polyhedron/CMakeLists.txt
 2015-07-17 14:32:09 +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
Laurent Rineau aa72eaa371 Merge pull request #154 from maxGimeno/CGAL-Qt5_support-GF 
Qt5 support, GSoC 2014

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Qt5_support

In this commit, I have fixed the permissions of the file:
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/points

In this commit, I have also modified:
	Installation/changes.html
 2015-07-17 14:13:37 +02:00