wip, change a bunch of scenes to have a 'main' camera

gillett-hernandez · Jun 18, 2024 · 703944c · 703944c
1 parent 755f9c2
commit 703944c
Show file tree

Hide file tree

Showing 40 changed files with 186 additions and 378 deletions.
diff --git a/data/config.toml b/data/config.toml
@@ -1,218 +1,12 @@
 default_scene_file = "data/scenes/cornell_box.toml"
 
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "distant camera"
-# look_from = [-100, 0, 0]
-# look_at = [0, 0, 0]
-# aperture_size = 0.03
-# vfov = 20
-
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "cube camera"
-# look_from = [4, 3, 1]
-# look_at = [0, 0, 0]
-# aperture_size = 0.2
-# focal_distance = 5
-# vfov = 35.4
-
-
-
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "sun test camera"
-# look_from = [-5.0, 0.0, 0.4]
-# look_at = [0.0, 0.0, -0.7]
-# aperture_size = 0.001
-# focal_distance = 5.0
-# vfov = 16.2
-
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "wideangle sun test camera reverse"
-# look_from = [5, 0, 0]
-# look_at = [0.0, 0.0, -0.4]
-# aperture_size = 0.02
-# focal_distance = 5.0
-# vfov = 90.0
-
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "wideangle sun test camera side"
-# look_from = [0, -5, 0]
-# look_at = [0.0, 0.0, -0.4]
-# aperture_size = 0.02
-# focal_distance = 5.0
-# vfov = 90.0
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "closeup camera"
-# look_from = [-1, 0, 0]
-# look_at = [0, 0, 0]
-# aperture_size = 0.03
-# focal_distance = 1.0
-# vfov = 45
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "closeup zoom camera"
-# look_from = [-1, 0, 0]
-# look_at = [0.0, 0.0, -0.1]
-# aperture_size = 0.03
-# focal_distance = 1.0
-# vfov = 5
-
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "veach mis camera"
-# look_from = [-10.0, 0.0, 3.0]
-# look_at = [0.0, 0.0, 0.0]
-# aperture_size = 0.001
-# focal_distance = 10.0
-# vfov = 60.8
-
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "wideangle sun test camera"
-# look_from = [-5.0, 0.0, 0.5]
-# look_at = [0.0, 0.0, 0.4]
-# aperture_size = 0.1
-# focal_distance = 5.0
-# vfov = 45.0
-
-
-
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "debug"
-# look_from = [-1.3, 0.0, 0.0]
-# look_at = [0.0, 0.0, 0.0]
-# aperture_size = 0.02
-# focal_distance = 5.0
-# vfov = 60.0
-
-
-# somewhat focused
-# [[cameras]]
-# type="RealisticCamera"
-# name = "petzval kodak"
-# lens_spec = "data/cameras/petzval_kodak.txt"
-# look_from = [5.0, -10.0, 0.1]
-# look_at = [0.0, 0.0, 0.0]
-# focal_adjustment = 27.0
-# fstop = 4.0
-# sensor_size = 35.0
-# radial_bins = 512
-# wavelength_bins = 512
-# [cameras.aperture]
-# type = "Bladed"
-# blades = 6
-# sharpness = 2.0
-
-# [[cameras]]
-# type="RealisticCamera"
-# name = "petzval kodak cornell"
-# lens_spec = "data/cameras/petzval_kodak.txt"
-# look_from = [ -3.8, 0.278, 0.273]
-# look_at = [0.0, 0.278, 0.273]
-# focal_adjustment = 23.0
-# fstop = 4.0
-# sensor_size = 35.0
-# radial_bins = 512
-# wavelength_bins = 512
-# [cameras.aperture]
-# type = "Bladed"
-# blades = 6
-# sharpness = 2.0
-
-
-# [[cameras]]
-# type="RealisticCamera"
-# name = "wideangle 2"
-# lens_spec = "data/cameras/wideangle_2.txt"
-# look_from = [-35.0, 0.0, -0.5]
-# look_at = [0.0, 0.0, -0.5]
-# focal_adjustment = 0.0
-# fstop = 6.0
-# sensor_size = 35.0
-# radial_bins = 512
-# wavelength_bins = 512
-# [cameras.aperture]
-# type = "Bladed"
-# blades = 6
-# sharpness = 2.0
-
-
-# # seems really hard to focus
-# [[cameras]]
-# type="RealisticCamera"
-# name = "simple 2"
-# lens_spec = "data/cameras/simple_2.txt"
-# look_from = [-2.0, 0.0, 0.0]
-# look_at = [0.0, 0.0, -0.5]
-# focal_adjustment = 5.0
-# fstop = 6.0
-# sensor_size = 35.0
-# radial_bins = 512
-# wavelength_bins = 512
-# [cameras.aperture]
-# type = "Bladed"
-# blades = 6
-# sharpness = 2.0
-
-
-# [[cameras]]
-# type="RealisticCamera"
-# name = "telephoto"
-# lens_spec = "data/cameras/kreitzer_telephoto.txt"
-# look_from = [0.0, -20.0, 1.0]
-# look_at = [0.0, 0.0, 0.0]
-# focal_adjustment = 50.0
-# fstop = 10.0
-# sensor_size = 100.0
-# radial_bins = 256
-# wavelength_bins = 256
-# [cameras.aperture]
-# type = "Bladed"
-# blades = 6
-# sharpness = 2.0
-
-
-# [[cameras]]
-# type = "PanoramaCamera"
-# name = "panorama"
-# look_from = [0.0, 0.0, -0.5]
-# look_at = [1.0, 0.0, -0.5]
-# fov = [360, 180]
-
-# [[cameras]]
-# type = "SimpleCamera"
-# name = "simple camera"
-# look_from = [-5, 0, 0]
-# look_at = [0, 0, 0]
-# aperture_size = 0.01
-# focal_distance = 5.0
-# vfov = 30.0
-
-
 [renderer]
 # naive is 23.6 mrays/sec
 # type="Naive"
 type = "Tiled"
 # tiled at 64 64 is 23.2 mrays/sec
 # tiled at 32 32 is 23.9 mrays/sec
 tile_size = [32, 32]
