From 75f0b18224b3a42ef0c515d841fc00a772b88ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 7 Apr 2020 14:31:36 +0200 Subject: [PATCH 1/2] remove deprecated config options --- .../doc/resources/1.8.14/BaseDoxyfile.in | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/Documentation/doc/resources/1.8.14/BaseDoxyfile.in b/Documentation/doc/resources/1.8.14/BaseDoxyfile.in index 872b616f346..4f97a0477d8 100644 --- a/Documentation/doc/resources/1.8.14/BaseDoxyfile.in +++ b/Documentation/doc/resources/1.8.14/BaseDoxyfile.in @@ -299,12 +299,6 @@ ALIASES = "sc{1}=\1\cite \1" \ "cgalPackageSection{2}=\htmlonly[block]
\endhtmlonly \section \1 \2 ^^ \htmlonly[block]
\endhtmlonly" -# This tag can be used to specify a number of word-keyword mappings (TCL only). -# A mapping has the form "name=value". For example adding "class=itcl::class" -# will allow you to use the command class in the itcl::class meaning. - -TCL_SUBST = - # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources # only. Doxygen will then generate output that is more tailored for C. For # instance, some of the names that are used will be different. The list of all @@ -2185,12 +2179,6 @@ EXTERNAL_GROUPS = NO EXTERNAL_PAGES = NO -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of 'which perl'). -# The default file (with absolute path) is: /usr/bin/perl. - -PERL_PATH = /usr/bin/perl - #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- @@ -2204,15 +2192,6 @@ PERL_PATH = /usr/bin/perl CLASS_DIAGRAMS = NO -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see: -# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the -# default search path. - -MSCGEN_PATH = - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. From a60b15c90e3fbd508b832969269c0b44ffe6fb6e Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Mon, 6 Apr 2020 13:45:56 +0200 Subject: [PATCH 2/2] Fix picking with wireframe and points --- Polyhedron/demo/Polyhedron/Scene.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Polyhedron/demo/Polyhedron/Scene.cpp b/Polyhedron/demo/Polyhedron/Scene.cpp index a1d107a15de..bf2041c8593 100644 --- a/Polyhedron/demo/Polyhedron/Scene.cpp +++ b/Polyhedron/demo/Polyhedron/Scene.cpp @@ -598,6 +598,10 @@ void Scene::renderWireScene(const QList &items, || item.renderingMode() == PointsPlusNormals || item.renderingMode() == GouraudPlusEdges) { + if(with_names) { + viewer->glClearDepthf(1.0); + viewer->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + } viewer->setGlPointSize(2.f); item.drawEdges(viewer); } @@ -656,6 +660,10 @@ void Scene::renderPointScene(const QList &items, (item.renderingMode() == PointsPlusNormals) || (item.renderingMode() == ShadedPoints)) { + if(with_names) { + viewer->glClearDepthf(1.0); + viewer->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + } viewer->setGlPointSize(3.0f); item.drawPoints(viewer); }