Browse Source

Update Sampler and Integrator

Jérôme BUISINE 6 months ago
parent
commit
3e83416403
52 changed files with 204 additions and 68 deletions
  1. 2 2
      barcelona-pavilion/p3d_pavilion-day.pbrt
  2. 2 2
      barcelona-pavilion/p3d_pavilion-night.pbrt
  3. 2 2
      bathroom/p3d_bathroom.pbrt
  4. 2 2
      bmw-m6/p3d_bmw-m6.pbrt
  5. 2 2
      breakfast/p3d_breakfast.pbrt
  6. 2 2
      bunny-fur/p3d_bunny-fur.pbrt
  7. 2 0
      change_ext_pbrt.py
  8. 19 0
      change_integrator_all.sh
  9. 48 0
      change_integrator_pbrt.py
  10. 19 0
      change_sampler_all.sh
  11. 48 0
      change_sampler_pbrt.py
  12. 2 2
      chopper-titan/p3d_chpper-titan.pbrt
  13. 2 2
      coffee-splash/p3d_splash.pbrt
  14. 2 2
      contemporary-bathroom/p3d_contemporary-bathroom.pbrt
  15. 2 2
      crown/p3d_crown.pbrt
  16. 2 2
      dragon/p3d_dragon.pbrt
  17. 2 2
      ecosys/p3d_ecosys.pbrt
  18. 2 2
      ganesha/p3d_ganesha.pbrt
  19. 0 0
      glass/BLENDSWAP_LICENSE.txt
  20. 0 0
      glass/geometry/Circle_0000_m000.ply
  21. 0 0
      glass/geometry/Circle_001_0000_m000.ply
  22. 0 0
      glass/geometry/Cylinder_001_0000_m000.ply
  23. 0 0
      glass/geometry/Cylinder_002_0000_m000.ply
  24. 0 0
      glass/geometry/Cylinder_004_0000_m000.ply
  25. 0 0
      glass/geometry/Cylinder_004_0000_m001.ply
  26. 0 0
      glass/geometry/Cylinder_005_0000_m000.ply
  27. 0 0
      glass/geometry/Plane_0000_m000.ply
  28. 0 0
      glass/glass.exr
  29. 0 0
      glass/glass.pbrt
  30. 2 2
      wip/glass/p3d_glass.pbrt
  31. 0 0
      glass/textures/20060807_wells6_hd.exr
  32. 0 0
      glass/textures/lines.png
  33. 2 2
      landscape/p3d_view-0.pbrt
  34. 2 2
      landscape/p3d_view-1.pbrt
  35. 2 2
      landscape/p3d_view-2.pbrt
  36. 2 2
      landscape/p3d_view-3.pbrt
  37. 2 2
      landscape/p3d_view-4.pbrt
  38. 2 2
      sanmiguel/p3d_sanmiguel.pbrt
  39. 2 2
      sanmiguel/p3d_sanmiguel_cam1.pbrt
  40. 2 2
      sanmiguel/p3d_sanmiguel_cam18.pbrt
  41. 2 2
      sanmiguel/p3d_sanmiguel_cam3.pbrt
  42. 2 2
      sportscar/p3d_sportscar.pbrt
  43. 2 2
      sssdragon/p3d_dragon_250.pbrt
  44. 1 1
      staircase2/p3d_staircase2.pbrt
  45. 2 2
      structuresynth/p3d_arcsphere.pbrt
  46. 2 2
      tt/p3d_tt.pbrt
  47. 2 2
      veach-bidir/p3d_bidir.pbrt
  48. 2 2
      villa/p3d_villa-daylight.pbrt
  49. 2 2
      volume-caustic/p3d_caustic.pbrt
  50. 3 3
      vw-van/p3d_vw-van.pbrt
  51. 2 2
      white-room/p3d_whiteroom-daytime.pbrt
  52. 2 2
      white-room/p3d_whiteroom-night.pbrt

+ 2 - 2
barcelona-pavilion/p3d_pavilion-day.pbrt

