empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More uniform allocation of pixels in the 4th column to each sides with half the weight.

Browse source 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2017-06-11 10:57:18 +01:00
parent 6996c5fc47
commit a43cf5cf8a
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
source/frontends/ncurses/asciiart.cpp
View file

@ -8,15 +8,17 @@ ASCIIArt::Unicode::Unicode(const char * aC, std::vector<int> aValues)
{ {
} }
const int ASCIIArt::PPQ = 8 * (2 * 7) / 4;
ASCIIArt::ASCIIArt() ASCIIArt::ASCIIArt()
{ {
myGlyphs.push_back(Unicode("\u2580", {14, 14, 0, 0})); // top half myGlyphs.push_back(Unicode("\u2580", {PPQ, PPQ, 0, 0})); // top half
myGlyphs.push_back(Unicode("\u258C", {14, 0, 14, 0})); // left half myGlyphs.push_back(Unicode("\u258C", {PPQ, 0, PPQ, 0})); // left half
myGlyphs.push_back(Unicode("\u2596", { 0, 0, 14, 0})); // lower left myGlyphs.push_back(Unicode("\u2596", { 0, 0, PPQ, 0})); // lower left
myGlyphs.push_back(Unicode("\u2597", { 0, 0, 0, 14})); // lower right myGlyphs.push_back(Unicode("\u2597", { 0, 0, 0, PPQ})); // lower right
myGlyphs.push_back(Unicode("\u2598", {14, 0, 0, 0})); // top left myGlyphs.push_back(Unicode("\u2598", {PPQ, 0, 0, 0})); // top left
myGlyphs.push_back(Unicode("\u259A", {14, 0, 0, 14})); // diagonal myGlyphs.push_back(Unicode("\u259A", {PPQ, 0, 0, PPQ})); // diagonal
myGlyphs.push_back(Unicode("\u259D", { 0, 14, 0, 0})); // top right myGlyphs.push_back(Unicode("\u259D", { 0, PPQ, 0, 0})); // top right
} }
const ASCIIArt::Character & ASCIIArt::getCharacter(const unsigned char * address) const ASCIIArt::Character & ASCIIArt::getCharacter(const unsigned char * address)
@ -31,17 +33,15 @@ const ASCIIArt::Character & ASCIIArt::getCharacter(const unsigned char * address
const int base = (i / 4) * 2; const int base = (i / 4) * 2;
// as there are 7 pixels per character // 76543210
// alternate where the middle one goes (left <-> right) values[base] += __builtin_popcount(value & 0b00000111) * 2;
if (i & 1) values[base + 1] += __builtin_popcount(value & 0b01110000) * 2;
// allocate the middle pixels to each quadrant (with half the weight)
if (value & 0b00001000)
{ {
values[base] += __builtin_popcount(value & 0b0001111); // middle left ++values[base];
values[base + 1] += __builtin_popcount(value & 0b1110000); ++values[base + 1];
}
else
{
values[base] += __builtin_popcount(value & 0b0000111);
values[base + 1] += __builtin_popcount(value & 0b1111000); // middle right
} }
} }
@ -94,12 +94,10 @@ void ASCIIArt::fit(const std::vector<int> & art, const Unicode & glyph,
int den_fg = 0; int den_fg = 0;
int den_bg = 0; int den_bg = 0;
const int numberOfPixelsPerQuadrant = 8 * 7 / 4;
for (size_t i = 0; i < art.size(); ++i) for (size_t i = 0; i < art.size(); ++i)
{ {
const double f = glyph.values[i]; const double f = glyph.values[i];
const double b = numberOfPixelsPerQuadrant - f; const double b = PPQ - f;
num_fg += art[i] * f; num_fg += art[i] * f;
den_fg += f * f; den_fg += f * f;
@ -117,7 +115,7 @@ void ASCIIArt::fit(const std::vector<int> & art, const Unicode & glyph,
for (size_t i = 0; i < art.size(); ++i) for (size_t i = 0; i < art.size(); ++i)
{ {
const double f = glyph.values[i]; const double f = glyph.values[i];
const double b = numberOfPixelsPerQuadrant - f; const double b = PPQ - f;
const double g = foreground * f + background * b; const double g = foreground * f + background * b;
const double e = art[i] - g; const double e = art[i] - g;

2
source/frontends/ncurses/asciiart.h
View file

@ -20,6 +20,8 @@ public:
const Character & getCharacter(const std::vector<int> & values); const Character & getCharacter(const std::vector<int> & values);
private: private:
static const int PPQ; // Pixels per Quadrant
std::unordered_map<int, Character> myAsciiPixels; std::unordered_map<int, Character> myAsciiPixels;
struct Unicode struct Unicode