Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds a Color Correct node #1086

Merged
merged 6 commits into from
Oct 14, 2022
Merged

Adds a Color Correct node #1086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b79235f
Adds a colorcorrect node
crydalch Sep 23, 2022
5a03142
Removed float outputs, added color4 signature
crydalch Sep 27, 2022
c9d59b7
Minor whitespace fix
jstone-lucasfilm Oct 1, 2022
f6db22f
Color Correct: color4 signature uses color3 internally, and leaves al…
crydalch Oct 4, 2022
b8f860a
Color Correct: added docs and added inputs to the nodegrpah
crydalch Oct 7, 2022
e640a65
Color Correct: Fixed incorrect output type for color4 signature.
crydalch Oct 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions libraries/stdlib/stdlib_defs.mtlx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2901,6 +2901,36 @@
<input name="lumacoeffs" type="color3" value="0.2722287, 0.6740818, 0.0536895" enum="acescg, rec709, rec2020, rec2100" enumvalues="0.2722287,0.6740818,0.0536895, 0.2126,0.7152,0.0722, 0.2627,0.6780,0.0593, 0.2627,0.6780,0.0593" />
<output name="out" type="color4" defaultinput="in" />
</nodedef>

<!--
Node: <colorcorrect> Supplemental Node
Combines various adjustment nodes into one, artist-friendly color correction node.
The color4 signature does not touch the alpha channel.
-->
<nodedef name="ND_colorcorrect_color3" node="colorcorrect" nodegroup="adjustment">
<input name="in" type="color3" uiname="Input Color" value="1, 1, 1" doc="The input color to be adjusted." />
<input name="hue" type="float" uiname="Hue" uisoftmin="0.0" uisoftmax="1.0" value="0" doc="Rotates the color hue, with values wrapping at 0-1 boundaries." />
<input name="saturation" type="float" uiname="Saturation" uisoftmin="0.0" uisoftmax="1.0" value="1" doc="Adjusts the input color saturation level." />
<input name="gamma" type="float" uiname="Gamma" uisoftmin="0.0" uisoftmax="3.0" value="1" doc="Applies a gamma correction to the color." />
<input name="lift" type="float" uiname="Lift" uisoftmin="0.0" uisoftmax="1.0" value="0" doc="Raise the dark color values, leaving the white values unchanged." />
<input name="gain" type="float" uiname="Gain" uisoftmin="0.0" uisoftmax="1.0" value="1" doc="Multiplier increases lighter color values, leaving black values unchanged."/>
<input name="contrast" type="float" uiname="Contrast" uisoftmin="0.0" uisoftmax="1.0" value="1" doc="Linearly increase or decrease the color contrast." />
<input name="contrastpivot" type="float" uiname="Contrast Pivot" uisoftmin="0.0" uisoftmax="1.0" value="0.5" doc="Pivot value around which contrast applies. This value will not change as contrast is adjusted." />
<input name="exposure" type="float" uiname="Exposure" uisoftmin="-1.0" uisoftmax="1.0" value="0" doc="Multplier which increases or decreases color brightness by 2^value." />
<output name="out" type="color3" />
</nodedef>
<nodedef name="ND_colorcorrect_color4" node="colorcorrect" nodegroup="adjustment">
<input name="in" type="color4" uiname="Input Color" value="1, 1, 1, 0" doc="The input color to be adjusted." />
<input name="hue" type="float" uiname="Hue" uisoftmin="0.0" uisoftmax="1.0" value="0" doc="Rotates the color hue, with values wrapping at 0-1 boundaries." />
<input name="saturation" type="float" uiname="Saturation" uisoftmin="0.0" uisoftmax="1.0" value="1" doc="Adjusts the input color saturation level." />
<input name="gamma" type="float" uiname="Gamma" uisoftmin="0.0" uisoftmax="3.0" value="1" doc="Applies a gamma correction to the color." />
<input name="lift" type="float" uiname="Lift" uisoftmin="0.0" uisoftmax="1.0" value="0" doc="Raise the dark color values, leaving the white values unchanged." />
<input name="gain" type="float" uiname="Gain" uisoftmin="0.0" uisoftmax="1.0" value="1" doc="Multiplier increases lighter color values, leaving black values unchanged."/>
<input name="contrast" type="float" uiname="Contrast" uisoftmin="0.0" uisoftmax="1.0" value="1" doc="Linearly increase or decrease the color contrast." />
<input name="contrastpivot" type="float" uiname="Contrast Pivot" uisoftmin="0.0" uisoftmax="1.0" value="0.5" doc="Pivot value around which contrast applies. This value will not change as contrast is adjusted." />
<input name="exposure" type="float" uiname="Exposure" uisoftmin="-1.0" uisoftmax="1.0" value="0" doc="Multplier which increases or decreases color brightness by 2^value." />
<output name="out" type="color4" />
</nodedef>

<!-- ======================================================================== -->
<!-- Compositing nodes -->
Expand Down
109 changes: 109 additions & 0 deletions libraries/stdlib/stdlib_ng.mtlx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1887,6 +1887,115 @@
</mix>
<output name="out" type="color4" nodename="N_mix_color4" />
</nodegraph>

