More improvements to the Measure One scenes

Match materials better to the original
Use DOF in all scenes; set focal distance better.
Switch to BDPT

measure-one/frame120.pbrt

@@ -1,24 +1,17 @@
 Transform [0.00271272953712 0.000533379303267 -0.999996178295 0  0.0849694345558 0.996383266931 0.000761952219531 0  0.996379865458 -0.084971176798 0.00265759738069 0  3.95980551577 66.3815402424 786.15538693 1]
-Camera "perspective" "float fov" [22.2753333373] "float focaldistance" [899.384338379] "float lensradius" [0]
+Camera "perspective" "float fov" [22.2753333373]
+   "float focaldistance" [911] "float lensradius" [.5]
 
 Film "image" "string filename" ["frame120.exr"]
     "integer xresolution" [1920] "integer yresolution" [840]
    "integer xresolution" [1440] "integer yresolution" [630]
 #   "integer xresolution" [960] "integer yresolution" [420]
 #   "integer xresolution" [480] "integer yresolution" [210]
-   "float maxsampleluminance" 50
-   "integer writefrequency" 120
-   "float scale" 0.25
-# imgtool convert -bloomlevel 1.5 -bloomscale .05
+   "float scale" .5
+# imgtool convert -bloomlevel 1 -bloomscale .05
 
-#PixelFilter "gaussian" "float xwidth" 1.5 "float ywidth" 1.5
-
-Sampler "sobol" "integer pixelsamples" [8192]
-Integrator "bdpt" "integer maxdepth" 4
-
-Sampler "sobol" "integer pixelsamples" 16384
-Sampler "sobol" "integer pixelsamples" 8192
-Integrator "path" "integer maxdepth" 7
+Sampler "sobol" "integer pixelsamples" 2048
+Integrator "bdpt" "integer maxdepth" 7
 
 WorldBegin
 

measure-one/frame180.pbrt

@@ -1,24 +1,17 @@
 Transform [0.00218785685037 -0.0168438245754 -0.999855739022 0  -0.128790099004 0.99152640371 -0.0169853214255 0  0.991669462916 0.128808681071 -4.28476698566e-16 0  -10.5681365473 81.3617390286 383.885318952 1]
-Camera "perspective" "float fov" [22.2753333373] "float focaldistance" [899.384338379] "float lensradius" [0]
+Camera "perspective" "float fov" [22.2753333373]
+   "float focaldistance" [182] "float lensradius" [.5]
 
 Film "image" "string filename" ["frame180.exr"]
     "integer xresolution" [1920] "integer yresolution" [840]
    "integer xresolution" [1440] "integer yresolution" [630]
 #   "integer xresolution" [960] "integer yresolution" [420]
 #   "integer xresolution" [480] "integer yresolution" [210]
-   "float maxsampleluminance" 50
-   "integer writefrequency" 120
-   "float scale" 0.25
-# imgtool convert -bloomlevel 1.5 -bloomscale .05
+   "float scale" .5
+# imgtool convert -bloomlevel 1 -bloomscale .05
 
-#PixelFilter "gaussian" "float xwidth" 1.5 "float ywidth" 1.5
-
-Sampler "sobol" "integer pixelsamples" [8192]
-Integrator "bdpt" "integer maxdepth" 4
-
-Sampler "sobol" "integer pixelsamples" 16384
-Sampler "sobol" "integer pixelsamples" 8192
-Integrator "path" "integer maxdepth" 7
+Sampler "sobol" "integer pixelsamples" 2048
+Integrator "bdpt" "integer maxdepth" 7
 
 WorldBegin
 

measure-one/frame210.pbrt

@@ -1,24 +1,17 @@
 Transform [0.000669885023224 -0.00470105512031 -0.999988725604 0  -0.141070093049 0.989988222244 -0.00474854348075 0  0.989999383889 0.141071683547 -4.28585118784e-16 0  -10.9667921676 76.9617063907 184.556137683 1]
-Camera "perspective" "float fov" [22.2753333373] "float focaldistance" [899.384338379] "float lensradius" [0]
+Camera "perspective" "float fov" [22.2753333373]
+   "float focaldistance" [314] "float lensradius" [.75]
 
 Film "image" "string filename" ["frame210.exr"]
     "integer xresolution" [1920] "integer yresolution" [840]
    "integer xresolution" [1440] "integer yresolution" [630]
 #   "integer xresolution" [960] "integer yresolution" [420]
 #   "integer xresolution" [480] "integer yresolution" [210]
