Parcourir la source

Improvements to the measure one scenes.

Removed light source at the camera (and useless distant light source).
Switched to box filter (sharper than Gaussian, though there is some
  aliasing at the edges of bright visible emitters)
Updated reference images with 8k spp renders.
Matt Pharr il y a 6 ans
Parent
commit
1af42a7b91

BIN
images/measure-one/frame120.exr


BIN
images/measure-one/frame120.png


BIN
images/measure-one/frame180.exr


BIN
images/measure-one/frame180.png


BIN
images/measure-one/frame210.exr


BIN
images/measure-one/frame210.png


BIN
images/measure-one/frame25.exr


BIN
images/measure-one/frame25.png


BIN
images/measure-one/frame300.exr


BIN
images/measure-one/frame300.png


BIN
images/measure-one/frame35.exr


BIN
images/measure-one/frame35.png


BIN
images/measure-one/frame380.exr


BIN
images/measure-one/frame380.png


BIN
images/measure-one/frame52.exr


BIN
images/measure-one/frame52.png


BIN
images/measure-one/frame85.exr


BIN
images/measure-one/frame85.png


+ 5 - 10
measure-one/frame120.pbrt

@@ -6,27 +6,22 @@ Film "image" "string filename" ["frame120.exr"]
    "integer xresolution" [1440] "integer yresolution" [630]
 #   "integer xresolution" [960] "integer yresolution" [420]
 #   "integer xresolution" [480] "integer yresolution" [210]
-   "float scale" .25
    "float maxsampleluminance" 50
    "integer writefrequency" 120
-# imgtool convert -bloomscale .4 -bloomlevel 1 ...
+   "float scale" 0.25
+# imgtool convert -bloomlevel 1.5 -bloomscale .05
 
-PixelFilter "gaussian" "float xwidth" 1.5 "float ywidth" 1.5
+#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" 4096
-Integrator "path" "integer maxdepth" 4
+Sampler "sobol" "integer pixelsamples" 8192
+Integrator "path" "integer maxdepth" 7
 
 WorldBegin
 
-AttributeBegin
-CoordSysTransform "camera"
-LightSource "point" "color I" [30000 30000 30000]
-AttributeEnd
-
 # Default Material
 Material "matte" "rgb Kd" [.3 .3 .3]
 

+ 5 - 10
measure-one/frame180.pbrt

@@ -6,27 +6,22 @@ Film "image" "string filename" ["frame180.exr"]
    "integer xresolution" [1440] "integer yresolution" [630]
 #   "integer xresolution" [960] "integer yresolution" [420]
 #   "integer xresolution" [480] "integer yresolution" [210]
-   "float scale" .25
    "float maxsampleluminance" 50
    "integer writefrequency" 120
-# imgtool convert -bloomscale .4 -bloomlevel 1 ...
+   "float scale" 0.25
+# imgtool convert -bloomlevel 1.5 -bloomscale .05
 
-PixelFilter "gaussian" "float xwidth" 1.5 "float ywidth" 1.5
+#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" 4096
-Integrator "path" "integer maxdepth" 4
+Sampler "sobol" "integer pixelsamples" 8192
+Integrator "path" "integer maxdepth" 7
 
 WorldBegin
 
-AttributeBegin
-CoordSysTransform "camera"
-LightSource "point" "color I" [20000 20000 20000]
-AttributeEnd
-
 # Default Material
 Material "matte" "rgb Kd" [.3 .3 .3]
 

+ 5 - 10
measure-one/frame210.pbrt

@@ -6,27 +6,22 @@ Film "image" "string filename" ["frame210.exr"]
    "integer xresolution" [1440] "integer yresolution" [630]
 #   "integer xresolution" [960] "integer yresolution" [420]
 #   "integer xresolution" [480] "integer yresolution" [210]
-   "float scale" .25
    "float maxsampleluminance" 50
    "integer writefrequency" 120
-# imgtool convert -bloomscale .4 -bloomlevel 1 ...
+   "float scale" 0.25
+# imgtool convert -bloomlevel 1.5 -bloomscale .05
 
-PixelFilter "gaussian" "float xwidth" 1.5 "float ywidth" 1.5
+#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" 4096
-Integrator "path" "integer maxdepth" 4
+Sampler "sobol" "integer pixelsamples" 8192
+Integrator "path" "integer maxdepth" 7
 
 WorldBegin
 
