6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-10-04 01:57:54 +00:00
Code Issues Projects Releases Wiki Activity

At least nominates alpha, gamma and brightness to metal.

Browse Source
This commit is contained in:
Thomas Harte 2020-09-04 16:07:58 -04:00
parent 489701afcb
commit e99896eadc
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OSBindings/Mac/Clock Signal/ScanTarget/CSScanTarget.mm
View File

@ -48,8 +48,12 @@
recorded at this point. Format within the composition buffer is:
.r = composite value
.g = phase
.b = amplitude
.g = 0.5 + 0.5 * cos(phase)
.b = 0.5 + 0.5 * sin(phase)
.a = amplitude
[aside: upfront calculation of cos/sin is just because it'll need to be calculated at this precision anyway,
and doing it here avoids having to do unit<->radian conversions on phase alone]
Contents of the composition buffer are transferred to the separated-luma buffer, subject to a low-paass filter
that has sought to separate luminance and chrominance, and with phase and amplitude now baked into the latter:
@ -90,6 +94,7 @@
namespace {
// Tracks the Uniforms struct declared in ScanTarget.metal; see there for field definitions.
struct Uniforms {
int32_t scale[2];
float lineWidth;
@ -102,6 +107,9 @@ struct Uniforms {
simd::float2 lumaCoefficients[8];
float radiansPerPixel;
float cyclesMultiplier;
float outputAlpha;
float outputGamma;
float outputMultiplier;
};
constexpr size_t NumBufferedLines = 500;
@ -458,6 +466,14 @@ using BufferingScanTarget = Outputs::Display::BufferingScanTarget;
simd::float3{fromRGB[6], fromRGB[7], fromRGB[8]}
);
// This is fixed for now; consider making it a function of frame rate and/or of whether frame syncing
// is ongoing (which would require a way to signal that to this scan target).
uniforms()->outputAlpha = 0.64f;
uniforms()->outputMultiplier = modals.brightness;
const float displayGamma = 2.2f; // This is assumed.
uniforms()->outputGamma = displayGamma / modals.intended_gamma;
//

9
OSBindings/Mac/Clock Signal/ScanTarget/ScanTarget.metal
View File

@ -45,6 +45,15 @@ struct Uniforms {
// Applies a multiplication to all cyclesSinceRetrace values.
float cycleMultiplier;
// Sets the opacity at which output strips are drawn.
float outputAlpha;
// Sets the gamma power to which output colours are raised.
float outputGamma;
// Sets a brightness multiplier for output colours.
float outputMultiplier;
};
namespace {