From 152d4cf037437babbabfc387e2b79f10c1bf83ef Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Tue, 10 Sep 2024 21:29:01 -0400
Subject: [PATCH] A bit more source refactoring.

---
 gui.cpp                        |  4 ++--
 meson.build                    |  2 +-
 sfmlgui.cpp => sfmlbackend.cpp | 24 ++++++++++++------------
 sfmlgui.hpp => sfmlbackend.hpp |  4 ++--
 xmake.lua                      | 12 ------------
 5 files changed, 17 insertions(+), 29 deletions(-)
 rename sfmlgui.cpp => sfmlbackend.cpp (86%)
 rename sfmlgui.hpp => sfmlbackend.hpp (95%)
 delete mode 100644 xmake.lua

diff --git a/gui.cpp b/gui.cpp
index 3d60446..45647b4 100644
--- a/gui.cpp
+++ b/gui.cpp
@@ -8,7 +8,7 @@
 #include <SFML/Audio.hpp>
 #include <nlohmann/json.hpp>
 #include <fstream>
-#include "sfmlgui.hpp"
+#include "sfmlbackend.hpp"
 #include "builder.hpp"
 
 using std::string, std::vector;
@@ -52,7 +52,7 @@ void GUI::output(const string msg) {
 }
 
 int GUI::main_loop(GameEngine &game, Builder &builder) {
-  auto gui = SFMLGui(game);
+  auto gui = SFMLBackend(game);
 
   gui.startup();
 
diff --git a/meson.build b/meson.build
index ae9148a..eba88b8 100644
--- a/meson.build
+++ b/meson.build
@@ -32,7 +32,7 @@ executable('escape_turings_tarpit',
     'gui.cpp',
     'watcher.cpp',
     'builder.cpp',
-    'sfmlgui.cpp',
+    'sfmlbackend.cpp',
     'escape_turings_tarpit.cpp'],
   dependencies: dependencies)
 
diff --git a/sfmlgui.cpp b/sfmlbackend.cpp
similarity index 86%
rename from sfmlgui.cpp
rename to sfmlbackend.cpp
index 1337733..6700617 100644
--- a/sfmlgui.cpp
+++ b/sfmlbackend.cpp
@@ -9,17 +9,17 @@
 #include <SFML/Graphics/Text.hpp>
 #include <SFML/Audio.hpp>
 #include <SFML/Window/Event.hpp>
-#include "sfmlgui.hpp"
+#include "sfmlbackend.hpp"
 
 using namespace ImGui;
 using std::string;
 
-void SFMLGui::ImGui_setup() {
+void SFMLBackend::ImGui_setup() {
   bool res = SFML::Init(window);
   fmt::println("IMGUI returned {}", res);
 }
 
-void SFMLGui::ImGui_update() {
+void SFMLBackend::ImGui_update() {
   sf::Vector2u size = window.getSize();
 
   SFML::Update(window, deltaClock.restart());
@@ -38,14 +38,14 @@ void SFMLGui::ImGui_update() {
   End();
 }
 
-void SFMLGui::Window_update() {
+void SFMLBackend::Window_update() {
     if(show_build_log) {
       SFML::Render(window);
     }
     window.display();
 }
 
-void SFMLGui::handle_events() {
+void SFMLBackend::handle_events() {
   sf::Event event;
 
   // is this a main event loop
@@ -87,7 +87,7 @@ sf::Vector2f translate(int x, int y) {
 }
 
 
-void SFMLGui::write_text(int x, int y, string content) {
+void SFMLBackend::write_text(int x, int y, string content) {
   sf::Vector2f position = translate(x,y);
   sf::Text text;
   text.setFont(font);
@@ -98,7 +98,7 @@ void SFMLGui::write_text(int x, int y, string content) {
   window.draw(text);
 }
 
-void SFMLGui::update_entities() {
+void SFMLBackend::update_entities() {
   window.clear();
 
   sf::RectangleShape face_box(translate(X_ROWS/4, Y_LINES/2));
@@ -135,19 +135,19 @@ void SFMLGui::update_entities() {
   show_build_log = window_active_out;
 }
 
-SFMLGui::SFMLGui(GameEngine &g) : window(sf::VideoMode(X_DIM, Y_DIM), "Turing's Tarpit", sf::Style::None, settings), game(g)
+SFMLBackend::SFMLBackend(GameEngine &g) : window(sf::VideoMode(X_DIM, Y_DIM), "Turing's Tarpit", sf::Style::None, settings), game(g)
 {
 
 }
 
-void SFMLGui::update_log(std::vector<string> &lines) {
+void SFMLBackend::update_log(std::vector<string> &lines) {
   log.clear();
   for(string &line : lines) {
     log.push_back(line);
   }
 }
 
-void SFMLGui::startup() {
+void SFMLBackend::startup() {
   fmt::print("Setting up a window for you...\n");
   settings.antialiasingLevel = 8;
 
@@ -162,10 +162,10 @@ void SFMLGui::startup() {
   ImGui_setup();
 }
 
-bool SFMLGui::is_open() {
+bool SFMLBackend::is_open() {
   return window.isOpen();
 }
 
-void SFMLGui::shutdown() {
+void SFMLBackend::shutdown() {
   SFML::Shutdown();
 }
diff --git a/sfmlgui.hpp b/sfmlbackend.hpp
similarity index 95%
rename from sfmlgui.hpp
rename to sfmlbackend.hpp
index de19839..dd7f77a 100644
--- a/sfmlgui.hpp
+++ b/sfmlbackend.hpp
@@ -15,7 +15,7 @@ constexpr int TEXT_SIZE = 48;
 constexpr int Y_LINES = 23;
 constexpr int X_ROWS = 48;
 
-class SFMLGui {
+class SFMLBackend {
   sf::ContextSettings settings;
   sf::RenderWindow window;
   sf::Clock clock;
@@ -30,7 +30,7 @@ class SFMLGui {
   std::vector<string> log;
 
 public:
-  SFMLGui(GameEngine &g);
+  SFMLBackend(GameEngine &g);
 
   void startup();
 
diff --git a/xmake.lua b/xmake.lua
deleted file mode 100644
index 8f5644f..0000000
--- a/xmake.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-add_requires(
-  "efsw",
-  "fmt",
-  {configs = {cxflags = "-DFMT_HEADER_ONLY"}})
-
-target("watchgit")
-  set_kind("binary")
-  add_files("watchgit.cpp")
-  set_languages("c++20")
-  add_packages(
-    "fmt",
-    "efsw")