@@ -15,8 +15,8 @@ Camera "perspective" "float fov" 45
 #LookAt -10 100 10    -10 0 10  1 0 0
 #Camera "perspective" "float fov" 60
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 WorldBegin
 

+ 2 - 2
barcelona-pavilion/p3d_pavilion-night.pbrt

@@ -15,8 +15,8 @@ Camera "perspective" "float fov" 45
 #LookAt -10 100 10    -10 0 10  1 0 0
 #Camera "perspective" "float fov" 60
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 WorldBegin
 

+ 2 - 2
bathroom/p3d_bathroom.pbrt

@@ -9,8 +9,8 @@ Film "image" "integer xresolution" 1000 "integer yresolution" 1000
     "string filename" "p3d_bathroom.rawls"
 # imgtool convert -bloomscale .1 -bloomlevel 5 bathroom.exr bathroom.rawls
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 WorldBegin
 

+ 2 - 2
bmw-m6/p3d_bmw-m6.pbrt

@@ -7,8 +7,8 @@ Film "image" "integer xresolution" 1000 "integer yresolution" 1000
 LookAt -11 .8 5   -2 -.5 0   0 1 0
 Camera "perspective" "float fov" 30
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 WorldBegin
 

+ 2 - 2
breakfast/p3d_breakfast.pbrt

@@ -15,8 +15,8 @@ Film "image"
         "float scale" 12
 # imgtool convert -bloomscale .1 -bloomlevel 5 breakfast.{exr,png} 
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 WorldBegin
 

+ 2 - 2
bunny-fur/p3d_bunny-fur.pbrt

@@ -1,8 +1,8 @@
 Film "image" "integer xresolution" [1000] "integer yresolution" [1000]
     "string filename" "p3d_bunny-fur.rawls"
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 LookAt 0 .25 .2    -.02 .07 0  0 1 0
 Camera "perspective" "float fov" [55]

+ 2 - 0
change_ext_pbrt.py

@@ -29,6 +29,8 @@ def main():
 
     for line in pbrt_lines:
 
+        output_line = line
+        
         # 1. Comment Transform and Camera command
         if line.find(p_prefix) and line.find('filename'):
             output_line = line.replace('.' + p_previous, '.' + p_ext)

+ 19 - 0
change_integrator_all.sh