-AttributeBegin
-CoordSysTransform "camera"
-LightSource "point" "color I" [30000 30000 30000]
-AttributeEnd
-
 # Default Material
 Material "matte" "rgb Kd" [.3 .3 .3]
 

+ 5 - 10
measure-one/frame25.pbrt

@@ -6,27 +6,22 @@ Film "image" "string filename" ["frame25.exr"]
    "integer xresolution" [1440] "integer yresolution" [630]
 #   "integer xresolution" [960] "integer yresolution" [420]
 #   "integer xresolution" [480] "integer yresolution" [210]
-   "float scale" .25
    "float maxsampleluminance" 50
    "integer writefrequency" 120
-# imgtool convert -bloomscale .4 -bloomlevel 1 ...
+   "float scale" 0.25
+# imgtool convert -bloomlevel 1.5 -bloomscale .05
 
-PixelFilter "gaussian" "float xwidth" 1.5 "float ywidth" 1.5
+#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" 4096
-Integrator "path" "integer maxdepth" 4
+Sampler "sobol" "integer pixelsamples" 8192
+Integrator "path" "integer maxdepth" 7
 
 WorldBegin
 
-AttributeBegin
-CoordSysTransform "camera"
-LightSource "point" "color I" [60000 60000 50000]
-AttributeEnd
-
 # Default Material
 Material "matte" "rgb Kd" [.3 .3 .3]
 

+ 5 - 10
measure-one/frame300.pbrt

@@ -6,26 +6,21 @@ Film "image" "string filename" ["frame300.exr"]
    "integer xresolution" [1440] "integer yresolution" [630]
 #   "integer xresolution" [960] "integer yresolution" [420]
 #   "integer xresolution" [480] "integer yresolution" [210]
-   "float scale" .25
    "float maxsampleluminance" 50
    "integer writefrequency" 120
-# imgtool convert -bloomscale .4 -bloomlevel 1 ...
+   "float scale" 0.25
+# imgtool convert -bloomlevel 1.5 -bloomscale .05
 
-PixelFilter "gaussian" "float xwidth" 1.5 "float ywidth" 1.5
+#PixelFilter "gaussian" "float xwidth" 1.5 "float ywidth" 1.5
 
 Sampler "sobol" "integer pixelsamples" [8192]
 Integrator "bdpt" "integer maxdepth" 4
 
-Sampler "sobol" "integer pixelsamples" 4096
-Integrator "path" "integer maxdepth" 4
+Sampler "sobol" "integer pixelsamples" 8192
+Integrator "path" "integer maxdepth" 7
 
 WorldBegin
 
-AttributeBegin
-CoordSysTransform "camera"
-LightSource "point" "color I" [15000 15000 15000]
-AttributeEnd
-
 # Default Material
 Material "matte" "rgb Kd" [.3 .3 .3]
 

+ 5 - 10
measure-one/frame35.pbrt

@@ -9,27 +9,22 @@ Film "image" "string filename" ["frame35.exr"]
    "integer xresolution" [1440] "integer yresolution" [630]
 #   "integer xresolution" [960] "integer yresolution" [420]
 #   "integer xresolution" [480] "integer yresolution" [210]
-   "float scale" .25
    "float maxsampleluminance" 50
    "integer writefrequency" 120
-# imgtool convert -bloomscale .4 -bloomlevel 1 ...
+   "float scale" 0.25
+# imgtool convert -bloomlevel 1.5 -bloomscale .05
 
-PixelFilter "gaussian" "float xwidth" 1.5 "float ywidth" 1.5
+#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" 4096
-Integrator "path" "integer maxdepth" 4
+Sampler "sobol" "integer pixelsamples" 8192
+Integrator "path" "integer maxdepth" 7
 
 WorldBegin
 
-AttributeBegin
-CoordSysTransform "camera"
-LightSource "point" "color I" [60000 70000 50000]
-AttributeEnd
-
 # Default Material
 Material "matte" "rgb Kd" [.3 .3 .3]
 

+ 5 - 10
measure-one/frame380.pbrt

@@ -6,27 +6,22 @@ Film "image" "string filename" ["frame380.exr"]
    "integer xresolution" [1440] "integer yresolution" [630]
 #   "integer xresolution" [960] "integer yresolution" [420]
 #   "integer xresolution" [480] "integer yresolution" [210]
-   "float scale" .25
    "float maxsampleluminance" 50
    "integer writefrequency" 120
-# imgtool convert -bloomscale .4 -bloomlevel 1 ...
+   "float scale" 0.25
+# imgtool convert -bloomlevel 1.5 -bloomscale .05
 
