forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move `ScalingFilter` to PixmapPaint

This commit is contained in:
Elias Batek 2025-01-12 01:57:24 +01:00
parent 3c40abb151
commit 9c5a341bce
2 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pixmappaint.d
View File

@ -2773,16 +2773,28 @@ PixmapBlueprint flipVerticallyCalcDims(const Pixmap source) @nogc {
} }
/// ///
enum ScalingMethod { enum ScalingFilter {
/// /++
Nearest neighbour interpolation
Also known $(B proximal interpolation)
and $(B point sampling).
$(TIP
Visual impression: “blocky”, “pixel’ish”
)
+/
nearest, nearest,
/// /++
linear, // TODO: Decide whether to replace this (Bi-)linear interpolation
// by moving over `ScalingFilter` from `arsd.pixmappresenter`.
}
private alias Scale = ScalingMethod; $(TIP
Visual impression: “smooth”, “blurry”
)
+/
linear,
}
private enum ScalingDirection { private enum ScalingDirection {
none, none,
@ -2800,7 +2812,7 @@ private static ScalingDirection scalingDirectionFromDelta(const int delta) @nogc
} }
} }
private void scaleToImpl(Scale method)(const Pixmap source, Pixmap target) @nogc { private void scaleToImpl(ScalingFilter method)(const Pixmap source, Pixmap target) @nogc {
enum none = ScalingDirection.none; enum none = ScalingDirection.none;
enum up = ScalingDirection.up; enum up = ScalingDirection.up;
@ -2831,7 +2843,7 @@ private void scaleToImpl(Scale method)(const Pixmap source, Pixmap target) @nogc
} }
// Nearest Neighbour // Nearest Neighbour
static if (method == Scale.nearest) { static if (method == ScalingFilter.nearest) {
auto dst = PixmapScannerRW(target); auto dst = PixmapScannerRW(target);
size_t y = 0; size_t y = 0;
@ -2844,22 +2856,22 @@ private void scaleToImpl(Scale method)(const Pixmap source, Pixmap target) @nogc
} }
++y; ++y;
} }
} else static if (method == Scale.linear) { } else static if (method == ScalingFilter.linear) {
static assert(false, "Not implemented."); static assert(false, "Not implemented.");
} else { } else {
static assert(false, "Scaling method not implemented yet."); static assert(false, "Scaling method not implemented yet.");
} }
} }
void scaleTo(const Pixmap source, Pixmap target, ScalingMethod method) @nogc { void scaleTo(const Pixmap source, Pixmap target, ScalingFilter method) @nogc {
import std.meta : NoDuplicates; import std.meta : NoDuplicates;
import std.traits : EnumMembers; import std.traits : EnumMembers;
// dfmt off // dfmt off
final switch (method) { final switch (method) {
static foreach (scalingMethod; NoDuplicates!(EnumMembers!ScalingMethod)) static foreach (scalingFilter; NoDuplicates!(EnumMembers!ScalingFilter))
case scalingMethod: { case scalingFilter: {
scaleToImpl!scalingMethod(source, target); scaleToImpl!scalingFilter(source, target);
return; return;
} }
} }
@ -2878,14 +2890,14 @@ private alias scaleInto = scaleTo;
╚═══╝ ╚═╝ ╚═══╝ ╚═╝
``` ```
+/ +/
Pixmap scale(const Pixmap source, Pixmap target, Size scaleToSize, ScalingMethod method) @nogc { Pixmap scale(const Pixmap source, Pixmap target, Size scaleToSize, ScalingFilter method) @nogc {
target.adjustTo(scaleCalcDims(scaleToSize)); target.adjustTo(scaleCalcDims(scaleToSize));
source.scaleInto(target, method); source.scaleInto(target, method);
return target; return target;
} }
/// ditto /// ditto
Pixmap scaleNew(const Pixmap source, Size scaleToSize, ScalingMethod method) { Pixmap scaleNew(const Pixmap source, Size scaleToSize, ScalingFilter method) {
auto target = Pixmap.makeNew(scaleToSize); auto target = Pixmap.makeNew(scaleToSize);
source.scaleInto(target, method); source.scaleInto(target, method);
return target; return target;

6
pixmappresenter.d
View File

@ -372,12 +372,6 @@ enum Scaling {
cssCover = cover, /// equivalent CSS: `object-fit: cover;` cssCover = cover, /// equivalent CSS: `object-fit: cover;`
} }
///
enum ScalingFilter {
nearest, /// nearest neighbor → blocky/pixel’ish
linear, /// (bi-)linear interpolation → smooth/blurry
}
/// ///
struct PresenterConfig { struct PresenterConfig {
Window window; /// Window window; ///