-   "float maxsampleluminance" 50
-   "integer writefrequency" 120
-   "float scale" 0.25
-# imgtool convert -bloomlevel 1.5 -bloomscale .05
+   "float scale" .5
+# imgtool convert -bloomlevel 1 -bloomscale .05
 
-#PixelFilter "gaussian" "float xwidth" 1.5 "float ywidth" 1.5
-
-Sampler "sobol" "integer pixelsamples" [8192]
-Integrator "bdpt" "integer maxdepth" 4
-
-Sampler "sobol" "integer pixelsamples" 16384
-Sampler "sobol" "integer pixelsamples" 8192
-Integrator "path" "integer maxdepth" 7
+Sampler "sobol" "integer pixelsamples" 2048
+Integrator "bdpt" "integer maxdepth" 7
 
 WorldBegin
 

measure-one/frame25.pbrt

@@ -1,24 +1,17 @@
 Transform [-0.000120149158703 -0.00540833472859 -0.999985367633 0  0.0222097502109 0.999738697098 -0.0054096691541 0  0.999753325856 -0.0222100751969 -4.28612223838e-16 0  1.46547868843 65.9663319345 1419.7722128 1]
-Camera "perspective" "float fov" [22.2753333373] "float focaldistance" [899.384338379] "float lensradius" [0]
+Camera "perspective" "float fov" [22.2753333373]
+   "float focaldistance" [1500] "float lensradius" [.5]
 
 Film "image" "string filename" ["frame25.exr"]
     "integer xresolution" [1920] "integer yresolution" [840]
    "integer xresolution" [1440] "integer yresolution" [630]
 #   "integer xresolution" [960] "integer yresolution" [420]
 #   "integer xresolution" [480] "integer yresolution" [210]
-   "float maxsampleluminance" 50
-   "integer writefrequency" 120
-   "float scale" 0.25
-# imgtool convert -bloomlevel 1.5 -bloomscale .05
+   "float scale" .5
+# imgtool convert -bloomlevel 1 -bloomscale .05
 
-#PixelFilter "gaussian" "float xwidth" 1.5 "float ywidth" 1.5
-
-Sampler "sobol" "integer pixelsamples" [8192]
-Integrator "bdpt" "integer maxdepth" 4
-
-Sampler "sobol" "integer pixelsamples" 16384
-Sampler "sobol" "integer pixelsamples" 8192
-Integrator "path" "integer maxdepth" 7
+Sampler "sobol" "integer pixelsamples" 2048
+Integrator "bdpt" "integer maxdepth" 7
 
 WorldBegin
 

measure-one/frame300.pbrt

@@ -1,23 +1,17 @@
 Transform [0.000321523444619 0.00440560828103 -0.999990243572 0  0.0727861987458 0.99733778456 0.0044173251693 0  0.997347515109 -0.0727869088861 1.34760909029e-15 0  5.16620509719 70.7888533129 -415.668219005 1]
-Camera "perspective" "float fov" [22.2753333373] "float focaldistance" [899.384338379] "float lensradius" [0]
+Camera "perspective" "float fov" [22.2753333373]
+   "float focaldistance" [202] "float lensradius" [.5]
 
 Film "image" "string filename" ["frame300.exr"]
     "integer xresolution" [1920] "integer yresolution" [840]
    "integer xresolution" [1440] "integer yresolution" [630]
 #   "integer xresolution" [960] "integer yresolution" [420]
 #   "integer xresolution" [480] "integer yresolution" [210]
-   "float maxsampleluminance" 50
-   "integer writefrequency" 120
-   "float scale" 0.25
-# imgtool convert -bloomlevel 1.5 -bloomscale .05
+   "float scale" .5
+# imgtool convert -bloomlevel 1 -bloomscale .05
 
-#PixelFilter "gaussian" "float xwidth" 1.5 "float ywidth" 1.5
-
-Sampler "sobol" "integer pixelsamples" [8192]
-Integrator "bdpt" "integer maxdepth" 4
-
-Sampler "sobol" "integer pixelsamples" 8192
-Integrator "path" "integer maxdepth" 7
+Sampler "sobol" "integer pixelsamples" 2048
+Integrator "bdpt" "integer maxdepth" 7
 
 WorldBegin
 

measure-one/frame35.pbrt

@@ -2,26 +2,18 @@
 
 Transform [-0.000215412865163 -0.00540537858566 -0.999985367633 0  0.0398193876606 0.999192249693 -0.0054096691541 0  0.999206870455 -0.039819970321 -4.28666433946e-16 0  2.63044075589 66.005937584 1353.00405984 1]
 Camera "perspective" "float fov" [22.2753333373]
