From 35df0e21ef74f731afa2d930ed0250f5d076fd8c Mon Sep 17 00:00:00 2001
From: Wenzel Jakob <wenzel@cs.cornell.edu>
Date: Fri, 28 Sep 2012 22:36:29 -0400
Subject: [PATCH] icon and documentation update

---
 src/integrators/pssmlt/pssmlt.cpp |  18 ++++++++++++++++--
 src/mtsgui/mainwindow.ui          |   6 +++++-
 src/mtsgui/resources.qrc          |   1 +
 src/mtsgui/resources/camera.png   | Bin 0 -> 376 bytes
 4 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 src/mtsgui/resources/camera.png

diff --git a/src/integrators/pssmlt/pssmlt.cpp b/src/integrators/pssmlt/pssmlt.cpp
index c4d34cf3..9995507b 100644
--- a/src/integrators/pssmlt/pssmlt.cpp
+++ b/src/integrators/pssmlt/pssmlt.cpp
@@ -114,10 +114,10 @@ MTS_NAMESPACE_BEGIN
  * default, it uses 100K samples (controlled by the \code{luminanceSamples} 
  * parameter), which should be adequate for most applications.
  *
- * The second caveat is that the amount of computational expenditure
+ * The second caveat is that the amount of computational expense
  * associated with a pixel in the output image is roughly proportional to
  * its intensity. This means that when a bright object (e.g. the sun) is
- * visible in a rendering time, most resources are committed to rendering the
+ * visible in a rendering, most resources are committed to rendering the
  * sun disk at the cost of increased variance everywhere else. Since this is 
  * usually not desired, the \code{twoStage} parameter can be used to
  * enable \emph{Two-stage MLT} in this case. 
@@ -128,6 +128,17 @@ MTS_NAMESPACE_BEGIN
  * using the previously collected information to ensure that
  * the amount of time spent rendering each pixel is uniform.
  *
+ * The third caveat is that, while PSMLT can work with scenes that are extremely
+ * difficult for other methods to handle, it is not particularly efficient
+ * when rendering simple things such as direct illumination (which is more easily
+ * handled by a brute-force type algorithm). By default, the
+ * implementation in Mitsuba therefore delegates this to such a method
+ * (with the desired quality being controlled by the \code{directSamples} parameter).
+ * In very rare cases when direct illumination paths are very difficult to find,
+ * it is preferable to disable this separation so that PSSMLT is responsible
+ * for everything. This can be accomplished by setting
+ * \code{directSamples=-1}.
+ *
  * \remarks{
  *    \item This integrator does not work with dipole-style subsurface scattering models.
  * }
@@ -136,6 +147,9 @@ MTS_NAMESPACE_BEGIN
 class PSSMLT : public Integrator {
 public:
 	PSSMLT(const Properties &props) : Integrator(props) {
+		/* Note: a bunch of the parameters below are not publicly exposed,
+		   because there is really little sense for most users to ever change them. */
+
 		/* Longest visualized path length (<tt>-1</tt>=infinite). 
 		   A value of <tt>1</tt> will visualize only directly visible light 
 		   sources. <tt>2</tt> will lead to single-bounce (direct-only) 
diff --git a/src/mtsgui/mainwindow.ui b/src/mtsgui/mainwindow.ui
index a9b4266c..bb0040bb 100644
--- a/src/mtsgui/mainwindow.ui
+++ b/src/mtsgui/mainwindow.ui
@@ -106,7 +106,7 @@
      <x>0</x>
      <y>0</y>
      <width>605</width>
-     <height>25</height>
+     <height>26</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -165,6 +165,10 @@
      <property name="title">
       <string>Set Camera</string>
      </property>
+     <property name="icon">
+      <iconset resource="resources.qrc">
+       <normaloff>:/resources/camera.png</normaloff>:/resources/camera.png</iconset>
+     </property>
     </widget>
     <widget class="QMenu" name="menuDeveloper">
      <property name="title">
diff --git a/src/mtsgui/resources.qrc b/src/mtsgui/resources.qrc
index 7ef1dc87..fe5b01b0 100644
--- a/src/mtsgui/resources.qrc
+++ b/src/mtsgui/resources.qrc
@@ -11,6 +11,7 @@
     <file>resources/help16.png</file>
     <file>resources/settings.png</file>
     <file>resources/open16.png</file>
+    <file>resources/camera.png</file>
     <file>resources/appicon.png</file>
     <file>resources/about16.png</file>
     <file>resources/refresh.png</file>
diff --git a/src/mtsgui/resources/camera.png b/src/mtsgui/resources/camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f17a4d6ddd38cf5f835e1330035b24dc3d39241
GIT binary patch
literal 376
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf67>k44ofy`glX(f`FeQ1ryD<E3
z??1C2$m1;Vh%5$by$-^RP8zc-fP(BLp1!W^cQ|F4gjjh4Pk#jp{qb~h4AD5h^x|2q
zmPCf5AMbxYXZ>;C;u@cmJgG`SdM8~^i0)v?p8k++&61ARnyEsQ({y?i4bx^_Og1c2
zdaC39T<6^XmKWu!|AZ{|tUdlcqQ8CneddP?L{Hg&f1G?vPk*IHtN!b#%d;nSvDT_T
z-J)EW5*XMNJTp|eD(_9?#pzG1)Jz3UQnJ>)*%1_6l&^5|i*L0U3;(Kbxslsb<3puA
z`!r)6FI*ITduxOCt5-^Ar)=r1%gsBn_U1OV>k{Yo^gW(c^-MIz%2>(t;Z2A0oA@);
zu7`YHlyI%p+WE)9Et2Vnf^EJp)R@T8<XyV{*qKNnS?<|u|LLoA_dmR!U&q9#94zrQ
TSNuCL92h)Z{an^LB{Ts5Y%rTf

literal 0
HcmV?d00001