Skip to content

Commit 229d8ea

Browse files
laurelkeyslaurelkeys
authored
Refactor the vignette post-processing stage
1 parent f21d6dc commit 229d8ea

23 files changed

+1055
-42
lines changed

‎sandbox/tests/test scenes/vignette/01 - white square.appleseed‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- File generated by appleseed.dll version 2.1.0-beta (SSE SSE2 SSE3 SSSE3 SSE4.1 SSE4.2). -->
3+
<project format_revision="34">
4+
<scene>
5+
<camera name="camera" model="pinhole_camera">
6+
<parameter name="controller_target" value="0.271353 0.535784 0.281539" />
7+
<parameter name="film_dimensions" value="0.025 0.025" />
8+
<parameter name="focal_length" value="0.035" />
9+
<parameter name="near_z" value="-0.001" />
10+
<parameter name="shift_x" value="0.0" />
11+
<parameter name="shift_y" value="0.0" />
12+
<parameter name="shutter_close_begin_time" value="1.0" />
13+
<parameter name="shutter_close_end_time" value="1.0" />
14+
<parameter name="shutter_open_begin_time" value="0.0" />
15+
<parameter name="shutter_open_end_time" value="0.0" />
16+
<transform time="0">
17+
<matrix>
18+
0.66288744644269126 -0.03542056809345452 -0.74788075032362289 -0.32733206567799983
19+
0.00000000000000000 0.99888033921342245 -0.04730822267722756 0.49791368377534367
20+
0.74871906169716851 0.03136002692624960 0.66214523736299469 0.81159206523313132
21+
0.00000000000000000 0.00000000000000000 0.00000000000000000 1.00000000000000000
22+
</matrix>
23+
</transform>
24+
</camera>
25+
<color name="50%">
26+
<parameter name="color_space" value="srgb" />
27+
<parameter name="multiplier" value="1.0" />
28+
<parameter name="wavelength_range" value="400.0 700.0" />
29+
<values>
30+
0.500000000 0.500000000 0.500000000
31+
</values>
32+
<alpha>
33+
1.000000000
34+
</alpha>
35+
</color>
36+
<color name="80%">
37+
<parameter name="color_space" value="srgb" />
38+
<parameter name="multiplier" value="1.0" />
39+
<parameter name="wavelength_range" value="400.0 700.0" />
40+
<values>
41+
0.800000012 0.800000012 0.800000012
42+
</values>
43+
<alpha>
44+
1.000000000
45+
</alpha>
46+
</color>
47+
<color name="white">
48+
<parameter name="color_space" value="srgb" />
49+
<parameter name="multiplier" value="1.0" />
50+
<parameter name="wavelength_range" value="400.0 700.0" />
51+
<values>
52+
1.000000000 1.000000000 1.000000000
53+
</values>
54+
<alpha>
55+
1.000000000
56+
</alpha>
57+
</color>
58+
<environment_shader name="environment_shader" model="background_environment_shader">
59+
<parameter name="alpha" value="1.0" />
60+
<parameter name="color" value="white" />
61+
</environment_shader>
62+
<environment name="environment" model="generic_environment">
63+
<parameter name="environment_shader" value="environment_shader" />
64+
</environment>
65+
</scene>
66+
<output>
67+
<frame name="beauty">
68+
<parameter name="camera" value="camera" />
69+
<parameter name="resolution" value="512 512" />
70+
<post_processing_stages>
71+
<post_processing_stage name="vignetting" model="vignette_post_processing_stage">
72+
<parameter name="anisotropy" value="0.0" />
73+
<parameter name="intensity" value="1.0" />
74+
<parameter name="order" value="1" />
75+
</post_processing_stage>
76+
</post_processing_stages>
77+
</frame>
78+
</output>
79+
<configurations>
80+
<configuration name="final" base="base_final" />
81+
<configuration name="interactive" base="base_interactive" />
82+
</configurations>
83+
</project>

