From b3434e9fadd2ebb27ab4be84138ca3080f54ca8a Mon Sep 17 00:00:00 2001
From: sigonasr2 <sigonasr2@gmail.com>
Date: Wed, 13 Mar 2024 05:02:56 -0500
Subject: [PATCH] Incorporate game font.

---
 TiledCollisionEditor/font.png          | Bin 0 -> 5189 bytes
 TiledCollisionEditor/main.cpp          |   9 +++++++++
 TiledCollisionEditor/pixelGameEngine.h |   8 ++++++--
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 TiledCollisionEditor/font.png

diff --git a/TiledCollisionEditor/font.png b/TiledCollisionEditor/font.png
new file mode 100644
index 0000000000000000000000000000000000000000..a29f329cc1b85ec8ab17ead6b8f9eda240c411c0
GIT binary patch
literal 5189
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
B_M-p*

literal 0
HcmV?d00001

diff --git a/TiledCollisionEditor/main.cpp b/TiledCollisionEditor/main.cpp
index e6c4e22..2b00d44 100644
--- a/TiledCollisionEditor/main.cpp
+++ b/TiledCollisionEditor/main.cpp
@@ -23,6 +23,8 @@ public:
 public:
 	bool OnUserCreate() override
 	{
+		SetFontSprite("font.png");
+
 		std::string tilesetFilename=TILESET_DIR+"Basic Tileset.tsx";
 		Tileset&tileset=tilesets[tilesetFilename]=TSXParser{tilesetFilename}.GetData();
 
@@ -75,6 +77,13 @@ public:
 			}
 		}
 
+		/* Font test.
+		DrawStringDecal({0,0},"the quick brown fox jumps over the lazy dog",WHITE,{1.5f,1.5f});
+		DrawStringDecal({0,18},"THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG",WHITE,{1.5f,1.5f});
+		DrawStringPropDecal({0,36},"the quick brown fox jumps over the lazy dog",WHITE,{1.5f,1.5f});
+		DrawStringPropDecal({0,54},"THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG",WHITE,{1.5f,1.5f});
+		*/
+
 		return true;
 	}
 };
diff --git a/TiledCollisionEditor/pixelGameEngine.h b/TiledCollisionEditor/pixelGameEngine.h
index bb9ad71..1c9561c 100644
--- a/TiledCollisionEditor/pixelGameEngine.h
+++ b/TiledCollisionEditor/pixelGameEngine.h
@@ -1154,6 +1154,7 @@ namespace olc
 		void ClearBuffer(Pixel p, bool bDepth = true);
 		// Returns the font image
 		olc::Sprite* GetFontSprite();
+		void SetFontSprite(std::string_view newFontFile);
 
 		// Clip a line segment to visible area
 		bool ClipLineToScreen(olc::vi2d& in_p1, olc::vi2d& in_p2);
@@ -2377,6 +2378,9 @@ namespace olc
 	olc::Sprite* PixelGameEngine::GetFontSprite()
 	{ return fontRenderable.Sprite(); }
 
+	void PixelGameEngine::SetFontSprite(std::string_view newFontFile)
+	{ fontRenderable.Load(std::string(newFontFile)); }
+
 	bool PixelGameEngine::ClipLineToScreen(olc::vi2d& in_p1, olc::vi2d& in_p2)
 	{
 		// https://en.wikipedia.org/wiki/Cohen%E2%80%93Sutherland_algorithm
@@ -4071,8 +4075,8 @@ namespace olc
 			0x08,0x17,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x24,0x15,0x06,0x07,0x16,0x17,
 			0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x17,0x08,0x08,0x17,0x08,0x08,0x08,
 			0x08,0x08,0x08,0x08,0x17,0x08,0x08,0x08,0x08,0x17,0x08,0x15,0x08,0x15,0x08,0x08,
-			0x24,0x18,0x17,0x17,0x17,0x17,0x17,0x17,0x17,0x33,0x17,0x17,0x33,0x18,0x17,0x17,
-			0x17,0x17,0x17,0x17,0x07,0x17,0x17,0x18,0x18,0x17,0x17,0x07,0x33,0x07,0x08,0x00, } };
+			0x24,0x16,0x16,0x17,0x16,0x16,0x15,0x17,0x17,0x33,0x15,0x17,0x23,0x08,0x17,0x16,
+			0x07,0x07,0x24,0x17,0x06,0x17,0x16,0x08,0x23,0x17,0x17,0x07,0x33,0x07,0x08,0x00, } };
 
 		for (auto c : vSpacing) vFontSpacing.push_back({ c >> 4, c & 15 });