Skip to content

Coloradjust transition #1189

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

Merged
ncannasse merged 2 commits into from
Feb 5, 2024
Merged

Coloradjust transition #1189

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bd9e32
Added ColorAdjust transition
ddemangeshiro Feb 5, 2024
97b7c23
Inlined local func to reduce allocs
ddemangeshiro Feb 5, 2024
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
29 changes: 28 additions & 1 deletion h2d/domkit/BaseComponents.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,33 @@ class CustomParser extends domkit.CssValue.ValueParser {
}
}

public function transitionColorAdjust(col1: h3d.Matrix.ColorAdjust, col2: h3d.Matrix.ColorAdjust, t: Float) {
inline function defaultValues(col: h3d.Matrix.ColorAdjust) {
var c : h3d.Matrix.ColorAdjust = { saturation: 0, lightness: 0, hue: 0, contrast: 0, gain: { color: 0, alpha: 0 } };
if (col != null) {
if (col.saturation != null) c.saturation = col.saturation;
if (col.lightness != null) c.lightness = col.lightness;
if (col.hue != null) c.hue = col.hue;
if (col.contrast != null) c.contrast = col.contrast;
if (col.gain != null) c.gain = col.gain;
}
return c;
}

var col1 = defaultValues(col1);
var col2 = defaultValues(col2);
return {
saturation: hxd.Math.lerp(col1.saturation, col2.saturation, t),
lightness: hxd.Math.lerp(col1.lightness, col2.lightness, t),
hue: hxd.Math.lerp(col1.hue, col2.hue, t),
contrast: hxd.Math.lerp(col1.contrast, col2.contrast, t),
gain: {
color: transitionColor(col1.gain.color, col2.gain.color, t),
alpha: hxd.Math.lerp(col1.gain.alpha, col2.gain.alpha, t)
}
};
}

public function parseColorAdjust(value:CssValue) : h3d.Matrix.ColorAdjust {
if( value.match(VIdent("none")) )
return null;
Expand Down Expand Up @@ -578,7 +605,7 @@ class DrawableComp extends ObjectComp implements domkit.Component.ComponentDecl<

@:p(colorF) @:t(colorF) #if domkit_drawable_color var color #else var tint #end : h3d.Vector4;
@:p(auto) var smooth : Null<Bool>;
@:p(colorAdjust) var colorAdjust : Null<h3d.Matrix.ColorAdjust>;
@:p(colorAdjust) @:t(colorAdjust) var colorAdjust : Null<h3d.Matrix.ColorAdjust>;
@:p var tileWrap : Bool;

static function #if domkit_drawable_color set_color #else set_tint #end( o : h2d.Drawable, v ) {
Expand Down