Skip to content

Commit de7f66f

Browse files
committed
New construction for Toney (tone mapper).
This is more straightforward, but still gives comparable results.
1 parent 59a302f commit de7f66f

File tree

3 files changed

+283
-179
lines changed

3 files changed

+283
-179
lines changed

Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sub_crates/ocio_gen/src/minimal_config.rs

+32-24
Original file line numberDiff line numberDiff line change
@@ -19,63 +19,71 @@ pub fn make_minimal(
1919

2020
// Tone mapping operators, used various places below.
2121
let toney_neutral_rec709 = Tonemapper::new(
22+
Some(chroma::REC709),
2223
1.0,
2324
toney_neutral_sdr_curve,
24-
Some(chroma::REC709),
25-
(0.15, 0.7),
26-
0.25,
25+
0.5,
26+
0.2,
27+
0.2,
2728
);
2829
let toney_filmic_rec709 = Tonemapper::new(
30+
Some(chroma::REC709),
2931
1.0,
3032
toney_filmic_sdr_curve,
31-
Some(chroma::REC709),
32-
(0.15, 0.7),
33-
0.25,
33+
0.5,
34+
0.2,
35+
0.2,
3436
);
3537

3638
let toney_neutral_rec709_hdr = Tonemapper::new(
39+
Some(chroma::REC709),
3740
1.0,
3841
toney_neutral_hdr_curve,
39-
Some(chroma::REC709),
40-
(0.15, 0.7),
41-
0.25,
42+
0.5,
43+
0.2,
44+
0.2,
4245
);
4346
let toney_filmic_rec709_hdr = Tonemapper::new(
47+
Some(chroma::REC709),
4448
1.1,
4549
toney_filmic_hdr_curve,
46-
Some(chroma::REC709),
47-
(0.15, 0.7),
48-
0.25,
50+
0.5,
51+
0.2,
52+
0.2,
4953
);
5054

5155
let toney_neutral_rec2020 = Tonemapper::new(
56+
Some(chroma::REC2020),
5257
1.0,
5358
toney_neutral_sdr_curve,
54-
Some(chroma::REC2020),
55-
(0.15, 0.7),
56-
0.25,
59+
0.5,
60+
0.2,
61+
0.2,
5762
);
5863
let toney_filmic_rec2020 = Tonemapper::new(
64+
Some(chroma::REC2020),
5965
1.0,
6066
toney_filmic_sdr_curve,
61-
Some(chroma::REC2020),
62-
(0.15, 0.7),
63-
0.25,
67+
0.5,
68+
0.2,
69+
0.2,
6470
);
6571

6672
let toney_neutral_rec2020_hdr = Tonemapper::new(
73+
Some(chroma::REC2020),
6774
1.0,
6875
toney_neutral_hdr_curve,
69-
Some(chroma::REC2020),
70-
(0.15, 0.7),
71-
0.25,
76+
0.5,
77+
0.2,
78+
0.2,
7279
);
7380
let toney_filmic_rec2020_hdr = Tonemapper::new(
81+
Some(chroma::REC2020),
7482
1.0,
7583
toney_filmic_hdr_curve,
76-
Some(chroma::REC2020),
77-
(0.15, 0.7),
78-
0.25,
84+
0.5,
85+
0.2,
86+
0.2,
7987
);
8088

8189
// AgX.

0 commit comments

Comments
 (0)