-# type="Preview"
 # selected_preview_film_id = 0
 
 [[render_settings]]
@@ -222,32 +16,14 @@ min_samples = 32
 min_bounces = 1
 max_bounces = 12
 hwss = false
-# camera_id = "simple camera"
-# camera_id = "caustic test camera"
-# camera_id = "wideangle sun test camera"
-# camera_id = "sun test camera"
-# camera_id = "blackbox camera"
-# camera_id = "closeup camera"
-# camera_id = "panorama"
-# camera_id = "cornell camera"
-camera_id = "true cornell camera"
-# camera_id = "distant camera"
-# camera_id = "veach mis camera"
-# camera_id = "wideangle sun test camera side"
-
-# realistic cameras
-# camera_id = "telephoto"
-# camera_id = "simple 2"
-# camera_id = "petzval kodak"
-# camera_id = "petzval kodak cornell"
+camera_id = "main"
 russian_roulette = true
 only_direct = false
 premultiply = 10.0
 # wavelength_bounds = [380.0, 750.0]
 # wavelength_bounds = [500.0, 510.0]
 [render_settings.colorspace_settings]
 type = "Rec2020"
-
 [render_settings.tonemap_settings]
 type = "Clamp"
 exposure = 1.0
@@ -271,9 +47,9 @@ medium_aware = false
 # selected_pair = [1,2]
 # selected_pair = [1,1]
 [render_settings.resolution]
-width = 2560
-height = 1440
-# width = 1024
-# height = 1024
+# width = 2560
+# height = 1440
+width = 1024
+height = 1024
 # width = 4096
 # height = 2048
diff --git a/data/config_test_blackbox.toml b/data/config_test_blackbox.toml
@@ -7,14 +7,6 @@ default_scene_file = "data/scenes/test_blackbox.toml"
 type="Naive"
 
 
