Skip to content

Commit 505d536

Browse files
authored
Merge pull request #12 from nick-shaw/resolve17
Update DCTL for Resolve 17 compatibility.
2 parents 827ebab + 6bea5af commit 505d536

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

model/GamutCompress.dctl

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
DEFINE_UI_PARAMS(threshold_r, threshold c, DCTLUI_SLIDER_FLOAT, 0.815f, 0.4f, 1.0f, 0.0f);
2-
DEFINE_UI_PARAMS(threshold_g, threshold m, DCTLUI_SLIDER_FLOAT, 0.803f, 0.4f, 1.0f, 0.0f);
3-
DEFINE_UI_PARAMS(threshold_b, threshold y, DCTLUI_SLIDER_FLOAT, 0.88f, 0.4f, 1.0f, 0.0f);
4-
DEFINE_UI_PARAMS(power, power, DCTLUI_SLIDER_FLOAT, 1.2f, 1.0f, 3.0f, 1.0f);
5-
DEFINE_UI_PARAMS(cyan, cyan, DCTLUI_SLIDER_FLOAT, 0.147f, 0.0f, 1.0f, 0.0f);
6-
DEFINE_UI_PARAMS(magenta, magenta, DCTLUI_SLIDER_FLOAT, 0.264f, 0.0f, 1.0f, 0.0f);
7-
DEFINE_UI_PARAMS(yellow, yellow, DCTLUI_SLIDER_FLOAT, 0.312f, 0.0f, 1.0f, 0.0f);
8-
DEFINE_UI_PARAMS(working_colorspace, working space, DCTLUI_COMBO_BOX, 0, {acescct, acescc, acescg}, {acescct, acescc, acescg});
9-
DEFINE_UI_PARAMS(invert, invert, DCTLUI_CHECK_BOX, 0);
1+
DEFINE_UI_PARAMS(threshold_r, threshold c, DCTLUI_SLIDER_FLOAT, 0.815, 0.4, 1.0, 0.0)
2+
DEFINE_UI_PARAMS(threshold_g, threshold m, DCTLUI_SLIDER_FLOAT, 0.803, 0.4, 1.0, 0.0)
3+
DEFINE_UI_PARAMS(threshold_b, threshold y, DCTLUI_SLIDER_FLOAT, 0.88, 0.4, 1.0, 0.0)
4+
DEFINE_UI_PARAMS(power, power, DCTLUI_SLIDER_FLOAT, 1.2, 1.0, 3.0, 1.0)
5+
DEFINE_UI_PARAMS(cyan, cyan, DCTLUI_SLIDER_FLOAT, 0.147, 0.0, 1.0, 0.0)
6+
DEFINE_UI_PARAMS(magenta, magenta, DCTLUI_SLIDER_FLOAT, 0.264, 0.0, 1.0, 0.0)
7+
DEFINE_UI_PARAMS(yellow, yellow, DCTLUI_SLIDER_FLOAT, 0.312, 0.0, 1.0, 0.0)
8+
DEFINE_UI_PARAMS(working_colorspace, working space, DCTLUI_COMBO_BOX, 0, {acescct, acescc, acescg}, {acescct, acescc, acescg})
9+
DEFINE_UI_PARAMS(invert, invert, DCTLUI_CHECK_BOX, 0)
1010
DEFINE_UI_PARAMS(overlay, overlay graph, DCTLUI_CHECK_BOX, 0)
1111

1212
// Convert acescg to acescct
@@ -114,9 +114,7 @@ __DEVICE__ float3 transform(int p_Width, int p_Height, int p_X, int p_Y, float p
114114
dist.z = ach == 0.0f ? 0.0f : (ach-rgb.z)/_fabs(ach);
115115

116116
// compress distance with user controlled parameterized shaper function
117-
float sat;
118-
float3 csat, cdist;
119-
cdist = make_float3(
117+
float3 cdist = make_float3(
120118
compress(dist.x, lim.x, thr.x, invert, power),
121119
compress(dist.y, lim.y, thr.y, invert, power),
122120
compress(dist.z, lim.z, thr.z, invert, power));

0 commit comments

Comments
 (0)