From add374feb8a13ca9d0515cdce0d9a0dd3a6040c2 Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Thu, 14 Jul 2011 10:47:10 +0200 Subject: [PATCH] added acknowledgments for the IOR data and the cubature library --- doc/acknowledgements.tex | 8 ++++++++ src/qtgui/acknowledgmentdlg.ui | 2 ++ 2 files changed, 10 insertions(+) diff --git a/doc/acknowledgements.tex b/doc/acknowledgements.tex index 3da069cd..0d6e580e 100644 --- a/doc/acknowledgements.tex +++ b/doc/acknowledgements.tex @@ -6,6 +6,13 @@ Some of the GUI icons were taken from the Humanity icon set by Canonical Ltd. The material test scene was kindly contributed by Jonas Pilo, and the environment map it uses is courtesy of Bernhard Vogl. +The included index of refraction data files for conductors are copied from +PBRT. They are originally from the Luxpop database (\url{www.luxpop.com}) +and are based on data by Palik et al. \cite{Palik1998Handbook} +and measurements of atomic scattering factors made by the Center For +X-Ray Optics (CXRO) at Berkeley and the Lawrence Livermore National +Laboratory (LLNL). + Mitsuba makes heavy use of the following amazing libraries and tools: \begin{itemize} \item Qt 4 by Nokia @@ -15,6 +22,7 @@ Mitsuba makes heavy use of the following amazing libraries and tools: \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 Cubature by Steven G. Johnson \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/acknowledgmentdlg.ui b/src/qtgui/acknowledgmentdlg.ui index f9754f75..0043baf0 100644 --- a/src/qtgui/acknowledgmentdlg.ui +++ b/src/qtgui/acknowledgmentdlg.ui @@ -54,6 +54,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Many thanks go to my advisor <a href="http://www.cs.cornell.edu/~srm/"><span style=" text-decoration: underline; color:#0000ff;">Steve Marschner</span></a>, who let me spend time on this project.</p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Some of the icons were taken from the <a href="https://launchpad.net/humanity"><span style=" text-decoration: underline; color:#0000ff;">Humanity</span></a> icon set by Canonical Ltd.</p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The material test scene was kindly contributed by Jonas Pilo, and the environment map it uses is courtesy of Bernhard Vogl.</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The included index of refraction data files for conductors are copied from PBRT. They are originally from the Luxpop database (<a href="www.luxpop.com">www.luxpop.com</a>) and are based on data by Palik et al. and measurements of atomic scattering factors made by the Center For X-Ray Optics (CXRO) at Berkeley and the Lawrence Livermore National Laboratory (LLNL).</p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Mitsuba makes heavy use of the following amazing libraries and tools: </p> <ul style="-qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://qt.nokia.com/products"><span style=" text-decoration: underline; color:#0000ff;">Qt 4</span></a> by Nokia</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.openexr.com/"><span style=" text-decoration: underline; color:#0000ff;">OpenEXR</span></a> by Industrial Light &amp; Magic</li> @@ -63,6 +64,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://ab-initio.mit.edu/wiki/index.php/Cubature"><span style=" text-decoration: underline; color:#0000ff;">Cubature</span></a> by Steven G. Johnson</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://people.cs.kuleuven.be/~ares.lagae/libply/"><span style=" text-decoration: underline; color:#0000ff;">libply</span></a> by Ares Lagae</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>