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

1909 Commits

Author SHA1 Message Date
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
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
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
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 07100ade70 Changes in the polyhedron demo due to Polygon_mesh_processing package (PMP) 2015-07-16 17:04:48 +02:00
Sébastien Loriot 6b15ec643c Merge branch 'CGAL-Qt5_support-GF' into cgal-public-dev/Polygon_mesh_processing-GF 
Conflicts:
	Mesh_3/demo/Mesh_3/include/CGAL/gl_render.h
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/GlSplat/GlSplat.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
 2015-07-16 16:52:53 +02:00
Sébastien Loriot a30ad4be3c use PMP internal function 2015-07-16 16:40:54 +02:00
Sébastien Loriot 25d5a69104 use Side_of_triangle_mesh 2015-07-16 16:32:04 +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
Sébastien Loriot 0f4043d383 fix function hidden warning 2015-07-15 16:56:33 +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
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 d693e45f8f Removed the useless objects supposed to be used with splatting. 2015-07-15 10:04:14 +02:00
Laurent Rineau fa28b44ea3 Merge pull request #144 from sgiraudot/Polyhedron_demo-Scale_space_plugin_speedup-sgiraudot 
speedup the scale space plugin in the Polyhedron demo
 2015-07-14 16:48:08 +02:00
Laurent Rineau 04db43556f Do not warn when Qt5 is not found. 2015-07-13 15:55:41 +02:00
Sébastien Loriot 7f4bd2837e accomodate changes after branch update 2015-07-13 09:59:12 +02:00
Sébastien Loriot c616df7196 Merge branch 'old/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF 
Conflicts:
	Documentation/biblio/cgal_manual.bib
	Installation/changes.html
 2015-07-13 08:16:59 +02:00
Laurent Rineau 15c1469a54 CGAL requires CMake>=2.8.11. 2015-07-10 17:01:42 +02:00