drewcassidy/quicktex
1
0
Fork 0
mirror of https://github.com/drewcassidy/quicktex.git synced 2024-09-13 06:37:34 +00:00
Code Issues Projects Releases Activity

Cleanup and bugfix FindEndpoints

Browse Source
This commit is contained in:
Andrew Cassidy 2021-02-21 03:38:33 -08:00
parent 9e2e9fba4c
commit 64757f34c8
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/BC1/BC1Encoder.cpp
View File

@ -184,8 +184,8 @@ void BC1Encoder::FindEndpoints(Color4x4 pixels, BC1Encoder::Flags flags, const B
if (metrics.max.r - metrics.min.r < 2) { if (metrics.max.r - metrics.min.r < 2) {
// single color block // single color block
low.r = high.r = scale8To5(fr); low.r = high.r = (uint8_t)scale8To5(fr);
low.g = high.g = scale8To6(fr); low.g = high.g = (uint8_t)scale8To6(fr);
low.b = high.b = low.r; low.b = high.b = low.r;
} else { } else {
low.r = low.b = scale8To5(metrics.min.r); low.r = low.b = scale8To5(metrics.min.r);
@ -204,7 +204,7 @@ void BC1Encoder::FindEndpoints(Color4x4 pixels, BC1Encoder::Flags flags, const B
auto &min = metrics.min; auto &min = metrics.min;
auto &max = metrics.max; auto &max = metrics.max;
unsigned chan0 = diff.MaxChannelRGB(); // primary axis of the bounding box unsigned chan0 = (unsigned)diff.MaxChannelRGB(); // primary axis of the bounding box
l[chan0] = (float)min[chan0]; l[chan0] = (float)min[chan0];
h[chan0] = (float)min[chan0]; h[chan0] = (float)min[chan0];
@ -223,7 +223,7 @@ void BC1Encoder::FindEndpoints(Color4x4 pixels, BC1Encoder::Flags flags, const B
float denominator = (float)(16 * sum_xx) - (float)(sum_x * sum_x); float denominator = (float)(16 * sum_xx) - (float)(sum_x * sum_x);
// once per secondary axis, calculate high and low using least squares // once per secondary axis, calculate high and low using least squares
if (fabs(denominator > 1e-8f)) { if (fabs(denominator) > 1e-8f) {
for (unsigned i = 1; i < 3; i++) { for (unsigned i = 1; i < 3; i++) {
/* each secondary axis is fitted with a linear formula of the form /* each secondary axis is fitted with a linear formula of the form
* y = ax + b * y = ax + b
@ -286,8 +286,6 @@ void BC1Encoder::FindEndpoints(Color4x4 pixels, BC1Encoder::Flags flags, const B
Color min, max; Color min, max;
const float bias = 8.0f / 255.0f;
// rescale and inset values // rescale and inset values
for (unsigned c = 0; c < 3; c++) { for (unsigned c = 0; c < 3; c++) {
int inset = ((int)(metrics.max[c] - metrics.min[c]) - 8) >> 4; // 1/16 of delta, with bias int inset = ((int)(metrics.max[c] - metrics.min[c]) - 8) >> 4; // 1/16 of delta, with bias