-   "float focaldistance" [1500] "float lensradius" [.35]
+   "float focaldistance" [1500] "float lensradius" [.5]
 
 Film "image" "string filename" ["frame35.exr"]
    "integer xresolution" [1920] "integer yresolution" [840]
    "integer xresolution" [1440] "integer yresolution" [630]
 #   "integer xresolution" [960] "integer yresolution" [420]
 #   "integer xresolution" [480] "integer yresolution" [210]
-   "float maxsampleluminance" 50
-   "integer writefrequency" 120
-   "float scale" 0.25
-# imgtool convert -bloomlevel 1.5 -bloomscale .05
+   "float scale" .5
+# imgtool convert -bloomlevel 1 -bloomscale .05
 
-#PixelFilter "gaussian" "float xwidth" 1.5 "float ywidth" 1.5
-
-Sampler "sobol" "integer pixelsamples" [8192]
-Integrator "bdpt" "integer maxdepth" 4
-
-Sampler "sobol" "integer pixelsamples" 16384
-Sampler "sobol" "integer pixelsamples" 8192
-Integrator "path" "integer maxdepth" 7
+Sampler "sobol" "integer pixelsamples" 2048
+Integrator "bdpt" "integer maxdepth" 7
 
 WorldBegin
 

measure-one/frame380.pbrt

@@ -1,24 +1,17 @@
 Transform [7.80642091082e-05 0.00405005407024 -0.99999179545 0  0.019271118415 0.999806088681 0.00405080633857 0  0.999814291707 -0.0192712765272 -4.28639328892e-16 0  1.31261978257 68.1001082797 -949.843704894 1]
-Camera "perspective" "float fov" [22.2753333373] "float focaldistance" [899.384338379] "float lensradius" [0]
+Camera "perspective" "float fov" [22.2753333373]
+   "float focaldistance" [431] "float lensradius" [.5]
 
 Film "image" "string filename" ["frame380.exr"]
     "integer xresolution" [1920] "integer yresolution" [840]
    "integer xresolution" [1440] "integer yresolution" [630]
 #   "integer xresolution" [960] "integer yresolution" [420]
 #   "integer xresolution" [480] "integer yresolution" [210]
-   "float maxsampleluminance" 50
-   "integer writefrequency" 120
-   "float scale" 0.25
-# imgtool convert -bloomlevel 1.5 -bloomscale .05
+   "float scale" 0.375
+# imgtool convert -bloomlevel 1 -bloomscale .05
 
-#PixelFilter "gaussian" "float xwidth" 1.5 "float ywidth" 1.5
-
-Sampler "sobol" "integer pixelsamples" [8192]
-Integrator "bdpt" "integer maxdepth" 4
-
-Sampler "sobol" "integer pixelsamples" 16384
-Sampler "sobol" "integer pixelsamples" 8192
-Integrator "path" "integer maxdepth" 7
+Sampler "sobol" "integer pixelsamples" 2048
+Integrator "bdpt" "integer maxdepth" 7
 
 WorldBegin
 

measure-one/frame52.pbrt

@@ -1,24 +1,17 @@
 Transform [-0.000396698126876 -0.00539510435051 -0.999985367633 0  0.0733302372 0.997293042085 -0.0054096691541 0  0.997307635057 -0.0733313102106 -4.28585118784e-16 0  4.88323614017 66.4121324491 1239.49601229 1]
-Camera "perspective" "float fov" [22.2753333373] "float focaldistance" [899.384338379] "float lensradius" [0]
+Camera "perspective" "float fov" [22.2753333373]
+   "float focaldistance" [1500] "float lensradius" [.5]
 
 Film "image" "string filename" ["frame52.exr"]
     "integer xresolution" [1920] "integer yresolution" [840]
    "integer xresolution" [1440] "integer yresolution" [630]
 #   "integer xresolution" [960] "integer yresolution" [420]
 #   "integer xresolution" [480] "integer yresolution" [210]
-   "float maxsampleluminance" 50
-   "integer writefrequency" 120
-   "float scale" 0.25
-# imgtool convert -bloomlevel 1.5 -bloomscale .05
+   "float scale" .5
+# imgtool convert -bloomlevel 1 -bloomscale .05
 
