Skip to content

Commit 30dc661

Browse files
committed
fix(nuke): AgXcDRT: faulty outset
was not applied at the right place (after first tonescale)
1 parent 83cab11 commit 30dc661

File tree

3 files changed

+303
-260
lines changed

3 files changed

+303
-260
lines changed

nuke/AgXcDRT.nk

Lines changed: 244 additions & 230 deletions
Large diffs are not rendered by default.

nuke/CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
# AgXcDRT
99

10+
## [1.1.1] - 2024-02-01
11+
12+
### Fixed
13+
14+
internal:
15+
16+
* faulty outset that was not at the right position in the processing chain.
17+
it should have been after the first tonescale, still on linear encoding.
18+
1019
## [1.1.0] - 2024-02-01
1120

1221
### Added
1322

23+
public:
24+
1425
* `purity amount` knob controling how much outset is applied
1526

27+
internal:
28+
29+
* Added new PrimariesInset node to act as Outset
30+
1631
### Changed
1732

1833
* `inset` moved knob to a new top "Purity" section

nuke/src/AgXcDRT/AgXcDRT-template.nk

Lines changed: 44 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Group {
8787
addUserKnob {20 endGroup n -1}
8888
addUserKnob {20 About}
8989
addUserKnob {26 toolName l name T AgXcDRT}
90-
addUserKnob {26 toolVersion l version T 1.1.0}
90+
addUserKnob {26 toolVersion l version T 1.1.1}
9191
addUserKnob {26 toolAuthor l author T "<a style=\"color: rgb(200,200,200);\" href=\"https://mrlixm.github.io/\">Liam Collod</a>"}
9292
addUserKnob {26 toolDescription l description T "AgX(custom) Display Rendering Transform."}
9393
addUserKnob {26 toolUrl l url T "<a style=\"color: rgb(200,200,200);\" href=\"https://github.com/MrLixm/AgXc\">https://github.com/MrLixm/AgXc</a>"}
@@ -133,61 +133,75 @@ Group {
133133
ypos 300
134134
}
135135
%NODE_AgXcTonescale:{"ypos": 350, "xpos": 0,"name": "AgXcTonescaleFirst", "min_exposure": "{{parent.tonescale1_min_exposure}}", "max_exposure": "{{parent.tonescale1_max_exposure}}", "general_contrast": "{{parent.contrast1}}", "use_gpu": "{{parent.use_gpu}}"}%
136+
Colorspace {
137+
name LINEARIZE_TONESCALE_OUTSET
138+
xpos 0
139+
ypos 400
140+
label "cctf: [value colorspace_in] > [value colorspace_out]"
141+
colorspace_in "2.40"
142+
}
143+
Dot {
144+
name DotPurityInput
145+
xpos 0
146+
ypos 450
147+
}
148+
set N23344020 [stack 0]
149+
%NODE_PrimariesInset:{"ypos": 500, "xpos": 0, "name": "Outset", "colorspace_preset": "\"ITU-R BT.2020\"", "primary_r": "{0.708 0.292}", "primary_g": "{0.17 0.797}", "primary_b": "{0.131 0.046}", "whitepoint": "{0.3127 0.329}", "invert_inset": 1, "inset": "{{parent.inset1}}", "u_inset_r": "{{PrimariesInsetFirst.u_inset_r}}", "u_inset_g": "{{PrimariesInsetFirst.u_inset_g}}", "u_inset_b": "{{PrimariesInsetFirst.u_inset_b}}", "rotate_r": 0, "rotate_g": 0, "rotate_b": 0, "use_gpu": "{{parent.use_gpu}}"}%
150+
push $N23344020
151+
Dot {
152+
name DotPurityNone
153+
xpos 100
154+
ypos 500
155+
}
156+
NodeWrapper {
157+
inputs 2
158+
name PurityAmount
159+
xpos 0
160+
ypos 550
161+
mix {{parent.purity_amount}}
162+
}
163+
Colorspace {
164+
name UNLINEARIZE_TONESCALE_OUTSET
165+
xpos 0
166+
ypos 600
167+
label "cctf: [value colorspace_in] > [value colorspace_out]"
168+
colorspace_out "2.40"
169+
}
136170
Dot {
137171
name Dot2ndTonescale
138172
xpos 0
139-
ypos 500
173+
ypos 650
140174
}
141175
set Nd28ed30 [stack 0]
142-
%NODE_PrimariesInset:{"ypos": 550, "xpos": 0,"name": "PrimariesInsetSecond", "colorspace_preset": "\"ITU-R BT.2020\"", "primary_r": "{0.708 0.292}", "primary_g": "{0.17 0.797}", "primary_b": "{0.131 0.046}", "whitepoint": "{0.3127 0.329}", "inset": 0.05, "u_inset_r": 0.06, "u_inset_b": 0.35, "u_inset_b": 0.06, "use_gpu": "{{parent.use_gpu}}"}%
143-
%NODE_Log2Shaper:{"ypos": 600, "xpos": 0,"name": "Log2ShaperTonescaleSecond", "min_exp": "{{parent.tonescale2_min_exposure}}", "max_exp": "{{parent.tonescale2_max_exposure}}"}%
144-
%NODE_AgXcTonescale:{"ypos": 650, "xpos": 0,"name": "AgXcTonescaleSecond", "min_exposure": "{{parent.tonescale2_min_exposure}}", "max_exposure": "{{parent.tonescale2_max_exposure}}", "x_pivot": 0.64, "general_contrast": "{{parent.contrast2}}", "use_gpu": "{{parent.use_gpu}}"}%
176+
%NODE_PrimariesInset:{"ypos": 700, "xpos": 0,"name": "PrimariesInsetSecond", "colorspace_preset": "\"ITU-R BT.2020\"", "primary_r": "{0.708 0.292}", "primary_g": "{0.17 0.797}", "primary_b": "{0.131 0.046}", "whitepoint": "{0.3127 0.329}", "inset": 0.05, "u_inset_r": 0.06, "u_inset_b": 0.35, "u_inset_b": 0.06, "use_gpu": "{{parent.use_gpu}}"}%
177+
%NODE_Log2Shaper:{"ypos": 750, "xpos": 0,"name": "Log2ShaperTonescaleSecond", "min_exp": "{{parent.tonescale2_min_exposure}}", "max_exp": "{{parent.tonescale2_max_exposure}}"}%
178+
%NODE_AgXcTonescale:{"ypos": 800, "xpos": 0,"name": "AgXcTonescaleSecond", "min_exposure": "{{parent.tonescale2_min_exposure}}", "max_exposure": "{{parent.tonescale2_max_exposure}}", "x_pivot": 0.64, "general_contrast": "{{parent.contrast2}}", "use_gpu": "{{parent.use_gpu}}"}%
145179
push $Nd28ed30
146180
Dot {
147181
name Dot2ndTonescale1
148182
xpos 200
149-
ypos 500
183+
ypos 650
150184
}
151185
Dot {
152186
name Dot2ndTonescale2
153187
xpos 200
154-
ypos 700
188+
ypos 850
155189
}
156190
Switch {
157191
inputs 2
158192
which {{parent.tonescale_apply_double}}
159193
name SwitchDoubleToneScale
160194
xpos 0
161-
ypos 700
195+
ypos 850
162196
}
163-
%NODE_SigmoidParabolic:{"ypos": 750, "xpos": 0, "name": "PRINT_CONTRAST_SigmoidParabolic", "mix": "{{parent.print_contrast_amount}}", "p": "{{parent.print_contrast} {parent.print_contrast} {parent.print_contrast}}", "t0": "{{parent.print_contrast_pivot} {parent.print_contrast_pivot} {parent.print_contrast_pivot}}"}%
197+
%NODE_SigmoidParabolic:{"ypos": 900, "xpos": 0, "name": "PRINT_CONTRAST_SigmoidParabolic", "mix": "{{parent.print_contrast_amount}}", "p": "{{parent.print_contrast} {parent.print_contrast} {parent.print_contrast}}", "t0": "{{parent.print_contrast_pivot} {parent.print_contrast_pivot} {parent.print_contrast_pivot}}"}%
164198
Colorspace {
165199
name LINEARIZE_TONESCALE
166200
xpos 0
167-
ypos 800
201+
ypos 950
168202
label "cctf: [value colorspace_in] > [value colorspace_out]"
169203
colorspace_in "2.40"
170204
}
171-
Dot {
172-
name DotPurityInput
173-
xpos 0
174-
ypos 850
175-
}
176-
set N23344020 [stack 0]
177-
%NODE_PrimariesInset:{"ypos": 900, "xpos": 0, "name": "Outset", "colorspace_preset": "\"ITU-R BT.2020\"", "primary_r": "{0.708 0.292}", "primary_g": "{0.17 0.797}", "primary_b": "{0.131 0.046}", "whitepoint": "{0.3127 0.329}", "invert_inset": 1, "inset": "{{parent.inset1}}", "u_inset_r": "{{PrimariesInset.u_inset_r}}", "u_inset_g": "{{PrimariesInset.u_inset_g}}", "u_inset_b": "{{PrimariesInset.u_inset_b}}", "rotate_r": 0, "rotate_g": 0, "rotate_b": 0, "use_gpu": "{{parent.use_gpu}}"}%
178-
push $N23344020
179-
Dot {
180-
name DotPurityNone
181-
xpos 100
182-
ypos 900
183-
}
184-
NodeWrapper {
185-
inputs 2
186-
name PurityAmount
187-
xpos 0
188-
ypos 950
189-
mix {{parent.purity_amount}}
190-
}
191205
Dot {
192206
name DotDisplay
193207
xpos 0

0 commit comments

Comments
 (0)