From cf4f8faa373f2e0f705304a21226938275a76740 Mon Sep 17 00:00:00 2001
From: Michael Ochmann <michael.ochmann@propeller.de>
Date: Sun, 5 Mar 2023 17:38:30 +0100
Subject: [PATCH] code quality: minor structural changes

---
 src/Renderer.hpp                  |  2 ++
 src/renderers/ConsoleRenderer.hpp |  9 +++++----
 src/renderers/PixelRenderer.hpp   | 19 +++++++++----------
 src/renderers/SVGRenderer.hpp     |  2 +-
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/Renderer.hpp b/src/Renderer.hpp
index 817c99a..6299ae1 100644
--- a/src/Renderer.hpp
+++ b/src/Renderer.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
 #include <vector>
+#include <string>
+#include <cstddef>
 
 namespace massivedynamic {
 	
diff --git a/src/renderers/ConsoleRenderer.hpp b/src/renderers/ConsoleRenderer.hpp
index 1299bad..74c25ce 100644
--- a/src/renderers/ConsoleRenderer.hpp
+++ b/src/renderers/ConsoleRenderer.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <iomanip>
+
 #include "Renderer.hpp"
 
 namespace massivedynamic {
@@ -10,17 +12,16 @@ class ConsoleRenderer : public Renderer {
 		virtual void render(const std::string&) override {
 			int border = 1;
 
-			std::cout << std::string(border, '\n');
+			std::cout << std::setfill('\n') << std::setw(border) << "";
 			for (int y = 0; y < sourceSize; y++) {
 				std::cout << std::string(border * 2, ' ');
 				for (int x = 0; x < sourceSize; x++) {
 					bool isFilled = pixels.at(y * sourceSize + x);
 					std::cout << (isFilled ? "██" : "  ");
 				}
-				std::cout << std::string(border * 2, ' ');
-				std::cout << '\n';
+				std::cout << std::setfill(' ') << std::setw(border * 2) << '\n';
 			}
-			std::cout << std::string(border, '\n');
+			std::cout << std::setfill('\n') << std::setw(border) << "";
 			std::cout.flush();
 		}
 };
diff --git a/src/renderers/PixelRenderer.hpp b/src/renderers/PixelRenderer.hpp
index e8e1179..cca361c 100644
--- a/src/renderers/PixelRenderer.hpp
+++ b/src/renderers/PixelRenderer.hpp
@@ -4,12 +4,13 @@
 #include <iostream>
 #include <cassert>
 
-#include "Renderer.hpp"
 #define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "stb_image_write.hpp"
+#include <stb_image_write.hpp>
+
+#include "util.hpp"
+#include "Renderer.hpp"
 
 namespace massivedynamic {
-	typedef uint32_t Color;
 
 	class PixelRenderer : public Renderer {
 		protected:
@@ -37,13 +38,11 @@ namespace massivedynamic {
 				WHITE = 0xFFFFFFFF
 			};
 
-			PixelRenderer(const std::vector<bool>& pixels, size_t sourceSize, size_t targetSize) : Renderer(pixels, sourceSize, targetSize), pixelSize(0) {
-				this->targetSize = this->targetSize == 0 ? (sourceSize + 2) * 2 : this->targetSize;
-				this->pixelSize  = round(static_cast<float>(this->targetSize) / static_cast<float>(this->sourceSize + 2));
-				this->border     = round(static_cast<float>(this->targetSize - this->pixelSize * this->sourceSize) / 2.0f);
-
-				this->bitmap = std::vector<Color>(this->targetSize * this->targetSize, Colors::WHITE);
-			}
+			PixelRenderer(const std::vector<bool>& pixels, size_t sourceSize, size_t targetSize) :
+					Renderer(pixels, sourceSize, targetSize == 0 ? (sourceSize + 2) * 2 : targetSize),
+					pixelSize(round(static_cast<float>(this->targetSize) / static_cast<float>(this->sourceSize + 2))),
+					border(round(static_cast<float>(this->targetSize - this->pixelSize * this->sourceSize) / 2.0f)),
+					bitmap(std::vector<Color>(this->targetSize * this->targetSize, Colors::WHITE)) {}
 
 			virtual void generateBuffer() {
 				for (size_t y = 0; y < sourceSize; y++) {
diff --git a/src/renderers/SVGRenderer.hpp b/src/renderers/SVGRenderer.hpp
index e8c5b16..472e3ce 100644
--- a/src/renderers/SVGRenderer.hpp
+++ b/src/renderers/SVGRenderer.hpp
@@ -40,7 +40,7 @@ namespace massivedynamic {
 					}
 				}
 
-				file << "</svg>" << std::endl;
+				file << "</svg>\n";
 
 				file.close();
 			}