From d9d4a005229c42bb22934691ddc1b7fce62429e1 Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Mon, 13 Sep 2010 16:44:12 +0200 Subject: [PATCH] updated acknowledgements, show whether collada is compiled into the binary --- doc/acknowledgements.tex | 5 +++-- src/qtgui/aboutdlg.cpp | 4 ++++ src/qtgui/acknowledgmentdlg.ui | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/acknowledgements.tex b/doc/acknowledgements.tex index c887c374..bfbb9080 100644 --- a/doc/acknowledgements.tex +++ b/doc/acknowledgements.tex @@ -8,10 +8,11 @@ Mitsuba makes heavy use of the following amazing libraries and tools: \begin{itemize} \item Qt 4 by Nokia \item OpenEXR by Industrial Light \& Magic -\item Xerces-C++ by the Apache Foundation -\item The Boost C++ class library +\item Xerces-C+\!+ by the Apache Foundation +\item The Boost C+\!+ class library \item GLEW by Milan Ikits, Marcelo E. Magallon and Lev Povalahev \item Mersenne Twister by Makoto Matsumoto and Takuji Nishimura +\item ccvt (Capacity-Constrained Voronoi Tessellations) by Michael Balzer, Thomas Schlömer and Oliver Deussen \item COLLADA DOM by Sony Computer Entertainment \item libjpeg by the Independent JPEG Group \item libpng by Guy Eric Schalnat, Andreas Dilger, Glenn Randers-Pehrson and \mbox{others} diff --git a/src/qtgui/aboutdlg.cpp b/src/qtgui/aboutdlg.cpp index b8f7ea66..c3a82acd 100644 --- a/src/qtgui/aboutdlg.cpp +++ b/src/qtgui/aboutdlg.cpp @@ -50,6 +50,10 @@ AboutDialog::AboutDialog(QWidget *parent) : configFlags += "MTS_HAS_COHERENT_RT "; #endif +#if defined(MTS_HAS_COLLADA) + configFlags += "MTS_HAS_COLLADA "; +#endif + ui->label1->setText(ui->label1->text().replace("MTS_VERSION", MTS_VERSION)); ui->label1->setText(ui->label1->text().replace("CONFIG_FLAGS", configFlags)); #if defined(__OSX__) diff --git a/src/qtgui/acknowledgmentdlg.ui b/src/qtgui/acknowledgmentdlg.ui index ed95e6bd..e68f39b3 100644 --- a/src/qtgui/acknowledgmentdlg.ui +++ b/src/qtgui/acknowledgmentdlg.ui @@ -61,6 +61,7 @@ p, li { white-space: pre-wrap; } <li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://glew.sourceforge.net/"><span style=" text-decoration: underline; color:#0000ff;">GLEW</span></a> by Milan Ikits, Marcelo E. Magallon and Lev Povalahev</li> <li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://sourceforge.net/projects/collada-dom/"><span style=" text-decoration: underline; color:#0000ff;">COLLADA DOM</span></a> by Sony Computer Entertainment</li> <li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html"><span style=" text-decoration: underline; color:#0000ff;">Mersenne Twister</span></a> by Makoto Matsumoto and Takuji Nishimura</li> +<li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://code.google.com/p/ccvt/"><span style=" text-decoration: underline; color:#0000ff;">ccvt (Capacity-Constrained Voronoi Tessellations)</span></a> by Michael Balzer, Thomas Schlömer and Oliver Deussen</li> <li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.ijg.org/"><span style=" text-decoration: underline; color:#0000ff;">libjpeg</span></a> by the Independent JPEG Group</li> <li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.libpng.org/pub/png"><span style=" text-decoration: underline; color:#0000ff;">libpng</span></a> by Guy Eric Schalnat, Andreas Dilger, Glenn Randers-Pehrson and others</li> <li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.brandonwalkin.com/bwtoolkit/"><span style=" text-decoration: underline; color:#0000ff;">BWToolkit</span></a> by Brandon Walkin</li>