Browse Source

Update scenes for single-valued "blackbody" specification.

Matt Pharr 2 years ago
parent
commit
577004e0db

+ 16 - 14
barcelona-pavilion/pavilion-night.pbrt

@@ -1,10 +1,9 @@
-
 Film "rgb"
-    "float maxcomponentvalue" [ 50 ]
-    "float scale" [ 2.5 ]
-    "string filename" [ "pavilion-night.exr" ]
-    "integer yresolution" [ 850 ]
     "integer xresolution" [ 1600 ]
+    "integer yresolution" [ 850 ]
+    "string filename" [ "pavilion-night.exr" ]
+    "float scale" [ 2.5 ]
+    "float maxcomponentvalue" [ 50 ]
 Scale -1 1 1
 LookAt -10 2.25 10
     7 1.75 -3
@@ -13,13 +12,13 @@ LookAt -10 2.25 10
 #LookAt -10 100 10    -10 0 10  1 0 0
 #Camera "perspective" "float fov" 60
 Camera "perspective"
-    "float lensradius" [ 0.01 ]
-    "float focaldistance" [ 15 ]
     "float fov" [ 45 ]
-
+    "float focaldistance" [ 15 ]
+    "float lensradius" [ 0.01 ]
 Sampler "halton"
     "integer pixelsamples" [ 512 ]
 
+
 WorldBegin
 
 
@@ -28,14 +27,15 @@ AttributeBegin
     Rotate -140 0 1 0
     Rotate -90 1 0 0
     LightSource "infinite"
-        "float scale" [0.5]
-        "string filename" "textures/night.exr"
+        "string filename" [ "textures/night.exr" ]
+        "float scale" [ 0.5 ]
 AttributeEnd
 # back room light; not directly visible
 
 AttributeBegin
     AreaLightSource "diffuse"
-        "blackbody L" [ 3500 750 ]
+        "float scale" [750]
+        "blackbody L" [ 3500 ]
     Translate 10 4 2.5
     Shape "sphere"
         "float radius" [ 0.1 ]
@@ -44,7 +44,8 @@ AttributeEnd
 
 AttributeBegin
     AreaLightSource "diffuse"
-        "blackbody L" [ 3500 75 ]
+        "float scale" [75]
+        "blackbody L" [ 3500 ]
     Translate 12 4 5.5
     Shape "sphere"
         "float radius" [ 0.05 ]
@@ -52,14 +53,15 @@ AttributeEnd
 
 AttributeBegin
     # Candles inside floating wood lanterns
-    AreaLightSource "diffuse"
-        "blackbody L" [ 2500 25000 ]
     # Lights in lanterns that aren't visible in the default view
     #    Shape "plymesh" "string filename" "geometry/mesh_00003.ply" 
     #    Shape "plymesh" "string filename" "geometry/mesh_00015.ply" 
     #    Shape "plymesh" "string filename" "geometry/mesh_00017.ply" 
     #    Shape "plymesh" "string filename" "geometry/mesh_00021.ply" 
     #    Shape "plymesh" "string filename" "geometry/mesh_00023.ply" 
+    AreaLightSource "diffuse"
+        "float scale" [25000]
+        "blackbody L" [ 2500 ]
     Shape "plymesh"
         "string filename" [ "geometry/mesh_00005.ply" ]
 AttributeEnd

+ 2 - 2
killeroos/killeroo-coated-gold.pbrt

@@ -7,8 +7,8 @@ Film "rgb"
     "string filename" [ "killeroo-coated-gold.exr" ]
     "integer yresolution" [ 1026 ]
     "integer xresolution" [ 1368 ]
-Sampler "sobol"
-    "integer pixelsamples" [ 2048 ]
+Sampler "halton"
+    "integer pixelsamples" [ 512 ]
 
 
 WorldBegin

+ 2 - 2
killeroos/killeroo-gold.pbrt

@@ -7,8 +7,8 @@ Film "rgb"
     "string filename" [ "killeroo-gold.exr" ]
     "integer yresolution" [ 1026 ]
     "integer xresolution" [ 1368 ]
-Sampler "sobol"
-    "integer pixelsamples" [ 2048 ]
+Sampler "halton"
+    "integer pixelsamples" [ 512 ]
 
 
 WorldBegin

+ 39 - 34
villa/villa-lights-on.pbrt

@@ -2,15 +2,18 @@
 # Exported by pbrtBlend Blender Exporter
 Scale -1 1 1
 # account for fixed lookat bug...
