From c2de9b08d6095f31611945253430fcada5e3a3e5 Mon Sep 17 00:00:00 2001
From: John McCardle <mccardle.john@gmail.com>
Date: Sat, 20 Apr 2024 14:16:14 -0400
Subject: [PATCH] Refactor: remove "s" prefix from "sRender" method ( ->
 "render") Closes #44

---
 src/GameEngine.cpp  |  2 +-
 src/PyScene.cpp     |  2 +-
 src/PyScene.h       |  2 +-
 src/Scene.h         |  2 +-
 src/UITestScene.cpp |  2 +-
 src/UITestScene.h   |  2 +-
 src/scripts/game.py | 11 ++++++++---
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/GameEngine.cpp b/src/GameEngine.cpp
index d1d035f..fdf0d84 100644
--- a/src/GameEngine.cpp
+++ b/src/GameEngine.cpp
@@ -59,7 +59,7 @@ void GameEngine::run()
         if (!paused)
         {
         }
-        currentScene()->sRender();
+        currentScene()->render();
         currentFrame++;
         frameTime = clock.restart().asSeconds();
         fps = 1 / frameTime;
diff --git a/src/PyScene.cpp b/src/PyScene.cpp
index 5ed8b74..31db583 100644
--- a/src/PyScene.cpp
+++ b/src/PyScene.cpp
@@ -59,7 +59,7 @@ void PyScene::doAction(std::string name, std::string type)
     }
 }
 
-void PyScene::sRender()
+void PyScene::render()
 {
     game->getWindow().clear();
     
diff --git a/src/PyScene.h b/src/PyScene.h
index e502fc2..068e714 100644
--- a/src/PyScene.h
+++ b/src/PyScene.h
@@ -11,7 +11,7 @@ public:
     PyScene(GameEngine*);
     void update() override final;
     void doAction(std::string, std::string) override final;
-    void sRender() override final;
+    void render() override final;
 
     void do_mouse_input(std::string, std::string);
 };
diff --git a/src/Scene.h b/src/Scene.h
index 02931b1..0ebb5a9 100644
--- a/src/Scene.h
+++ b/src/Scene.h
@@ -31,7 +31,7 @@ public:
     //Scene();
     Scene(GameEngine*);
     virtual void update() = 0;
-    virtual void sRender() = 0;
+    virtual void render() = 0;
     virtual void doAction(std::string, std::string) = 0;
     bool hasAction(std::string);
     bool hasAction(int);
diff --git a/src/UITestScene.cpp b/src/UITestScene.cpp
index 9250402..17f2416 100644
--- a/src/UITestScene.cpp
+++ b/src/UITestScene.cpp
@@ -154,7 +154,7 @@ void UITestScene::doAction(std::string name, std::string type)
     */
 }
 
-void UITestScene::sRender()
+void UITestScene::render()
 {
     game->getWindow().clear();
     game->getWindow().draw(text);
diff --git a/src/UITestScene.h b/src/UITestScene.h
index 9494bfe..7b09278 100644
--- a/src/UITestScene.h
+++ b/src/UITestScene.h
@@ -18,5 +18,5 @@ public:
     UITestScene(GameEngine*);
     void update() override final;
     void doAction(std::string, std::string) override final;
-    void sRender() override final;
+    void render() override final;
 };
diff --git a/src/scripts/game.py b/src/scripts/game.py
index 87eaf5a..962fc91 100644
--- a/src/scripts/game.py
+++ b/src/scripts/game.py
@@ -14,18 +14,23 @@ ui = mcrfpy.sceneUI("pytest")
 
 # Frame
 f = mcrfpy.Frame(25, 19, 462, 346, fill_color=(255, 92, 92))
+print("Frame alive")
 # fill (LinkedColor / Color):    f.fill_color
 # outline (LinkedColor / Color): f.outline_color
 # pos (LinkedVector / Vector):   f.pos
 # size (LinkedVector / Vector):  f.size
 
 # Caption
-c = mcrfpy.Caption(512+25, 19, "Hi.", font)
+print("Caption attempt w/ fill_color:")
+#c = mcrfpy.Caption(512+25, 19, "Hi.", font)
+#c = mcrfpy.Caption(512+25, 19, "Hi.", font, fill_color=(255, 128, 128))
+c = mcrfpy.Caption(512+25, 19, "Hi.", font, fill_color=mcrfpy.Color(255, 128, 128), outline_color=(128, 255, 128))
+print("Caption alive")
 # fill (LinkedColor / Color):    c.fill_color
 #color_val = c.fill_color
 print(c.fill_color)
-print("Set a fill color")
-c.fill_color = (255, 255, 255)
+#print("Set a fill color")
+#c.fill_color = (255, 255, 255)
 print("Lol, did it segfault?")
 # outline (LinkedColor / Color): c.outline_color
 # font (Font):                   c.font