‎sandbox/tests/test scenes/vignette/02 - white rectangle.appleseed‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- File generated by appleseed.dll version 2.1.0-beta (SSE SSE2 SSE3 SSSE3 SSE4.1 SSE4.2). -->
3+
<project format_revision="34">
4+
<scene>
5+
<camera name="camera" model="pinhole_camera">
6+
<parameter name="controller_target" value="0.271353 0.535784 0.281539" />
7+
<parameter name="film_dimensions" value="0.025 0.025" />
8+
<parameter name="focal_length" value="0.035" />
9+
<parameter name="near_z" value="-0.001" />
10+
<parameter name="shift_x" value="0.0" />
11+
<parameter name="shift_y" value="0.0" />
12+
<parameter name="shutter_close_begin_time" value="1.0" />
13+
<parameter name="shutter_close_end_time" value="1.0" />
14+
<parameter name="shutter_open_begin_time" value="0.0" />
15+
<parameter name="shutter_open_end_time" value="0.0" />
16+
<transform time="0">
17+
<matrix>
18+
0.66288744644269126 -0.03542056809345452 -0.74788075032362289 -0.32733206567799983
19+
0.00000000000000000 0.99888033921342245 -0.04730822267722756 0.49791368377534367
20+
0.74871906169716851 0.03136002692624960 0.66214523736299469 0.81159206523313132
21+
0.00000000000000000 0.00000000000000000 0.00000000000000000 1.00000000000000000
22+
</matrix>
23+
</transform>
24+
</camera>
25+
<color name="50%">
26+
<parameter name="color_space" value="srgb" />
27+
<parameter name="multiplier" value="1.0" />
28+
<parameter name="wavelength_range" value="400.0 700.0" />
29+
<values>
30+
0.500000000 0.500000000 0.500000000
31+
</values>
32+
<alpha>
33+
1.000000000
34+
</alpha>
35+
</color>
36+
<color name="80%">
37+
<parameter name="color_space" value="srgb" />
38+
<parameter name="multiplier" value="1.0" />
39+
<parameter name="wavelength_range" value="400.0 700.0" />
40+
<values>
41+
0.800000012 0.800000012 0.800000012
42+
</values>
43+
<alpha>
44+
1.000000000
45+
</alpha>
46+
</color>
47+
<color name="white">
48+
<parameter name="color_space" value="srgb" />
49+
<parameter name="multiplier" value="1.0" />
50+
<parameter name="wavelength_range" value="400.0 700.0" />
51+
<values>
52+
1.000000000 1.000000000 1.000000000
53+
</values>
54+
<alpha>
55+
1.000000000
56+
</alpha>
57+
</color>
58+
<environment_shader name="environment_shader" model="background_environment_shader">
59+
<parameter name="alpha" value="1.0" />
60+
<parameter name="color" value="white" />
61+
</environment_shader>
62+
<environment name="environment" model="generic_environment">
63+
<parameter name="environment_shader" value="environment_shader" />
64+
</environment>
65+
</scene>
66+
<output>
67+
<frame name="beauty">
68+
<parameter name="camera" value="camera" />
69+
<parameter name="denoise_scales" value="3" />
70+
<parameter name="denoiser" value="off" />
71+
<parameter name="enable_dithering" value="true" />
72+
<parameter name="filter" value="blackman-harris" />
73+
<parameter name="filter_size" value="1.5" />
74+
<parameter name="mark_invalid_pixels" value="false" />
75+
<parameter name="noise_seed" value="0" />
76+
<parameter name="patch_distance_threshold" value="1.0" />
77+
<parameter name="prefilter_spikes" value="true" />
78+
<parameter name="random_pixel_order" value="true" />
79+
<parameter name="resolution" value="400 200" />
80+
<parameter name="skip_denoised" value="true" />
81+
<parameter name="spike_threshold" value="2.0" />
82+
<post_processing_stages>
83+
<post_processing_stage name="vignetting" model="vignette_post_processing_stage">
84+
<parameter name="anisotropy" value="0.0" />
85+
<parameter name="intensity" value="1.0" />
86+
<parameter name="order" value="1" />
87+
</post_processing_stage>
88+
</post_processing_stages>
89+
</frame>
90+
</output>
91+
<configurations>
92+
<configuration name="final" base="base_final" />
93+
<configuration name="interactive" base="base_interactive" />
94+
</configurations>
95+
</project>

