Skip to content

Commit

Permalink
Fixes for Mitsuba PDF manual (#28)
Browse files Browse the repository at this point in the history
* Changed bibliography package to biblatex (ACM bibtex is no longer
supported)
* Added the missing bumpy sphere image + the relevant Holzschuch cite
* Fixed a plugin ref in normalmap
* PDF requires two more runs of pdflatex after bibtex
* The missing Stanford bunny image was removed (I couldn't get the
material to work)
  • Loading branch information
amyspark authored and wjakob committed Oct 7, 2017
1 parent a1d574e commit 9110048
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 19 deletions.
4 changes: 2 additions & 2 deletions doc/gendoc.py
Expand Up @@ -78,8 +78,8 @@ def texify(texfile):
else:
check_call(['pdflatex', texfile])
check_call(['bibtex', texfile.replace('.tex', '.aux')])
#check_call(['pdflatex', texfile])
#check_call(['pdflatex', texfile])
check_call(['pdflatex', texfile])
check_call(['pdflatex', texfile])

os.chdir(os.path.dirname(os.path.abspath(__file__)))
with open('plugins_generated.tex', 'w') as f:
Expand Down
Binary file added doc/images/bumpy_sphere.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 22 additions & 10 deletions doc/main.bib
Expand Up @@ -10,7 +10,7 @@ @article{Zhao11Building
title = {{Building Volumetric Appearance Models of Fabric using Micro CT Imaging}},
journal = {ACM Transactions on Graphics (Proceedings SIGGRAPH 2011)},
year = {2011},
month = {July}
month = {7}
}

@article{Smits2005RGB,
Expand Down Expand Up @@ -325,7 +325,7 @@ @article{Hosek2012Analytic
year = {2012},
volume = {31},
number = {4},
month = {July}
month = {7}
}

@article{Hachisuka2009Stochastic,
Expand Down Expand Up @@ -378,11 +378,11 @@ @inproceedings{Krivanek2006Making
}

@inproceedings{Ward1992Irradiance,
author = "Greg Ward and Paul Heckbert",
title = "Irradiance Gradients",
booktitle = "Eurographics Rendering Workshop",
pages = "85-98",
month = "May",
author = {Greg Ward and Paul Heckbert},
title = {Irradiance Gradients},
booktitle = {Eurographics Rendering Workshop},
pages = {85--98},
month = {5},
year = "1992",
}

Expand All @@ -392,7 +392,7 @@ @article{Ward1988Ray
journal = {SIGGRAPH Comput. Graph.},
volume = {22},
number = {4},
month = jun,
month = {6},
year = {1988},
pages = {85--92},
publisher = {ACM},
Expand Down Expand Up @@ -572,7 +572,7 @@ @article{Trowbridge19975Average
publisher = {OSA},
title = {Average irregularity representation of a rough surface for ray reflection},
volume = {65},
month = {May},
month = {5},
year = {1975}
}

Expand All @@ -582,5 +582,17 @@ @article{Heitz1014Importance
journal = {Computer Graphics Forum},
publisher = {Blackwell Publishing},
year = {2014},
month = Jun
month = {6}
}

@article {Holzschuch2015,
author = {Holzschuch, Nicolas},
title = {Accurate Computation of Single Scattering in Participating Media with Refractive Boundaries},
journal = {Computer Graphics Forum},
publisher = {Wiley},
volume = {34},
number = {6},
pages = {48--59},
year = {2015},
MONTH = Sep
}
21 changes: 16 additions & 5 deletions doc/main.tex
@@ -1,4 +1,6 @@
\documentclass[footinclude=false,11pt,DIV11]{scrartcl}
% !TEX engine = pdflatex
% In case one tries to compile from within atom instead of gendoc.py
\documentclass[footinclude=false,11pt,DIV=11]{scrartcl}

% Wenzel's standard prelude
% ----- 8< ----- 8< ------
Expand Down Expand Up @@ -40,8 +42,8 @@
\setcounter{secnumdepth}{3}
\setcounter{tocdepth}{3}

\newcommand{\MitsubaVersion}{0.5.0}
\newcommand{\MitsubaYear}{2014}
\newcommand{\MitsubaVersion}{0.6.0}
\newcommand{\MitsubaYear}{2017}

\typearea[current]{last}
\raggedbottom
Expand All @@ -60,6 +62,11 @@
\addtokomafont{descriptionlabel}{\rmfamily}
\pagestyle{scrheadings}

% Section and subsubsection numbers in TOC need more numwidth
\DeclareTOCStyleEntry[numwidth=3em]{default}{section}
\DeclareTOCStyleEntry[numwidth=4em]{default}{subsection}
\DeclareTOCStyleEntry[numwidth=5em]{default}{subsubsection}

\usepackage[
bookmarks,
bookmarksnumbered,
Expand All @@ -76,6 +83,11 @@
pdfstartview=FitH
]{hyperref}

% Bibliography
\usepackage{csquotes}
\usepackage[backend=bibtex,style=numeric,uniquename=init]{biblatex}
\addbibresource{main.bib}

\definecolor{myblue}{rgb}{0,.1,.6}
\definecolor{myred}{rgb}{0.63,.16,.16}
\definecolor{lstshade}{gray}{0.95}
Expand Down Expand Up @@ -181,7 +193,6 @@
\include{acknowledgements}
\include{gpl-v3}

\bibliographystyle{acm}
\bibliography{main}
\printbibliography[heading=bibintoc]

\end{document}
2 changes: 1 addition & 1 deletion src/bsdfs/normalmap.cpp
Expand Up @@ -34,7 +34,7 @@ MTS_NAMESPACE_BEGIN
* be affected by the normal map}
* }
*
* This plugin is conceptually similar to the \pluginref{bump} map plugin
* This plugin is conceptually similar to the \pluginref{bumpmap} plugin
* but uses a normal map instead of a bump map. A normal map is a RGB texture, whose color channels
* encode the XYZ coordinates of the desired surface normals.
* These are specified \emph{relative} to the local shading frame,
Expand Down
1 change: 0 additions & 1 deletion src/subsurface/singlescatter.cpp
Expand Up @@ -70,7 +70,6 @@ static ref<Mutex> mutex = new Mutex;
*
* \renderings{
* \rendering{The bumpy sphere test scene rendered with amber material}{bumpy_sphere.jpg}
* \rendering{The Stanford Bunny rendered with a translucent material}{bunny_single.jpg}
* }
* This plugin implements the single scattering model in participating media
Expand Down

0 comments on commit 9110048

Please sign in to comment.