-PixelFilter "gaussian" "float xwidth" 1.5 "float ywidth" 1.5
+#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" 4096
-Integrator "path" "integer maxdepth" 4
+Sampler "sobol" "integer pixelsamples" 8192
+Integrator "path" "integer maxdepth" 7
 
 WorldBegin
 
-AttributeBegin
-CoordSysTransform "camera"
-LightSource "point" "color I" [10000 10000 10000]
-AttributeEnd
-
 # Default Material
 Material "matte" "rgb Kd" [.3 .3 .3]
 

+ 5 - 10
measure-one/frame52.pbrt

@@ -6,27 +6,22 @@ Film "image" "string filename" ["frame52.exr"]
    "integer xresolution" [1440] "integer yresolution" [630]
 #   "integer xresolution" [960] "integer yresolution" [420]
 #   "integer xresolution" [480] "integer yresolution" [210]
-   "float scale" .25
    "float maxsampleluminance" 50
    "integer writefrequency" 120
-# imgtool convert -bloomscale .4 -bloomlevel 1 ...
+   "float scale" 0.25
+# imgtool convert -bloomlevel 1.5 -bloomscale .05
 
-PixelFilter "gaussian" "float xwidth" 1.5 "float ywidth" 1.5
+#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" 4096
-Integrator "path" "integer maxdepth" 4
+Sampler "sobol" "integer pixelsamples" 8192
+Integrator "path" "integer maxdepth" 7
 
 WorldBegin
 
-AttributeBegin
-CoordSysTransform "camera"
-LightSource "point" "color I" [60000 60000 50000]
-AttributeEnd
-
 # Default Material
 Material "matte" "rgb Kd" [.3 .3 .3]
 

+ 5 - 10
measure-one/frame85.pbrt

@@ -6,27 +6,22 @@ Film "image" "string filename" ["frame85.exr"]
    "integer xresolution" [1440] "integer yresolution" [630]
 #   "integer xresolution" [960] "integer yresolution" [420]
 #   "integer xresolution" [480] "integer yresolution" [210]
-   "float scale" .25
    "float maxsampleluminance" 50
    "integer writefrequency" 120
-# imgtool convert -bloomscale .4 -bloomlevel 1 ...
+   "float scale" 0.25
+# imgtool convert -bloomlevel 1.5 -bloomscale .05
 
-PixelFilter "gaussian" "float xwidth" 1.5 "float ywidth" 1.5
+#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" 4096
-Integrator "path" "integer maxdepth" 4
+Sampler "sobol" "integer pixelsamples" 8192
+Integrator "path" "integer maxdepth" 7
 
 WorldBegin
 
-AttributeBegin
-CoordSysTransform "camera"
-LightSource "point" "color I" [60000 60000 50000]
-AttributeEnd
-
 # Default Material
 Material "matte" "rgb Kd" [.3 .3 .3]
 

+ 0 - 8
measure-one/geometry-f120.pbrt

@@ -89366,14 +89366,6 @@ AttributeBegin
     # SOUND
 AttributeEnd
 
-AttributeBegin
-    # OctaneDayLight
-    LightSource "distant" 
-            "point from" [ 0 0 0 ] 
-            "point to" [ 0 0 1 ] 
-            "rgb L" [ 1 1 1 ] 
-AttributeEnd
-
 AttributeBegin
     # TWO MEASURES-dips
     ConcatTransform [ 0.00271272962 0.0849694312 0.996379852 0 0.000533379323 0.99638325 -0.0849711746 0 -0.999996185 0.000761952193 0.00265759742 0 786.106262 -67.0769348 -0.394237399 1  ]

+ 0 - 8
measure-one/geometry-f180.pbrt

@@ -89386,14 +89386,6 @@ AttributeBegin
     # SOUND
 AttributeEnd
 
-AttributeBegin
-    # OctaneDayLight
-    LightSource "distant" 
-            "point from" [ 0 0 0 ] 
-            "point to" [ 0 0 1 ] 
-            "rgb L" [ 1 1 1 ] 
-AttributeEnd
-
 AttributeBegin
     # TWO MEASURES-dips
     ConcatTransform [ 0.00218785694 -0.128790095 0.991669476 0 -0.0168438237 0.991526425 0.128808677 0 -0.999855757 -0.0169853214 -4.28564552e-16 0 385.223511 -75.51297 0 1  ]

+ 0 - 8
measure-one/geometry-f210.pbrt