‎sandbox/tests/test scenes/vignette/03 - white rectangle small.appleseed‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- File generated by appleseed.dll version 2.1.0-beta (SSE SSE2 SSE3 SSSE3 SSE4.1 SSE4.2). -->
3+
<project format_revision="34">
4+
<scene>
5+
<camera name="camera" model="pinhole_camera">
6+
<parameter name="controller_target" value="0.271353 0.535784 0.281539" />
7+
<parameter name="film_dimensions" value="0.025 0.025" />
8+
<parameter name="focal_length" value="0.035" />
9+
<parameter name="near_z" value="-0.001" />
10+
<parameter name="shift_x" value="0.0" />
11+
<parameter name="shift_y" value="0.0" />
12+
<parameter name="shutter_close_begin_time" value="1.0" />
13+
<parameter name="shutter_close_end_time" value="1.0" />
14+
<parameter name="shutter_open_begin_time" value="0.0" />
15+
<parameter name="shutter_open_end_time" value="0.0" />
16+
<transform time="0">
17+
<matrix>
18+
0.66288744644269126 -0.03542056809345452 -0.74788075032362289 -0.32733206567799983
19+
0.00000000000000000 0.99888033921342245 -0.04730822267722756 0.49791368377534367
20+
0.74871906169716851 0.03136002692624960 0.66214523736299469 0.81159206523313132
21+
0.00000000000000000 0.00000000000000000 0.00000000000000000 1.00000000000000000
22+
</matrix>
23+
</transform>
24+
</camera>
25+
<color name="50%">
26+
<parameter name="color_space" value="srgb" />
27+
<parameter name="multiplier" value="1.0" />
28+
<parameter name="wavelength_range" value="400.0 700.0" />
29+
<values>
30+
0.500000000 0.500000000 0.500000000
31+
</values>
32+
<alpha>
33+
1.000000000
34+
</alpha>
35+
</color>
36+
<color name="80%">
37+
<parameter name="color_space" value="srgb" />
38+
<parameter name="multiplier" value="1.0" />
39+
<parameter name="wavelength_range" value="400.0 700.0" />
40+
<values>
41+
0.800000012 0.800000012 0.800000012
42+
</values>
43+
<alpha>
44+
1.000000000
45+
</alpha>
46+
</color>
47+
<color name="white">
48+
<parameter name="color_space" value="srgb" />
49+
<parameter name="multiplier" value="1.0" />
50+
<parameter name="wavelength_range" value="400.0 700.0" />
51+
<values>
52+
1.000000000 1.000000000 1.000000000
53+
</values>
54+
<alpha>
55+
1.000000000
56+
</alpha>
57+
</color>
58+
<environment_shader name="environment_shader" model="background_environment_shader">
59+
<parameter name="alpha" value="1.0" />
60+
<parameter name="color" value="white" />
61+
</environment_shader>
62+
<environment name="environment" model="generic_environment">
63+
<parameter name="environment_shader" value="environment_shader" />
64+
</environment>
65+
</scene>
66+
<output>
67+
<frame name="beauty">
68+
<parameter name="camera" value="camera" />
69+
<parameter name="denoise_scales" value="3" />
70+
<parameter name="denoiser" value="off" />
71+
<parameter name="enable_dithering" value="true" />
72+
<parameter name="filter" value="blackman-harris" />
73+
<parameter name="filter_size" value="1.5" />
74+
<parameter name="mark_invalid_pixels" value="false" />
75+
<parameter name="noise_seed" value="0" />
76+
<parameter name="patch_distance_threshold" value="1.0" />
77+
<parameter name="prefilter_spikes" value="true" />
78+
<parameter name="random_pixel_order" value="true" />
79+
<parameter name="resolution" value="32 48" />
80+
<parameter name="skip_denoised" value="true" />
81+
<parameter name="spike_threshold" value="2.0" />
82+
<post_processing_stages>
83+
<post_processing_stage name="vignetting" model="vignette_post_processing_stage">
84+
<parameter name="anisotropy" value="0.0" />
85+
<parameter name="intensity" value="1.0" />
86+
<parameter name="order" value="1" />
87+
</post_processing_stage>
88+
</post_processing_stages>
89+
</frame>
90+
</output>
91+
<configurations>
92+
<configuration name="final" base="base_final" />
93+
<configuration name="interactive" base="base_interactive" />
94+
</configurations>
95+
</project>