-LookAt 12.9502439 7.38090897 3.8515029
-        13.9207726 7.1467042 3.79472995
-        0.0551870018 -0.013328 0.998386979
-Camera "perspective" "float fov" [ 47 ] 
-Film "rgb" "integer xresolution" [ 1000 ] 
-    "integer yresolution" [ 444 ] 
-    "float scale" [ 1.60000002 ] 
-    "string filename" [ "villa-lights-on.exr" ] 
-Sampler "sobol" "integer pixelsamples" [ 1024 ] 
+LookAt 12.950244 7.380909 3.851503
+    13.920773 7.146704 3.79473
+    0.055187 -0.013328 0.998387
+Camera "perspective"
+    "float fov" [ 47 ]
+Film "rgb"
+    "string filename" [ "villa-lights-on.exr" ]
+    "float scale" [ 1.6 ]
+    "integer yresolution" [ 444 ]
+    "integer xresolution" [ 1000 ]
+Sampler "sobol"
+    "integer pixelsamples" [ 1024 ]
 
 
 WorldBegin
@@ -18,33 +21,35 @@ WorldBegin
 # metal lamp
 # kitchen counter
 LightSource "spot"
-    "float coneangle" [ 50 ] 
-    "float conedeltaangle" [ 20 ] 
-    "point3 from" [ 16.8015881 8.15809155 4.18727207 ] 
-    "point3 to" [ 16.7868576 8.15949154 3.0999999 ] 
-    "blackbody I" [4000 30]
-
-LightSource "spot" "float coneangle" [ 60 ] 
-    "point3 from" [ 21.2768555 7.20041895 3.96000004 ] 
-    "point3 to" [ 21.2768555 7.20041895 2.96000004 ] 
-    "blackbody I" [4000 1]
-
+    "float scale" [30]
+    "blackbody I" [ 4000 ]
+    "point3 to" [ 16.786858 8.159492 3.1 ]
+    "point3 from" [ 16.801588 8.158092 4.187272 ]
+    "float conedeltaangle" [ 20 ]
+    "float coneangle" [ 50 ]
 # table
-LightSource "spot" "float coneangle" [ 60 ] 
-    "point3 from" [ 22.1166172 7.18542719 3.96000004 ] 
-    "point3 to" [ 22.1166172 7.18542719 2.96000004 ] 
-    "blackbody I" [4000 1]
- 
-LightSource "spot" "float coneangle" [ 60 ] 
-    "point3 from" [ 23.0585995 7.18669796 3.96000004 ] 
-    "point3 to" [ 23.0585995 7.18669796 2.96000004 ] 
-    "blackbody I" [4000 1]
- 
+LightSource "spot"
+    "blackbody I" [ 4000 ]
+    "point3 to" [ 21.276855 7.200419 2.96 ]
+    "point3 from" [ 21.276855 7.200419 3.96 ]
+    "float coneangle" [ 60 ]
+LightSource "spot"
+    "blackbody I" [ 4000 ]
+    "point3 to" [ 22.116617 7.185427 2.96 ]
+    "point3 from" [ 22.116617 7.185427 3.96 ]
+    "float coneangle" [ 60 ]
+LightSource "spot"
+    "blackbody I" [ 4000 ]
+    "point3 to" [ 23.0586 7.186698 2.96 ]
+    "point3 from" [ 23.0586 7.186698 3.96 ]
+    "float coneangle" [ 60 ]
 Include "materials.pbrt"
 Include "geometry.pbrt"
 LightSource "point"
-    "point3 from" [ 23.5658073 2.462955 4.3499999 ] 
-    "blackbody I" [4000 10]
+    "float scale" [10]
+    "blackbody I" [ 4000 ]
+    "point3 from" [ 23.565807 2.462955 4.35 ]
 LightSource "point"
-    "point3 from" [ 21.3179016 2.46144104 4.3499999 ] 
-    "blackbody I" [4000 10]
+    "float scale" [10]
+    "blackbody I" [ 4000 ]
+    "point3 from" [ 21.317902 2.461441 4.35 ]

File diff suppressed because it is too large
+ 7870 - 7589
zero-day/geometry/geometry-f120.pbrt


File diff suppressed because it is too large
+ 7890 - 7609
zero-day/geometry/geometry-f180.pbrt


File diff suppressed because it is too large
+ 7890 - 7609
zero-day/geometry/geometry-f210.pbrt


File diff suppressed because it is too large
+ 7870 - 7589
zero-day/geometry/geometry-f25.pbrt


File diff suppressed because it is too large
+ 7890 - 7609
zero-day/geometry/geometry-f300.pbrt


File diff suppressed because it is too large
+ 7869 - 7590
zero-day/geometry/geometry-f35.pbrt


File diff suppressed because it is too large
+ 7890 - 7609
zero-day/geometry/geometry-f380.pbrt


File diff suppressed because it is too large
+ 24164 - 16247
zero-day/geometry/geometry-f52.pbrt


File diff suppressed because it is too large
+ 7884 - 7589
zero-day/geometry/geometry-f85.pbrt