-#PixelFilter "gaussian" "float xwidth" 1.5 "float ywidth" 1.5
-
-Sampler "sobol" "integer pixelsamples" [8192]
-Integrator "bdpt" "integer maxdepth" 4
-
-Sampler "sobol" "integer pixelsamples" 16384
-Sampler "sobol" "integer pixelsamples" 8192
-Integrator "path" "integer maxdepth" 7
+Sampler "sobol" "integer pixelsamples" 2048
+Integrator "bdpt" "integer maxdepth" 7
 
 WorldBegin
 

measure-one/frame85.pbrt

@@ -1,24 +1,17 @@
 Transform [-0.000646809882592 -0.00537086187986 -0.999985367633 0  0.11956376625 0.992811785425 -0.0054096691541 0  0.992826312825 -0.119565515777 -4.28476698566e-16 0  8.21333953705 68.2004301622 1019.15108914 1]
-Camera "perspective" "float fov" [22.2753333373] "float focaldistance" [899.384338379] "float lensradius" [0]
+Camera "perspective" "float fov" [22.2753333373]
+   "float focaldistance" [1200] "float lensradius" [.5]
 
 Film "image" "string filename" ["frame85.exr"]
     "integer xresolution" [1920] "integer yresolution" [840]
    "integer xresolution" [1440] "integer yresolution" [630]
 #   "integer xresolution" [960] "integer yresolution" [420]
 #   "integer xresolution" [480] "integer yresolution" [210]
-   "float maxsampleluminance" 50
-   "integer writefrequency" 120
-   "float scale" 0.25
-# imgtool convert -bloomlevel 1.5 -bloomscale .05
+   "float scale" .5
+# imgtool convert -bloomlevel 1 -bloomscale .05
 
-#PixelFilter "gaussian" "float xwidth" 1.5 "float ywidth" 1.5
-
-Sampler "sobol" "integer pixelsamples" [8192]
-Integrator "bdpt" "integer maxdepth" 4
-
-Sampler "sobol" "integer pixelsamples" 16384
-Sampler "sobol" "integer pixelsamples" 8192
-Integrator "path" "integer maxdepth" 7
+Sampler "sobol" "integer pixelsamples" 2048
+Integrator "bdpt" "integer maxdepth" 7
 
 WorldBegin
 

measure-one/materials.pbrt

@@ -88,11 +88,10 @@ MakeNamedMaterial "decal"
         "texture Kd" [ "c4d|decal|Arnold_Shader-color" ] 
         "rgb Ks" [ 0.529999971 0.529999971 0.529999971 ] 
 MakeNamedMaterial "light tower" 
-        "string type" [ "substrate" ] 
-        "texture uroughness" [ "c4d|light_tower|Arnold_Shader-float" ] 
-        "texture vroughness" [ "c4d|light_tower|Arnold_Shader-float" ] 
-        "rgb Ks" [ 0.189999998 0.189999998 0.189999998 ] 
-        "rgb Kd" [ .7 .7 .7 ]
+        "string type" [ "uber" ] 
+        "texture uroughness" [ .001]
+        "rgb Ks" [ .15 .15 .15 ] 
+        "rgb Kd" [ .8 .8 .8 ]
 MakeNamedMaterial "OctGlossy.2" 
         "float uroughness" [ 0.00100000005 ] 
         "float vroughness" [ 0.00100000005 ] 
@@ -100,11 +99,10 @@ MakeNamedMaterial "OctGlossy.2"
         "texture Kd" [ "c4d|OctGlossy.2|Arnold_Shader-color" ] 
         "rgb Ks" [ 0.529999971 0.529999971 0.529999971 ] 
 MakeNamedMaterial "OctGlossy" 
-        "float uroughness" [ 0.100000001 ] 
-        "float vroughness" [ 0.100000001 ] 
-        "string type" [ "substrate" ] 
-        "texture Kd" [ "c4d|OctGlossy|Arnold_Shader-color" ] 
-        "rgb Ks" [ 0.529999971 0.529999971 0.529999971 ] 
+        "float roughness" [ 0.001 ] 
+        "string type" [ "uber" ] 
+        "texture Kd" [ "scaled-c4d|OctGlossy|Arnold_Shader_1-color"]
+        "rgb Ks" [.6 .6 .6]
 MakeNamedMaterial "accent-THREE" 
         "string type" [ "matte" ]  "color Kd" [0 0 0] # emitter
 
@@ -211,11 +209,10 @@ MakeNamedMaterial "accent-ONE"
         "string type" [ "matte" ]  "color Kd" [ 0 0 0] # emitter
 
 MakeNamedMaterial "Orey-jack" 
