fixed typos and writing issues reported by William Newman

metadata
Wenzel Jakob 2014-01-28 20:52:01 +01:00
parent c0ec0ea854
commit 634dda3272
10 changed files with 22 additions and 21 deletions

View File

@ -43,7 +43,7 @@ The following ``algorithm'' may help to decide amongst the remaining ones:
\begin{enumerate} \begin{enumerate}
\item Try rendering the scene with an appropriate path tracer. If this gives the desired result, stop. \item Try rendering the scene with an appropriate path tracer. If this gives the desired result, stop.
Mitsuba currently comes with three path tracer variations that target different setups: It your Mitsuba currently comes with three path tracer variations that target different setups: If your
scene contains no media and no surfaces with opacity masks, use the plain path tracer (\pluginref{path}). scene contains no media and no surfaces with opacity masks, use the plain path tracer (\pluginref{path}).
Otherwise, use one of the volumetric path tracers (\pluginref[volpathsimple]{volpath\_simple} Otherwise, use one of the volumetric path tracers (\pluginref[volpathsimple]{volpath\_simple}

View File

@ -220,10 +220,10 @@ int mts_main(int argc, char **argv) {
XMLString::transcode(toCatch.getMessage()) << endl; XMLString::transcode(toCatch.getMessage()) << endl;
retval = -1; retval = -1;
} catch (const std::exception &e) { } catch (const std::exception &e) {
std::cerr << "Caught a critical exeption: " << e.what() << endl; std::cerr << "Caught a critical exception: " << e.what() << endl;
retval = -1; retval = -1;
} catch (...) { } catch (...) {
std::cerr << "Caught a critical exeption of unknown type!" << endl; std::cerr << "Caught a critical exception of unknown type!" << endl;
retval = -1; retval = -1;
} }

View File

@ -48,7 +48,7 @@ MTS_NAMESPACE_BEGIN
* } * }
* } * }
* *
* This sensor plugin implements a simple point light source, which * This emitter plugin implements a simple point light source, which
* uniformly radiates illumination into all directions. * uniformly radiates illumination into all directions.
*/ */

View File