@@ -89386,14 +89386,6 @@ AttributeBegin
     # SOUND
 AttributeEnd
 
-AttributeBegin
-    # OctaneDayLight
-    LightSource "distant" 
-            "point from" [ 0 0 0 ] 
-            "point to" [ 0 0 1 ] 
-            "rgb L" [ 1 1 1 ] 
-AttributeEnd
-
 AttributeBegin
     # TWO MEASURES-dips
     ConcatTransform [ 0.000669885019 -0.141070098 0.989999413 0 -0.00470105512 0.989988208 0.141071677 0 -0.999988735 -0.00474854326 -4.28621541e-16 0 184.923203 -76.8618927 0 1  ]

+ 0 - 8
measure-one/geometry-f25.pbrt

@@ -89366,14 +89366,6 @@ AttributeBegin
     # SOUND
 AttributeEnd
 
-AttributeBegin
-    # OctaneDayLight
-    LightSource "distant" 
-            "point from" [ 0 0 0 ] 
-            "point to" [ 0 0 1 ] 
-            "rgb L" [ 1 1 1 ] 
-AttributeEnd
-
 AttributeBegin
     # TWO MEASURES-dips
     ConcatTransform [ -0.000120149161 0.0222097505 0.999753296 0 -0.00540833455 0.999738693 -0.0222100746 0 -0.999985397 -0.00540966913 -4.28620112e-16 0 1420.1084 -58.3011436 0 1  ]

+ 0 - 8
measure-one/geometry-f300.pbrt

@@ -89386,14 +89386,6 @@ AttributeBegin
     # SOUND
 AttributeEnd
 
-AttributeBegin
-    # OctaneDayLight
-    LightSource "distant" 
-            "point from" [ 0 0 0 ] 
-            "point to" [ 0 0 1 ] 
-            "rgb L" [ 1 1 1 ] 
-AttributeEnd
-
 AttributeBegin
     # TWO MEASURES-dips
     ConcatTransform [ 0.000321523432 0.0727861971 0.997347534 0 0.0044056084 0.997337759 -0.0727869123 0 -0.999990225 0.00441732537 1.3477173e-15 0 -415.977692 -69.1402817 0 1  ]

+ 0 - 8
measure-one/geometry-f380.pbrt

@@ -89386,14 +89386,6 @@ AttributeBegin
     # SOUND
 AttributeEnd
 
-AttributeBegin
-    # OctaneDayLight
-    LightSource "distant" 
-            "point from" [ 0 0 0 ] 
-            "point to" [ 0 0 1 ] 
-            "rgb L" [ 1 1 1 ] 
-AttributeEnd
-
 AttributeBegin
     # TWO MEASURES-dips
     ConcatTransform [ 7.80642076e-05 0.0192711186 0.999814272 0 0.00405005412 0.999806106 -0.0192712769 0 -0.999991775 0.00405080616 -4.28622865e-16 0 -950.111816 -64.2645645 0 1  ]

+ 0 - 8
measure-one/geometry-f52.pbrt

@@ -89576,14 +89576,6 @@ AttributeBegin
     # SOUND
 AttributeEnd
 
-AttributeBegin
-    # OctaneDayLight
-    LightSource "distant" 
-            "point from" [ 0 0 0 ] 
-            "point to" [ 0 0 1 ] 
-            "rgb L" [ 1 1 1 ] 
-AttributeEnd
-
 AttributeBegin
     # TWO MEASURES-dips
     ConcatTransform [ -0.000396698131 0.0733302385 0.997307658 0 -0.00539510418 0.997293055 -0.0733313113 0 -0.999985397 -0.00540966913 -4.28620112e-16 0 1239.83813 -59.8851814 0 1  ]

+ 0 - 8
measure-one/geometry-f85.pbrt

@@ -89366,14 +89366,6 @@ AttributeBegin
     # SOUND
 AttributeEnd
 
-AttributeBegin
-    # OctaneDayLight
-    LightSource "distant" 
-            "point from" [ 0 0 0 ] 
-            "point to" [ 0 0 1 ] 
-            "rgb L" [ 1 1 1 ] 
-AttributeEnd
-
 AttributeBegin
     # TWO MEASURES-dips
     ConcatTransform [ -0.000646809873 0.119563766 0.992826343 0 -0.00537086185 0.992811799 -0.119565517 0 -0.999985397 -0.00540966913 -4.28620112e-16 0 1019.50781 -63.1789398 0 1  ]