-        "string type" [ "substrate" ] 
-        "texture uroughness" [ "c4d|Orey-jack|Arnold_Shader-float" ] 
-        "texture vroughness" [ "c4d|Orey-jack|Arnold_Shader-float" ] 
-        "rgb Ks" [ 0.100000001 0.100000001 0.100000001 ] 
-        "rgb Kd" [ .2 .2 .2]
+        "string type" [ "uber" ] 
+        "texture roughness" [ "c4d|Orey-jack|Arnold_Shader-float" ] 
+        "rgb Ks" [ 0.2 .2 .2 ] 
+        "rgb Kd" [ .4 .4 .4]
 
 MakeNamedMaterial "LIGHTTOWER-1" 
         "float uroughness" [ 0.0299999993 ] 
@@ -311,11 +308,18 @@ MakeNamedMaterial "BASE ROOM"
 #        "rgb eta" [ 1.65394092 0.878498793 0.520122647 ] 
 #        "rgb k" [ 9.20430565 6.25620461 4.82674885 ] 
 #        "float roughness" [ 0.0005 ] 
-        "string type" [ "substrate" ] 
-        "rgb Kd" [ 0.4 .4 .4 ] 
+
+#        "string type" [ "substrate" ] 
+#        "rgb Kd" [ 0.4 .4 .4 ] 
+#        "rgb Ks" [ 0.5 .5 .5 ] 
+#        "float uroughness" [ 0.000500000024 ] 
+#        "float vroughness" [ 0.000500000024 ] 
+#        "texture bumpmap" "room-bump"
+
+"string type" "uber"
+        "rgb Kd" [ 0.7 .7 .7]
         "rgb Ks" [ 0.5 .5 .5 ] 
-        "float uroughness" [ 0.000500000024 ] 
-        "float vroughness" [ 0.000500000024 ] 
+        "float roughness" [ 0.001 ] 
         "texture bumpmap" "room-bump"
 
 MakeNamedMaterial "ceiling-3" 

measure-one/textures.pbrt

@@ -1,4 +1,5 @@
-#Texture "c4d|decal|Arnold_Shader-float" "float" "imagemap"  "string filename" "textures/full_color_decals grunged SMALLER_r12_c1.png"
+Texture "GL14-color" "color" "imagemap"  "string filename" "textures/labels_r27_c41_1.png"
+
 Texture "c4d|decal|Arnold_Shader-color" "color" "imagemap"  "string filename" "textures/full_color_decals grunged SMALLER_r12_c1.png"
 #Texture "c4d|decal|Arnold_Shader_1-float" "float" "imagemap"  "string filename" "textures/full_color_decals grunged SMALLER_r8_c7.png"
 #Texture "c4d|decal|Arnold_Shader_1-color" "color" "imagemap"  "string filename" "textures/full_color_decals grunged SMALLER_r8_c7.png"
@@ -11,7 +12,9 @@ Texture "c4d|OctGlossy.2|Arnold_Shader-color" "color" "imagemap"  "string filena
 #Texture "c4d|OctGlossy|Arnold_Shader-float" "float" "imagemap"  "string filename" "textures/tech decals_new_grunged_r1_c16.png"
 Texture "c4d|OctGlossy|Arnold_Shader-color" "color" "imagemap"  "string filename" "textures/tech decals_new_grunged_r1_c16.png"
 #Texture "c4d|OctGlossy|Arnold_Shader_1-float" "float" "imagemap"  "string filename" "textures/MetalScratches0011_L_1.png"
-#Texture "c4d|OctGlossy|Arnold_Shader_1-color" "color" "imagemap"  "string filename" "textures/MetalScratches0011_L_1.png"
+Texture "c4d|OctGlossy|Arnold_Shader_1-color" "color" "imagemap"  "string filename" "textures/MetalScratches0011_L_1.png"
+Texture "scaled-c4d|OctGlossy|Arnold_Shader_1-color" "color" "scale" "texture tex1" "c4d|OctGlossy|Arnold_Shader_1-color"
+   "rgb tex2" [.1 .1 .1]
 #Texture "c4d|accent-THREE|Arnold_Shader-float" "float" "imagemap"  "string filename" "textures/FENCE.png"
 #Texture "c4d|accent-THREE|Arnold_Shader-color" "color" "imagemap"  "string filename" "textures/FENCE.png"
 Texture "c4d|full_-scratched|Arnold_Shader-float" "float" "imagemap"  "string filename" "textures/DSC_1420_1_3.png"