@@ -0,0 +1,19 @@
+#! /bin/bash
+
+main_folder="./"
+prefix="p3d_"
+
+for folder in $(ls -d -- ${main_folder}*/)
+do
+  for file in $(ls $folder)
+  do
+    filename=$folder$file
+    filename_fixed=${filename//\/\//\/}
+
+    # check if filename contains 
+    if [[ "$file" == ${prefix}* ]]; then
+        echo "Update Integrator into ${filename}"
+        python change_integrator_pbrt.py --prefix ${prefix} --pbrt ${filename}
+    fi 
+  done
+done

+ 48 - 0
change_integrator_pbrt.py

@@ -0,0 +1,48 @@
+# main imports
+import sys, os, argparse
+import json
+
+
+# default Sampler
+# 'Integrator "path" "integer maxdepth" [ 65 ]'
+INTEGRATOR_LINE = 'Integrator "path" "integer maxdepth" [ 65 ]'
+
+def main():
+
+    parser = argparse.ArgumentParser(description="Update integrator params of pbrt scene")
+
+    parser.add_argument('--prefix', type=str, help='prefix of filename used', required=True)
+    parser.add_argument('--pbrt', type=str, help='pbrt scene name (this one to convert)', required=True)
+
+    args = parser.parse_args()
+
+    p_prefix     = args.prefix
+    p_pbrt       = args.pbrt
+    
+
+    output_content = ""
+    # read existing pbrt file
+    pbrt_file = open(p_pbrt, 'r')
+    pbrt_lines = pbrt_file.readlines()
+
+    for line in pbrt_lines:
+
+        output_line = line
+         
+        # 1. Comment Transform and Camera command
+        if line.startswith('Integrator'):
+            output_line = INTEGRATOR_LINE + '\n'
+
+        output_content = output_content + output_line
+
+    # close all buffers
+    pbrt_file.close()
+
+
+    # update content
+    pbrt_outfile = open(p_pbrt, 'w')
+    pbrt_outfile.write(output_content)
+    pbrt_outfile.close()
+
+if __name__== "__main__":
+    main()

+ 19 - 0
change_sampler_all.sh

@@ -0,0 +1,19 @@
+#! /bin/bash
+
+main_folder="./"
+prefix="p3d_"
+
+for folder in $(ls -d -- ${main_folder}*/)
+do
+  for file in $(ls $folder)
+  do
+    filename=$folder$file
+    filename_fixed=${filename//\/\//\/}
+
+    # check if filename contains 
+    if [[ "$file" == ${prefix}* ]]; then
+        echo "Update Sampler into ${filename}"
+        python change_sampler_pbrt.py --prefix ${prefix} --pbrt ${filename}
+    fi 
+  done
+done

+ 48 - 0
change_sampler_pbrt.py

@@ -0,0 +1,48 @@
+# main imports
+import sys, os, argparse
+import json
+
+
+# default Sampler
+# 'Sampler "random" "integer pixelsamples" [ 64 ]'
+SAMPLER_LINE = 'Sampler "random" "integer pixelsamples" [ 64 ]'
+
+def main():
+
+    parser = argparse.ArgumentParser(description="Update sampler params of pbrt scene")
+
+    parser.add_argument('--prefix', type=str, help='prefix of filename used', required=True)
+    parser.add_argument('--pbrt', type=str, help='pbrt scene name (this one to convert)', required=True)
+
+    args = parser.parse_args()
+
+    p_prefix     = args.prefix
+    p_pbrt       = args.pbrt
+    
+
+    output_content = ""
+    # read existing pbrt file
+    pbrt_file = open(p_pbrt, 'r')
+    pbrt_lines = pbrt_file.readlines()
+
+    for line in pbrt_lines:
+
+        output_line = line
+         
+        # 1. Comment Transform and Camera command
+        if line.startswith('Sampler'):
+            output_line = SAMPLER_LINE + '\n'
+
+        output_content = output_content + output_line
+
+    # close all buffers
+    pbrt_file.close()
+
+
+    # update content
+    pbrt_outfile = open(p_pbrt, 'w')
+    pbrt_outfile.write(output_content)
+    pbrt_outfile.close()
+
+if __name__== "__main__":
+    main()

+ 2 - 2
chopper-titan/p3d_chpper-titan.pbrt

@@ -7,8 +7,8 @@ Scale -1 1 1
 LookAt -3 1.5 -10   2 1 20  0 1 0
 Camera "perspective" "float fov" 60
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 WorldBegin
 

+ 2 - 2
coffee-splash/p3d_splash.pbrt

@@ -1,8 +1,8 @@
 
 LookAt -4.082462 -26.445557 7.488438 -3.408813 -21.135092 5.562232 0.307266 1.902535 5.352667
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 Camera "perspective"
 	"float fov" [39.146252510876771]

+ 2 - 2
contemporary-bathroom/p3d_contemporary-bathroom.pbrt

@@ -13,8 +13,8 @@ Scale -1 1 1
 LookAt 0 1.25 -.5   -10 0 -9  0 1 0
 Camera "perspective" "float fov" 65
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 WorldBegin
 

+ 2 - 2
crown/p3d_crown.pbrt

@@ -9,8 +9,8 @@ LookAt 0 5.5 24   0 11 -10  0 1 0
 Camera "perspective" "float fov" 47
   "float focaldistance" 17 "float lensradius" .3
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 WorldBegin
 

+ 2 - 2
dragon/p3d_dragon.pbrt

@@ -2,8 +2,8 @@
 Film "image" "integer xresolution" [1000] "integer yresolution" [1000]
   "string filename" "p3d_dragon.rawls"
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 #LookAt 400 -400 400  0 80 -50 0 0 1
 #LookAt 277 -240 250  0 80 -50 0 0 1

+ 2 - 2
ecosys/p3d_ecosys.pbrt

@@ -10,8 +10,8 @@ LookAt 28 1.79999995 1.5
 Camera "perspective" 
         "float fov" [ 60 ] 
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 #############################################
 WorldBegin

+ 2 - 2
ganesha/p3d_ganesha.pbrt

@@ -1,5 +1,5 @@
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 PixelFilter "gaussian"
 

wip/glass/BLENDSWAP_LICENSE.txt → glass/BLENDSWAP_LICENSE.txt


wip/glass/geometry/Circle_0000_m000.ply → glass/geometry/Circle_0000_m000.ply


wip/glass/geometry/Circle_001_0000_m000.ply → glass/geometry/Circle_001_0000_m000.ply


wip/glass/geometry/Cylinder_001_0000_m000.ply → glass/geometry/Cylinder_001_0000_m000.ply


wip/glass/geometry/Cylinder_002_0000_m000.ply → glass/geometry/Cylinder_002_0000_m000.ply


wip/glass/geometry/Cylinder_004_0000_m000.ply → glass/geometry/Cylinder_004_0000_m000.ply


wip/glass/geometry/Cylinder_004_0000_m001.ply → glass/geometry/Cylinder_004_0000_m001.ply


wip/glass/geometry/Cylinder_005_0000_m000.ply → glass/geometry/Cylinder_005_0000_m000.ply


wip/glass/geometry/Plane_0000_m000.ply → glass/geometry/Plane_0000_m000.ply


wip/glass/glass.exr → glass/glass.exr


wip/glass/glass.pbrt → glass/glass.pbrt


+ 2 - 2
wip/glass/p3d_glass.pbrt

@@ -2,8 +2,8 @@
 
 LookAt 3.592741 20.556787 4.337005 3.423012 19.583931 4.179706 -0.026954 -0.154972 0.987551
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 Camera "perspective"
 	"float fov" [7.327086285904825]

wip/glass/textures/20060807_wells6_hd.exr → glass/textures/20060807_wells6_hd.exr


wip/glass/textures/lines.png → glass/textures/lines.png


+ 2 - 2
landscape/p3d_view-0.pbrt

@@ -4,8 +4,8 @@ Camera "perspective"
         "float focaldistance" [ 3000 ] 
         "float lensradius" [ 0.125 ] 
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 Film "image" 
         "integer xresolution" [ 1000 ] 

+ 2 - 2
landscape/p3d_view-1.pbrt

@@ -4,8 +4,8 @@ Camera "perspective"
         "float focaldistance" [ 3000 ] 
         "float lensradius" [ 0.14 ] 
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 Film "image" 
         "integer xresolution" [ 1000 ] 

+ 2 - 2
landscape/p3d_view-2.pbrt

@@ -4,8 +4,8 @@ Camera "perspective"
         "float focaldistance" [ 5000 ] 
         "float lensradius" [ 0.22499999 ] 
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 Film "image" 
         "integer xresolution" [ 1000 ] 

+ 2 - 2
landscape/p3d_view-3.pbrt

@@ -4,8 +4,8 @@ Camera "perspective"
         "float focaldistance" [ 464.76944 ] 
         "float lensradius" [ 4.375 ] 
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 Film "image" 
         "integer xresolution" [ 1000 ] 

+ 2 - 2
landscape/p3d_view-4.pbrt

@@ -4,8 +4,8 @@ Camera "perspective"
         "float focaldistance" [ 2000 ] 
         "float lensradius" [ 0.25 ] 
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 Film "image" 
         "integer xresolution" [ 1000 ] 

+ 2 - 2
sanmiguel/p3d_sanmiguel.pbrt

@@ -23,8 +23,8 @@ Film "image"
 	 "string filename"  ["p3d_sanmiguel.rawls"]
 # End Camera Camera09
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 WorldBegin
 

+ 2 - 2
sanmiguel/p3d_sanmiguel_cam1.pbrt

@@ -23,8 +23,8 @@ Film "image"
 	 "string filename"  ["p3d_sanmiguel_cam1.rawls"]
 # End Camera Camera01
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 WorldBegin
 

+ 2 - 2
sanmiguel/p3d_sanmiguel_cam18.pbrt

@@ -23,8 +23,8 @@ Film "image"
 	 "string filename"  ["p3d_sanmiguel_cam18.rawls"]
 # End Camera Camera18
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 WorldBegin
 

+ 2 - 2
sanmiguel/p3d_sanmiguel_cam3.pbrt

@@ -24,8 +24,8 @@ Film "image"
 
 # End Camera Camera03
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 WorldBegin
 

+ 2 - 2
sportscar/p3d_sportscar.pbrt

@@ -9,8 +9,8 @@ Film "image" "integer xresolution" [1000] "integer yresolution" [1000]
 LookAt 5.733494 -2.960355 0.910164 4.846804 -2.506242 0.823198 -0.077418 0.039618 0.996211
 Camera "perspective" "float fov" [24]
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 WorldBegin
 

+ 2 - 2
sssdragon/p3d_dragon_250.pbrt

@@ -1,5 +1,5 @@
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 PixelFilter "gaussian"
 

+ 1 - 1
staircase2/p3d_staircase2.pbrt

@@ -1,4 +1,4 @@
-Integrator "bdpt" "integer maxdepth" [ 65 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 #Transform [ 0.435523 -4.21474e-008 -0.900177 -0 -0 1 -4.68212e-008 -0 -0.900177 -2.03917e-008 -0.435524 -0 -0.711083 -1.65163 7.33425 1]
 
 Sampler "random" "integer pixelsamples" [ 64 ]

+ 2 - 2
structuresynth/p3d_arcsphere.pbrt

@@ -8,8 +8,8 @@ LookAt 10 10 25  4 0 -7  0 1 0
 Camera "perspective" "float fov" [55]
 
 # high quality
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 WorldBegin 
 

+ 2 - 2
tt/p3d_tt.pbrt

@@ -9,8 +9,8 @@ LookAt -2 2 2
 Camera "perspective" 
         "float fov" [ 30 ] 
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 #############################################
 

+ 2 - 2
veach-bidir/p3d_bidir.pbrt

@@ -1,8 +1,8 @@
 #"bool visualizestrategies" ["true"]
 #"bool visualizeweights" ["true"]
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 PixelFilter "box"
 

+ 2 - 2
villa/p3d_villa-daylight.pbrt

@@ -11,8 +11,8 @@ Film "image"
         "float scale" [ 3 ] 
         "string filename" "p3d_villa-daylight.rawls"
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 
 #############################################

+ 2 - 2
volume-caustic/p3d_caustic.pbrt

@@ -7,8 +7,8 @@ Film "image"
         "integer yresolution" [ 1000 ] 
         "string filename" [ "p3d_caustic.rawls" ] 
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 MediumInterface "" "vol"
 LookAt -0.75 0.800000012 -1.25

+ 3 - 3
vw-van/p3d_vw-van.pbrt

@@ -1,7 +1,7 @@
 LookAt 1200 800 -1200  50 125 0  0 1 0
 Camera "perspective" 
         "float fov" [ 22 ] 
-Sampler "halton" 
+Sampler "random" "integer pixelsamples" [ 64 ]
         "integer pixelsamples" [ 128 ] 
 Film "image" 
         "integer xresolution" [ 1000 ] 
@@ -9,8 +9,8 @@ Film "image"
         "string filename" [ "p3d_vw-van.rawls" ]
         "float scale" 3
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 WorldBegin
 

+ 2 - 2
white-room/p3d_whiteroom-daytime.pbrt

@@ -26,8 +26,8 @@ LookAt -2.8 1.8 4.9    -0.6 1.4 2    0 1 0
 
 Camera "perspective" "float fov" [66]
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 WorldBegin
 Scale -1 1 1

+ 2 - 2
white-room/p3d_whiteroom-night.pbrt

@@ -19,8 +19,8 @@ LookAt -2.8 1.8 4.9    -0.6 1.4 2    0 1 0
 
 Camera "perspective" "float fov" [66]
 
-Sampler "random" "integer pixelsamples" 4096
-Integrator "path"
+Sampler "random" "integer pixelsamples" [ 64 ]
+Integrator "path" "integer maxdepth" [ 65 ]
 
 WorldBegin
 Scale -1 1 1