From d95f142d0fa889e5e9a40841cc806dc3e88392f5 Mon Sep 17 00:00:00 2001
From: Julian Hinxlage <hinxlage.julian@web.de>
Date: Wed, 23 Oct 2019 11:42:32 +0200
Subject: [PATCH] + fillValue in Font

---
 main/main.cpp | 11 ++++-------
 src/Font.cpp  |  5 +++--
 src/Font.h    |  4 +++-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/main/main.cpp b/main/main.cpp
index cbf1f9d..a5541a8 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -16,18 +16,15 @@ int main() {
 
     std::string str;
     std::cout << "string to draw: ";
-    std::cin >> str;
+    std::getline(std::cin, str);
 
     for (int i = 0; i < font.height(); i++) {
         for (char c : str) {
             for (int j = 0; j < font.width(); j++) {
-
-                unsigned int pixel = font.getPixel(c,j,i);
-
-                if (pixel == 0) {
-                    std::cout << " ";
+                if (font.getPixel(c,j,i)) {
+                    std::cout << "█";
                 } else {
-                    std::cout << "1";
+                    std::cout << " ";
                 }
             }
             std::cout << " ";
diff --git a/src/Font.cpp b/src/Font.cpp
index 3c07b4a..f29fdf0 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -13,6 +13,7 @@ Font::Font() {
     yCount = 4;
     xStart = 1;
     yStart = 2;
+    fillValue = 0xffffff;
 }
 
 Font::Font(const std::string &file) : Font() {
@@ -31,7 +32,7 @@ int Font::height() {
     return ySize;
 }
 
-unsigned int Font::getPixel(char character, int x, int y) {
+bool Font::getPixel(char character, int x, int y) {
     //index of character(x and y)
     int index = (character - ' ');
     int xIndex = index % xCount;
@@ -41,6 +42,6 @@ unsigned int Font::getPixel(char character, int x, int y) {
     int xPos = xIndex * (xSize + xOffset) + xStart;
     int yPos = yIndex * (ySize + yOffset) + yStart;
 
-    return bitmap.getPixel(xPos + x, yPos + y);
+    return bitmap.getPixel(xPos + x, yPos + y) == fillValue;
 }
 
diff --git a/src/Font.h b/src/Font.h
index 46de566..41459dd 100644
--- a/src/Font.h
+++ b/src/Font.h
@@ -28,13 +28,15 @@ public:
     int xStart;
     int yStart;
 
+    unsigned int fillValue;
+
     Font();
     explicit Font(const std::string &file);
     void load(const std::string &file);
 
     int width();
     int height();
-    unsigned int getPixel(char character, int x, int y);
+    bool getPixel(char character, int x, int y);
 };