From 566bfee91e45904e877f87d96168f536793eb5d6 Mon Sep 17 00:00:00 2001
From: Julian Hinxlage <hinxlage.julian@web.de>
Date: Wed, 23 Oct 2019 13:39:51 +0200
Subject: [PATCH] + second font

---
 main/main.cpp                 |   2 +-
 res/{font.bmp => font1.bmp}   | Bin
 res/{font.toml => font1.toml} |   3 ++-
 res/font2.bmp                 | Bin 0 -> 393354 bytes
 res/font2.toml                |  10 ++++++++++
 src/Bitmap.cpp                |   3 +++
 src/Font.cpp                  |   4 +++-
 src/Font.h                    |   1 +
 8 files changed, 20 insertions(+), 3 deletions(-)
 rename res/{font.bmp => font1.bmp} (100%)
 rename res/{font.toml => font1.toml} (71%)
 create mode 100644 res/font2.bmp
 create mode 100644 res/font2.toml

diff --git a/main/main.cpp b/main/main.cpp
index 057c501..6e06b4e 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -12,7 +12,7 @@
  * Currently only to test.
  */
 int main() {
-    Font font("../res/font.bmp","../res/font.toml");
+    Font font("../res/font1.bmp","../res/font1.toml");
 
     std::string str;
     std::cout << "string to draw: ";
diff --git a/res/font.bmp b/res/font1.bmp
similarity index 100%
rename from res/font.bmp
rename to res/font1.bmp
diff --git a/res/font.toml b/res/font1.toml
similarity index 71%
rename from res/font.toml
rename to res/font1.toml
index b56bd8a..f0eabc5 100644
--- a/res/font.toml
+++ b/res/font1.toml
@@ -6,4 +6,5 @@ xCount = 18
 yCount = 4
 xStart = 1
 yStart = 2
-fillValue = 0xffffff
\ No newline at end of file
+fillValue = 0xffffff
+firstChar = 32
diff --git a/res/font2.bmp b/res/font2.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..1962db214e9d27bdf82af87095deea4186877bb4
GIT binary patch
literal 393354
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
JochXs{uf~UOospf

literal 0
HcmV?d00001

diff --git a/res/font2.toml b/res/font2.toml
new file mode 100644
index 0000000..4720c41
--- /dev/null
+++ b/res/font2.toml
@@ -0,0 +1,10 @@
+xOffset = 2
+yOffset = 16
+xSize = 6
+ySize = 6
+xCount = 16
+yCount = 6
+xStart = 1
+yStart = 2
+fillValue = 0xffffff
+firstChar = 33
diff --git a/src/Bitmap.cpp b/src/Bitmap.cpp
index a7fc8e8..49968c1 100644
--- a/src/Bitmap.cpp
+++ b/src/Bitmap.cpp
@@ -56,5 +56,8 @@ unsigned int Bitmap::getPixel(int x, int y) {
     for(int i = 0; i < getBitsPerPixel() / 8;i++){
         *((char*)&pixel+i) = ptr[i];
     }
+    if(pixel != 0){
+        return pixel;
+    }
     return pixel;
 }
diff --git a/src/Font.cpp b/src/Font.cpp
index 9674f4a..83d7dc7 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -15,6 +15,7 @@ Font::Font() {
     xStart = 0;
     yStart = 0;
     fillValue = 0;
+    firstChar = ' ';
 }
 
 Font::Font(const std::string &file, const std::string &configFile) : Font() {
@@ -33,6 +34,7 @@ void Font::load(const std::string &file, const std::string &configFile) {
     xStart = config->get_as<int>("xStart").value_or(0);
     yStart = config->get_as<int>("yStart").value_or(0);
     fillValue = config->get_as<unsigned int>("fillValue").value_or(0);
+    firstChar = (char)config->get_as<int>("firstChar").value_or(0);
 }
 
 int Font::width() {
@@ -45,7 +47,7 @@ int Font::height() {
 
 bool Font::getPixel(char character, int x, int y) {
     //index of character(x and y)
-    int index = (character - ' ');
+    int index = (character - firstChar);
     int xIndex = index % xCount;
     int yIndex = index / xCount;
 
diff --git a/src/Font.h b/src/Font.h
index 8a7d3f9..3a1a482 100644
--- a/src/Font.h
+++ b/src/Font.h
@@ -29,6 +29,7 @@ public:
     int yStart;
 
     unsigned int fillValue;
+    char firstChar;
 
     Font();
     explicit Font(const std::string &file, const std::string &configFile);