-[[cameras]]
-type="SimpleCamera"
-name = "camera"
-look_from = [-0.8, 0.0, 0.0]
-look_at = [0, 0, 0]
-aperture_size = 0.03
-focal_distance = 0.8
-vfov = 90
 
 [[render_settings]]
 threads = 22
@@ -37,7 +29,6 @@ width = 1024
 height = 1024
 
 
-
 [[render_settings]]
 threads = 22
 filename = "test_blackbox_pt"

diff --git a/data/config_test_candela_calibration.toml b/data/config_test_candela_calibration.toml
@@ -1,16 +1,6 @@
 default_scene_file = "data/scenes/candela_calibration.toml"
 
 
-[[cameras]]
-type="SimpleCamera"
-name = "candela"
-look_from = [ -5.0, 0.0, 0.0]
-look_at = [0.0, 0.0, 0.0]
-aperture_size = 0.03
-focal_distance = 5.0
-vfov = 27.8
-
-
 [renderer]
 type="Naive"
 # type="Preview"

diff --git a/data/config_test_cornell_box.toml b/data/config_test_cornell_box.toml
@@ -1,13 +1,5 @@
 default_scene_file = "data/scenes/cornell_box.toml"
 
-[[cameras]]
-type="SimpleCamera"
-name = "true cornell camera"
-look_from = [ -0.8, 0.278, 0.273]
-look_at = [0.0, 0.278, 0.273]
-aperture_size = 0.01
-focal_distance = 1.1
-vfov = 37.8
 
 
 [renderer]

diff --git a/data/config_test_lighting_hdri.toml b/data/config_test_lighting_hdri.toml
@@ -4,16 +4,6 @@ default_scene_file = "data/scenes/hdri_test.toml"
 type = "Preview"
 selected_preview_film_id = 0
 
-
-[[cameras]]
-type="SimpleCamera"
-name = "camera"
-look_from = [-1.5, 0.0, 0.0]
-look_at = [0, 0, 0]
-aperture_size = 0.03
-focal_distance = 1.0
-vfov = 90
-
 [[render_settings]]
 threads = 22
 filename = "test_lighting_hdri_pt"

diff --git a/data/config_test_lighting_north.toml b/data/config_test_lighting_north.toml
@@ -4,16 +4,6 @@ default_scene_file = "data/scenes/test_lighting_north.toml"
 type = "Preview"
 selected_preview_film_id = 0
 
-
-[[cameras]]
-type="SimpleCamera"
-name = "camera"
-look_from = [-1.5, 0.0, 0.0]
-look_at = [0, 0, 0]
-aperture_size = 0.001
-focal_distance = 1.5
-vfov = 90
-
 [[render_settings]]
 threads = 1
 filename = "test_lighting_north_pt"

diff --git a/data/config_test_whitefurnace.toml b/data/config_test_whitefurnace.toml
@@ -4,16 +4,6 @@ type="Naive"
 # type = "Preview"
 # selected_preview_film_id = 0
 
-
-[[cameras]]
-type="SimpleCamera"
-name = "camera"
-look_from = [-1.5, 0.0, 0.0]
-look_at = [0, 0, 0]
-aperture_size = 0.03
-focal_distance = 1.0
-vfov = 90
-
 [[render_settings]]
 threads = 22
 filename = "test_whitefurnace_pt"

diff --git a/data/raymarch_config.toml b/data/raymarch_config.toml
@@ -1,24 +1,5 @@
 default_scene_file = "data/scenes/raymarch.toml"
 
-
-[[cameras]]
-type = "SimpleCamera"
-name = "distant camera"
-look_from = [-100, 0, 0]
-look_at = [0, 0, 0]
-aperture_size = 0.03
-vfov = 20
-
-[[cameras]]
-type = "SimpleCamera"
-name = "simple camera"
-look_from = [5, 0, 0]
-look_at = [0, 0, 0]
-aperture_size = 0.04
-focal_distance = 5.0
-vfov = 35.4
-
-
 [renderer]
 # type="Naive"
 type = "Preview"