<!--
Node: <colorcorrect> Supplemental Node
Combines various adjustment nodes into one, artist-friendly color correction node.
-->
<nodegraph name="NG_colorcorrect_color3" nodedef="ND_colorcorrect_color3">
<input name="in" type="color3" />
<input name="hue" type="float" />
<input name="saturation" type="float" />
<input name="gamma" type="float" />
<input name="lift" type="float" />
<input name="gain" type="float" />
<input name="contrast" type="float" />
<input name="contrastpivot" type="float" />
<input name="exposure" type="float" />
<output name="out" type="color3" nodename="N_exposure" />
<multiply name="N_exposure" type="color3">
<input name="in1" type="color3" nodename="N_contrast" />
<input name="in2" type="float" nodename="N_exposurepwr" />
</multiply>
<contrast name="N_contrast" type="color3">
<input name="in" type="color3" nodename="N_gain" />
<input name="amount" type="float" interfacename="contrast" />
<input name="pivot" type="float" interfacename="contrastpivot" />
</contrast>
<power name="N_exposurepwr" type="float">
<input name="in2" type="float" interfacename="exposure" />
<input name="in1" type="float" value="2" />
</power>
<multiply name="N_gain" type="color3">
<input name="in1" type="color3" nodename="N_liftadd" />
<input name="in2" type="float" interfacename="gain" />
</multiply>
<add name="N_liftadd" type="color3">
<input name="in1" type="color3" nodename="N_liftmult" />
<input name="in2" type="float" interfacename="lift" />
</add>
<multiply name="N_liftmult" type="color3">
<input name="in1" type="color3" nodename="N_gamma" />
<input name="in2" type="float" nodename="N_liftsubtract" />
</multiply>
<range name="N_gamma" type="color3">
<input name="in" type="color3" nodename="N_saturation" />
<input name="gamma" type="float" interfacename="gamma" />
<input name="inlow" type="float" value="0" />
<input name="inhigh" type="float" value="1" />
<input name="outlow" type="float" value="0" />
<input name="outhigh" type="float" value="1" />
<input name="doclamp" type="boolean" value="false" />
</range>
<subtract name="N_liftsubtract" type="float">
<input name="in2" type="float" interfacename="lift"/>
<input name="in1" type="float" value="1" />
</subtract>
<saturate name="N_saturation" type="color3">
<input name="in" type="color3" nodename="N_hsvadjust" />
<input name="amount" type="float" interfacename="saturation"/>
<input name="lumacoeffs" type="color3" />
</saturate>
<hsvadjust name="N_hsvadjust" type="color3">
<input name="in" type="color3" interfacename="in" />
<input name="amount" type="vector3" nodename="N_parm2hue" />
</hsvadjust>
<combine3 name="N_parm2hue" type="vector3">
<input name="in1" type="float" interfacename="hue" />
<input name="in2" type="float" value="1" />
<input name="in3" type="float" value="1" />
</combine3>
</nodegraph>
<nodegraph name="NG_colorcorrect_color4" nodedef="ND_colorcorrect_color4">
<input name="in" type="color4" />
<input name="hue" type="float" />
<input name="saturation" type="float" />
<input name="gamma" type="float" />
<input name="lift" type="float" />
<input name="gain" type="float" />
<input name="contrast" type="float" />
<input name="contrastpivot" type="float" />
<input name="exposure" type="float" />
<output name="out" type="color4" nodename="N_combine_with_alpha" />
<separate4 name="N_split_color4" type="multioutput">
<input name="in" type="color4" interfacename="in" />
</separate4>
<combine3 name="N_combine_color" type="color3">
<input name="in1" type="float" nodename="N_split_color4" output="outr" />
<input name="in2" type="float" nodename="N_split_color4" output="outg" />
<input name="in3" type="float" nodename="N_split_color4" output="outb" />
</combine3>
<colorcorrect name="N_colorcorrect" type="color3">
<input name="in" type="color3" nodename="N_combine_color" />
<input name="hue" type="float" interfacename="hue" />
<input name="saturation" type="float" interfacename="saturation" />
<input name="gamma" type="float" interfacename="gamma" />
<input name="lift" type="float" interfacename="lift" />
<input name="gain" type="float" interfacename="gain" />
<input name="contrast" type="float" interfacename="contrast" />
<input name="contrastpivot" type="float" interfacename="contrastpivot" />
<input name="exposure" type="float" interfacename="exposure" />
</colorcorrect>
<separate3 name="N_split_color" type="multioutput">
<input name="in" type="color3" nodename="N_colorcorrect" />
</separate3>
<combine4 name="N_combine_with_alpha" type="color4">
<input name="in1" type="float" nodename="N_split_color" output="outr" />
<input name="in2" type="float" nodename="N_split_color" output="outg" />
<input name="in3" type="float" nodename="N_split_color" output="outb" />
<input name="in4" type="float" nodename="N_split_color4" output="outa" />
</combine4>
</nodegraph>

<!-- ======================================================================== -->
<!-- Compositing nodes -->
Expand Down