@ -56,7 +56,7 @@ static StatsCounter avgPathLength("Volumetric path tracer", "Average path length
* *
* This integrator has special support for \emph{index-matched} transmission * This integrator has special support for \emph{index-matched} transmission
* events (i.e. surface scattering events that do not change the direction * events (i.e. surface scattering events that do not change the direction
* of light). As a consequence, particating media enclosed by a stencil shape (see * of light). As a consequence, participating media enclosed by a stencil shape (see
* \secref{shapes} for details) are rendered considerably more efficiently when this * \secref{shapes} for details) are rendered considerably more efficiently when this
* shape has \emph{no}\footnote{this is what signals to Mitsuba that the boundary is * shape has \emph{no}\footnote{this is what signals to Mitsuba that the boundary is
* index-matched and does not interact with light in any way. Alternatively, * index-matched and does not interact with light in any way. Alternatively,

View File

@ -58,7 +58,7 @@ static StatsCounter avgPathLength("Volumetric path tracer", "Average path length
* *
* This integrator has special support for \emph{index-matched} transmission * This integrator has special support for \emph{index-matched} transmission
* events (i.e. surface scattering events that do not change the direction * events (i.e. surface scattering events that do not change the direction
* of light). As a consequence, particating media enclosed by a stencil shape (see * of light). As a consequence, participating media enclosed by a stencil shape (see
* \secref{shapes} for details) are rendered considerably more efficiently when this * \secref{shapes} for details) are rendered considerably more efficiently when this
* shape has \emph{no}\footnote{this is what signals to Mitsuba that the boundary is * shape has \emph{no}\footnote{this is what signals to Mitsuba that the boundary is
* index-matched and does not interact with light in any way. Alternatively, * index-matched and does not interact with light in any way. Alternatively,

View File

@ -55,8 +55,8 @@ MTS_NAMESPACE_BEGIN
* *
* This class implements a flexible homogeneous participating * This class implements a flexible homogeneous participating
* medium with support for arbitrary phase functions and various * medium with support for arbitrary phase functions and various
* medium sampling methods. It provides several ways of configuring * medium sampling methods. It provides two different ways of configuring
* the medium properties. Either, a material preset can be loaded * the medium properties. One possibility is to load a material preset
* using the \code{material} parameter---see \tblref{medium-coefficients} * using the \code{material} parameter---see \tblref{medium-coefficients}
* for details. Alternatively, when specifying parameters by hand, they can either * for details. Alternatively, when specifying parameters by hand, they can either
* be provided using the scattering and absorption coefficients, or * be provided using the scattering and absorption coefficients, or

View File

@ -388,10 +388,10 @@ int mitsuba_app(int argc, char **argv) {
Statistics::getInstance()->printStats(); Statistics::getInstance()->printStats();
} catch (const std::exception &e) { } catch (const std::exception &e) {
std::cerr << "Caught a critical exeption: " << e.what() << endl; std::cerr << "Caught a critical exception: " << e.what() << endl;
return -1; return -1;
} catch (...) { } catch (...) {
std::cerr << "Caught a critical exeption of unknown type!" << endl; std::cerr << "Caught a critical exception of unknown type!" << endl;
return -1; return -1;
} }

View File

@ -376,9 +376,9 @@ int mtssrv(int argc, char **argv) {
close(sock); close(sock);
#endif #endif
} catch (const std::exception &e) { } catch (const std::exception &e) {
std::cerr << "Caught a critical exeption: " << e.what() << endl; std::cerr << "Caught a critical exception: " << e.what() << endl;
} catch (...) { } catch (...) {
std::cerr << "Caught a critical exeption of unknown type!" << endl; std::cerr << "Caught a critical exception of unknown type!" << endl;
} }
/* Shutdown */ /* Shutdown */

View File

@ -375,9 +375,9 @@ int mtsutil(int argc, char **argv) {
return retval; return retval;
} }
} catch (const std::exception &e) { } catch (const std::exception &e) {
std::cerr << "Caught a critical exeption: " << e.what() << endl; std::cerr << "Caught a critical exception: " << e.what() << endl;
} catch (...) { } catch (...) {
std::cerr << "Caught a critical exeption of unknown type!" << endl; std::cerr << "Caught a critical exception of unknown type!" << endl;
} }
return 0; return 0;

View File

@ -178,13 +178,14 @@ static int irrOctreeIndex = 0;
* rendering, these illumination samples are convolved with the diffusion profile * rendering, these illumination samples are convolved with the diffusion profile
* using a fast hierarchical technique proposed by Jensen and Buhler \cite{Jensen2005Rapid}. * using a fast hierarchical technique proposed by Jensen and Buhler \cite{Jensen2005Rapid}.
* *
* There are several different ways of configuring the medium properties. * There are two different ways of configuring the medium properties.
* Either, a material preset can be loaded using the \code{material} * the medium properties. One possibility is to load a material preset
* parameter---see \tblref{medium-coefficients} for details. Alternatively, * using the \code{material} parameter---see \tblref{medium-coefficients}
* when specifying parameters by hand, they can either be provided using * for details. Alternatively, when specifying parameters by hand, they
* the scattering and absorption coefficients, or by declaring the extinction * can either be provided using the scattering and absorption coefficients,
* coefficient and single scattering albedo (whichever is more convenient). * or by declaring the extinction coefficient and single scattering albedo
* Mixing these parameter initialization methods is not allowed. * (whichever is more convenient). Mixing these parameter initialization
* methods is not allowed.
* *
* All scattering parameters (named \code{sigma*}) should * All scattering parameters (named \code{sigma*}) should
* be provided in inverse scene units. For instance, when a world-space * be provided in inverse scene units. For instance, when a world-space