mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merged with main branch

metadata
Wenzel Jakob 2010-08-30 21:41:35 +02:00
parent 2650e9f5cb a6075d7439
commit 715a854199
7 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/acknowledgements.tex
View File

@ -11,6 +11,7 @@ Mitsuba makes heavy use of the following amazing libraries and tools:
\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 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}

2
src/integrators/path/path.cpp
View File

@ -146,7 +146,7 @@ public:
/* Assuming that BSDF importance sampling is perfect,
the following should equal the maximum albedo
over all spectral samples */
Float approxAlbedo = std::min((Float) 1, bsdfVal.max());
Float approxAlbedo = std::min((Float) 0.9f, bsdfVal.max());
if (rRec.nextSample1D() > approxAlbedo)
break;
else

2
src/integrators/path/volpath.cpp
View File

@ -258,7 +258,7 @@ public:
/* Assuming that BSDF importance sampling is perfect,
the following should equal the maximum albedo
over all spectral samples */
Float approxAlbedo = std::min((Float) 1, bsdfVal.max());
Float approxAlbedo = std::min((Float) 0.9f, bsdfVal.max());
if (rRec.nextSample1D() > approxAlbedo)
break;
else

2
src/integrators/path/volpath_simple.cpp
View File

@ -193,7 +193,7 @@ public:
/* Assuming that BSDF importance sampling is perfect,
the following should equal the maximum albedo
over all spectral samples */
Float approxAlbedo = std::min((Float) 1, bsdfVal.max());
Float approxAlbedo = std::min((Float) 0.9, bsdfVal.max());
if (rRec.nextSample1D() > approxAlbedo)
break;
else

13
src/libcore/logger.cpp
View File

@ -50,8 +50,17 @@ void Logger::log(ELogLevel level, const Class *theClass,
m_appenders[i]->append(level, text);
m_mutex->unlock();
} else {
#ifdef MTS_DEBUG_TRAP
__asm__ ("int $3");
#if defined(__LINUX__)
/* A critical error occurred: trap if we're running in a debugger */
char exePath[PATH_MAX];
pid_t ppid = getppid();
memset(exePath, 0, PATH_MAX);
if (readlink(formatString("/proc/%i/exe", ppid).c_str(), exePath, PATH_MAX) != -1) {
if (!strcmp(exePath, "/usr/bin/gdb")) {
__asm__ ("int $3");
}
}
#endif
throw std::runtime_error(text);
}

2
src/librender/vpl.cpp
View File

@ -54,7 +54,7 @@ size_t generateVPLs(const Scene *scene, size_t offset, size_t count, int maxDept
/* Assuming that BSDF importance sampling is perfect,
the following should equal the maximum albedo
over all spectral samples */
Float approxAlbedo = std::min((Float) 1, bsdfVal.max());
Float approxAlbedo = std::min((Float) 0.9f, bsdfVal.max());
if (sampler->next1D() > approxAlbedo)
break;
else

1
src/qtgui/acknowledgmentdlg.ui
View File

@ -60,6 +60,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;">The <a href="http://www.boost.org/"><span style=" text-decoration: underline; color:#0000ff;">Boost</span></a> C++ class library</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://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://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>