songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch'

This commit is contained in:
Sébastien Loriot 2020-04-08 15:56:23 +02:00
parent 80ce2e1b0e 947c838a6c
commit 50c62be925
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Documentation/doc/resources/1.8.14/BaseDoxyfile.in
View File

@ -302,12 +302,6 @@ ALIASES = "sc{1}=<span style=\"font-variant: small-caps;\">\1</sp
"cgalCite{1}=<!-- -->\cite \1" \
"cgalPackageSection{2}=\htmlonly[block] <div style=\"background-color: #EEEDF2;\">\endhtmlonly \section \1 \2 ^^ \htmlonly[block] </div>\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
@ -2188,12 +2182,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
#---------------------------------------------------------------------------
@ -2207,15 +2195,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.

8
Polyhedron/demo/Polyhedron/Scene.cpp
View File

@ -598,6 +598,10 @@ void Scene::renderWireScene(const QList<Scene_interface::Item_id> &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<Scene_interface::Item_id> &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);
}