Skip to content

Commit 754089b

Browse files
committed
OpenDRT v0.2.8
- chroma contrast sources from unscaled norm to avoid breaking hdr - chroma normalize only affect primaries not secondaries to avoid over-compressing yellows etc - dctl: remove contrast and flare from exposed parameters. a view transform is not a grading tool. - bugfix dctl: rgb was clamped before weighted sum in norm - bugfix dctl: sdivf function was clamping to zero at a high epsilon
1 parent 520789c commit 754089b

File tree

2 files changed

+64
-69
lines changed

2 files changed

+64
-69
lines changed

display-transforms/nuke/OpenDRT.nk

Lines changed: 46 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ push $cut_paste_input
33
Group {
44
name OpenDRT
55
addUserKnob {20 OpenDRT}
6-
addUserKnob {26 about_label l " " T "<style> a:link \{ color: #ccc \}</style>\n<font color=#ccc>\n<b>OpenDRT</b> created by Jed Smith\n<br>v0.2.7 | <a href=https://github.com/jedypod/open-display-transform>documentation</a><br>"}
6+
addUserKnob {26 about_label l " " T "<style> a:link \{ color: #ccc \}</style>\n<font color=#ccc>\n<b>OpenDRT</b> created by Jed Smith\n<br>v0.2.8 | <a href=https://github.com/jedypod/open-display-transform>documentation</a><br>"}
77
addUserKnob {41 gamut l "in gamut" T InGamut_to_XYZ.gamut}
88
addUserKnob {26 spacer01 l "" +STARTLINE}
99
addUserKnob {26 tonescale_label l " " T <b>tonescale</b>}
@@ -56,7 +56,7 @@ Group {
5656
xpos 324
5757
ypos -546
5858
}
59-
set N155b900 [stack 0]
59+
set Nb02d9600 [stack 0]
6060
ColorMatrix {
6161
matrix {
6262
{{"SwitchGamut.input\[value SwitchGamut.which].matrix"} {"SwitchGamut.input\[value SwitchGamut.which].matrix"} {"SwitchGamut.input\[value SwitchGamut.which].matrix"}}
@@ -72,14 +72,14 @@ set N155b900 [stack 0]
7272
xpos 290
7373
ypos -250
7474
}
75-
push $N155b900
75+
push $Nb02d9600
7676
Dot {
7777
name Dot391
7878
label " *RGB to XYZ D65 CAT: XYZ Scaling"
7979
xpos 434
8080
ypos -546
8181
}
82-
set N155a400 [stack 0]
82+
set Nb02d8100 [stack 0]
8383
ColorMatrix {
8484
matrix {
8585
{0.7006223202 0.1487748027 0.101058729}
@@ -91,7 +91,7 @@ set N155a400 [stack 0]
9191
xpos 1390
9292
ypos -466
9393
}
94-
push $N155a400
94+
push $Nb02d8100
9595
ColorMatrix {
9696
matrix {
9797
{0.705396831 0.1640413404 0.08101775497}
@@ -103,7 +103,7 @@ push $N155a400
103103
xpos 1280
104104
ypos -466
105105
}
106-
push $N155a400
106+
push $Nb02d8100
107107
ColorMatrix {
108108
matrix {
109109
{0.5990839005 0.2489254922 0.1024464965}
@@ -115,7 +115,7 @@ push $N155a400
115115
xpos 1170
116116
ypos -465
117117
}
118-
push $N155a400
118+
push $Nb02d8100
119119
ColorMatrix {
120120
matrix {
121121
{0.735275209 0.06860940903 0.1465712786}
@@ -127,7 +127,7 @@ push $N155a400
127127
xpos 1060
128128
ypos -466
129129
}
130-
push $N155a400
130+
push $Nb02d8100
131131
ColorMatrix {
132132
matrix {
133133
{0.6380076408 0.2147038132 0.09774445742}
@@ -139,7 +139,7 @@ push $N155a400
139139
xpos 950
140140
ypos -466
141141
}
142-
push $N155a400
142+
push $Nb02d8100
143143
ColorMatrix {
144144
matrix {
145145
{0.4123909175 0.3575843573 0.1804807931}
@@ -151,7 +151,7 @@ push $N155a400
151151
xpos 840
152152
ypos -466
153153
}
154-
push $N155a400
154+
push $Nb02d8100
155155
ColorMatrix {
156156
matrix {
157157
{0.6369581223 0.1446169168 0.1688809693}
@@ -163,7 +163,7 @@ push $N155a400
163163
xpos 730
164164
ypos -466
165165
}
166-
push $N155a400
166+
push $Nb02d8100
167167
ColorMatrix {
168168
matrix {
169169
{0.4865711331 0.2656677067 0.1982173175}
@@ -175,7 +175,7 @@ push $N155a400
175175
xpos 620
176176
ypos -466
177177
}
178-
push $N155a400
178+
push $Nb02d8100
179179
ColorMatrix {
180180
matrix {
181181
{0.6609312296 0.1336961389 0.1558285803}
@@ -187,7 +187,7 @@ push $N155a400
187187
xpos 510
188188
ypos -466
189189
}
190-
push $N155a400
190+
push $Nb02d8100
191191
ColorMatrix {
192192
matrix {
193193
{0.9503623843 0 9.346324805e-05}
@@ -230,7 +230,7 @@ push $N155a400
230230
xpos 324
231231
ypos -516
232232
}
233-
set Nc8f88100 [stack 0]
233+
set N4d6a9d00 [stack 0]
234234
ColorMatrix {
235235
matrix {
236236
{{"SwitchGamut.input\[value SwitchGamut.which].matrix"} {"SwitchGamut.input\[value SwitchGamut.which].matrix"} {"SwitchGamut.input\[value SwitchGamut.which].matrix"}}
@@ -246,14 +246,14 @@ set Nc8f88100 [stack 0]
246246
xpos 290
247247
ypos -310
248248
}
249-
push $Nc8f88100
249+
push $N4d6a9d00
250250
Dot {
251251
name Dot1
252252
label " XYZ D65 to *RGB CAT: XYZ Scaling"
253253
xpos 434
254254
ypos -516
255255
}
256-
set Nc4766b00 [stack 0]
256+
set N4d6a8800 [stack 0]
257257
ColorMatrix {
258258
matrix {
259259
{1 0 0}
@@ -265,7 +265,7 @@ set Nc4766b00 [stack 0]
265265
xpos 950
266266
ypos -465
267267
}
268-
push $Nc4766b00
268+
push $N4d6a8800
269269
ColorMatrix {
270270
matrix {
271271
{3.240968943 -1.537382722 -0.4986106157}
@@ -277,7 +277,7 @@ push $Nc4766b00
277277
xpos 840
278278
ypos -465
279279
}
280-
push $Nc4766b00
280+
push $N4d6a8800
281281
ColorMatrix {
282282
matrix {
283283
{2.72539258 -1.01800251 -0.4401629865}
@@ -289,7 +289,7 @@ push $Nc4766b00
289289
xpos 730
290290
ypos -465
291291
}
292-
push $Nc4766b00
292+
push $N4d6a8800
293293
ColorMatrix {
294294
matrix {
295295
{2.40274024 -0.8974836469 -0.3880532086}
@@ -301,7 +301,7 @@ push $Nc4766b00
301301
xpos 620
302302
ypos -465
303303
}
304-
push $Nc4766b00
304+
push $N4d6a8800
305305
ColorMatrix {
306306
matrix {
307307
{2.493495464 -0.9313831329 -0.4027105868}
@@ -313,7 +313,7 @@ push $Nc4766b00
313313
xpos 510
314314
ypos -465
315315
}
316-
push $Nc4766b00
316+
push $N4d6a8800
317317
ColorMatrix {
318318
matrix {
319319
{1.716650844 -0.3556707203 -0.2533662021}
@@ -338,7 +338,7 @@ push $Nc4766b00
338338
xpos 214
339339
ypos -558
340340
}
341-
set Nc1213200 [stack 0]
341+
set N4d7dcf00 [stack 0]
342342
Dot {
343343
name Dot2
344344
xpos -226
@@ -358,7 +358,7 @@ set Nc1213200 [stack 0]
358358
addUserKnob {7 bw R 0.05 0.6}
359359
bw 0.3
360360
}
361-
set Nc1212400 [stack 0]
361+
set N4d7dc100 [stack 0]
362362
Expression {
363363
temp_name0 ts0
364364
temp_expr0 invert?(r+sqrt(r*(4*fl+r)))/2:(m*r/(r+s))**c
@@ -405,20 +405,20 @@ set Nc1212400 [stack 0]
405405
xpos -226
406406
ypos -342
407407
}
408-
set Nc1211600 [stack 0]
408+
set N4d7b3200 [stack 0]
409409
Dot {
410410
name Dot9
411411
xpos -226
412412
ypos -126
413413
}
414-
set N47a46400 [stack 0]
414+
set N4d7b2b00 [stack 0]
415415
Dot {
416416
name Dot3
417417
xpos -226
418418
ypos 13
419419
}
420-
push $Nc1212400
421-
push $Nc1213200
420+
push $N4d7dc100
421+
push $N4d7dcf00
422422
MergeExpression {
423423
inputs 2
424424
expr0 Ar==0?0:max(-2,Br/Ar)
@@ -449,7 +449,7 @@ push $Nc1213200
449449
xpos 214
450450
ypos -414
451451
}
452-
set N47a44f00 [stack 0]
452+
set N4d7b0f00 [stack 0]
453453
Expression {
454454
temp_name0 mx
455455
temp_expr0 max(r,g,b)
@@ -476,20 +476,14 @@ set N47a44f00 [stack 0]
476476
xpos 104
477477
ypos -342
478478
}
479-
set N46123900 [stack 0]
479+
set N4d773900 [stack 0]
480480
Dot {
481481
name Dot10
482482
xpos 104
483483
ypos -246
484484
}
485-
set N109bab00 [stack 0]
486-
push $N47a46400
487-
Dot {
488-
name Dot11
489-
xpos -6
490-
ypos -126
491-
}
492-
set N109ba400 [stack 0]
485+
set N4d773200 [stack 0]
486+
push $N4d7dc100
493487
MergeExpression {
494488
inputs 2
495489
temp_name0 f
@@ -504,16 +498,16 @@ set N109ba400 [stack 0]
504498
addUserKnob {7 p R 1 2}
505499
p 1.2
506500
addUserKnob {7 m}
507-
m 0.3
501+
m 0.5
508502
}
509-
push $N109ba400
510-
push $Nc1211600
503+
push $N4d7b2b00
504+
push $N4d7b3200
511505
Dot {
512506
name Dot6
513507
xpos -116
514508
ypos -342
515509
}
516-
set Nc1210800 [stack 0]
510+
set N4d771d00 [stack 0]
517511
Expression {
518512
channel0 rgba
519513
expr0 r**(1/dch)*(1-r)+r*r
@@ -541,8 +535,8 @@ set Nc1210800 [stack 0]
541535
xpos -6
542536
ypos -222
543537
}
544-
set N47a46b00 [stack 0]
545-
push $N109bab00
538+
set N4d770100 [stack 0]
539+
push $N4d773200
546540
Merge2 {
547541
inputs 2
548542
operation multiply
@@ -551,13 +545,13 @@ push $N109bab00
551545
xpos 70
552546
ypos -184
553547
}
554-
push $N47a46b00
555-
push $N46123900
556-
push $Nc1210800
548+
push $N4d770100
549+
push $N4d773900
550+
push $N4d771d00
557551
MergeExpression {
558552
inputs 2
559553
channel0 rgba
560-
expr0 Aa*r
554+
expr0 Br*max(Ar**2,Ag**2,Ab**2)
561555
name chf
562556
xpos -40
563557
ypos -345
@@ -574,7 +568,7 @@ push $Nc1210800
574568
addUserKnob {7 p}
575569
p 0.65
576570
}
577-
push $N47a44f00
571+
push $N4d7b0f00
578572
MergeExpression {
579573
inputs 2
580574
temp_name0 mx
@@ -685,7 +679,7 @@ push $N47a44f00
685679
xpos 400
686680
ypos -129
687681
}
688-
set Nc648b200 [stack 0]
682+
set N4d70b200 [stack 0]
689683
Expression {
690684
temp_name0 Yd
691685
temp_expr0 0.2627*r+0.6780*g+0.0593*b
@@ -718,7 +712,7 @@ set Nc648b200 [stack 0]
718712
addUserKnob {7 _c}
719713
_c {{0.5-_a*log(4*_a)}}
720714
}
721-
push $Nc648b200
715+
push $N4d70b200
722716
Expression {
723717
temp_name0 rp
724718
temp_expr0 pow(r,m_1)
@@ -744,7 +738,7 @@ push $Nc648b200
744738
addUserKnob {7 c_3}
745739
c_3 {{2392/128}}
746740
}
747-
push $Nc648b200
741+
push $N4d70b200
748742
Expression {
749743
expr0 sign(r)*pow(fabs(r),1/p)
750744
expr1 sign(g)*pow(fabs(g),1/p)
@@ -774,4 +768,4 @@ push $Nc648b200
774768
xpos 180
775769
ypos 129
776770
}
777-
end_group
771+
end_group

0 commit comments

Comments
 (0)