‎sandbox/tests/test scenes/vignette/04 - full anisotropy.appleseed‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- File generated by appleseed.dll version 2.1.0-beta (SSE SSE2 SSE3 SSSE3 SSE4.1 SSE4.2). -->
3+
<project format_revision="34">
4+
<scene>
5+
<camera name="camera" model="pinhole_camera">
6+
<parameter name="controller_target" value="0.271353 0.535784 0.281539" />
7+
<parameter name="film_dimensions" value="0.025 0.025" />
8+
<parameter name="focal_length" value="0.035" />
9+
<parameter name="near_z" value="-0.001" />
10+
<parameter name="shift_x" value="0.0" />
11+
<parameter name="shift_y" value="0.0" />
12+
<parameter name="shutter_close_begin_time" value="1.0" />
13+
<parameter name="shutter_close_end_time" value="1.0" />
14+
<parameter name="shutter_open_begin_time" value="0.0" />
15+
<parameter name="shutter_open_end_time" value="0.0" />
16+
<transform time="0">
17+
<matrix>
18+
0.66288744644269126 -0.03542056809345452 -0.74788075032362289 -0.32733206567799983
19+
0.00000000000000000 0.99888033921342245 -0.04730822267722756 0.49791368377534367
20+
0.74871906169716851 0.03136002692624960 0.66214523736299469 0.81159206523313132
21+
0.00000000000000000 0.00000000000000000 0.00000000000000000 1.00000000000000000
22+
</matrix>
23+
</transform>
24+
</camera>
25+
<color name="50%">
26+
<parameter name="color_space" value="srgb" />
27+
<parameter name="multiplier" value="1.0" />
28+
<parameter name="wavelength_range" value="400.0 700.0" />
29+
<values>
30+
0.500000000 0.500000000 0.500000000
31+
</values>
32+
<alpha>
33+
1.000000000
34+
</alpha>
35+
</color>
36+
<color name="80%">
37+
<parameter name="color_space" value="srgb" />
38+
<parameter name="multiplier" value="1.0" />
39+
<parameter name="wavelength_range" value="400.0 700.0" />
40+
<values>
41+
0.800000012 0.800000012 0.800000012
42+
</values>
43+
<alpha>
44+
1.000000000
45+
</alpha>
46+
</color>
47+
<color name="white">
48+
<parameter name="color_space" value="srgb" />
49+
<parameter name="multiplier" value="1.0" />
50+
<parameter name="wavelength_range" value="400.0 700.0" />
51+
<values>
52+
1.000000000 1.000000000 1.000000000
53+
</values>
54+
<alpha>
55+
1.000000000
56+
</alpha>
57+
</color>
58+
<environment_shader name="environment_shader" model="background_environment_shader">
59+
<parameter name="alpha" value="1.0" />
60+
<parameter name="color" value="white" />
61+
</environment_shader>
62+
<environment name="environment" model="generic_environment">
63+
<parameter name="environment_shader" value="environment_shader" />
64+
</environment>
65+
</scene>
66+
<output>
67+
<frame name="beauty">
68+
<parameter name="camera" value="camera" />
69+
<parameter name="denoise_scales" value="3" />
70+
<parameter name="denoiser" value="off" />
71+
<parameter name="enable_dithering" value="true" />
72+
<parameter name="filter" value="blackman-harris" />
73+
<parameter name="filter_size" value="1.5" />
74+
<parameter name="mark_invalid_pixels" value="false" />
75+
<parameter name="noise_seed" value="0" />
76+
<parameter name="patch_distance_threshold" value="1.0" />
77+
<parameter name="prefilter_spikes" value="true" />
78+
<parameter name="random_pixel_order" value="true" />
79+
<parameter name="resolution" value="400 200" />
80+
<parameter name="skip_denoised" value="true" />
81+
<parameter name="spike_threshold" value="2.0" />
82+
<post_processing_stages>
83+
<post_processing_stage name="vignetting" model="vignette_post_processing_stage">
84+
<parameter name="anisotropy" value="1.0" />
85+
<parameter name="intensity" value="5.0" />
86+
<parameter name="order" value="1" />
87+
</post_processing_stage>
88+
</post_processing_stages>
89+
</frame>
90+
</output>
91+
<configurations>
92+
<configuration name="final" base="base_final" />
93+
<configuration name="interactive" base="base_interactive" />
94+
</configurations>
95+
</project>

0 commit comments

Comments
 (0)