Added some log infos and some cleaning

platform/nspire/Graphics.cpp

@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include "Graphics.h"
+#include "Logger.h"
 #include "CXfb.h"
 #include "utility/misc.h"
 #include "utility/minmax.h"
@@ -10,11 +11,13 @@ using WalrusRPG::Utils::Rect;
 
 void Graphics::init()
 {
+    Logger::log("Graphics init");
     CXfb::buffer_allocate();
 }
 
 void Graphics::deinit()
 {
+    Logger::log("Graphics deinit");
     CXfb::buffer_free();
 }
 

platform/nspire/Interrupts.cpp

@@ -1,4 +1,5 @@
 #include "Interrupts.h"
+#include "Logger.h"
 #include "CXfb.h"
 
 #define INTERRUPTS Nspire::Interrupts
@@ -21,6 +22,9 @@ static bool is_on = false;
 
 void INTERRUPTS::init()
 {
+    if (is_on)
+        return;
+    WalrusRPG::Logger::log("Interrupts init");
     is_on = true;
 
     interrupt_select_bkp = *interrupt_select;
@@ -47,6 +51,7 @@ void INTERRUPTS::off()
 {
     if (!is_on)
         return;
+    WalrusRPG::Logger::log("Interupts deinit");
     is_on = false;
     // Disable IRQ in the CPU
     asm(

platform/nspire/Quirks.cpp

@@ -3,6 +3,7 @@
 #include <memory>
 #include <TINYSTL/string.h>
 #include "Quirks.h"
+#include "Logger.h"
 #include "Interrupts.h"
 #include "platform.h"
 
@@ -18,6 +19,7 @@ namespace
 
 void Quirks::init(const char *argv_0)
 {
+    WalrusRPG::Logger::log("Quirks init");
     Interrupts::init();
     // Find last '/' occurence and remove the trailing characters
     // so we get rid of the executable name.
@@ -38,6 +40,7 @@ void Quirks::init(const char *argv_0)
 
 void Quirks::deinit()
 {
+    WalrusRPG::Logger::log("Quirks deinit");
     Interrupts::off();
     delete[] base_path;
 }

platform/nspire/Timing.cpp

@@ -1,4 +1,5 @@
 #include "Timing.h"
+#include "Logger.h"
 #include "Timers.h"
 
 #define TIMING WalrusRPG::Timing
@@ -7,6 +8,7 @@ using namespace Nspire;
 
 void TIMING::init()
 {
+    Logger::log("Timing init");
     Timers::init(TIMER);
     Timers::mode(TIMER, true, false, false, 1, true);
     Timers::load(TIMER, 0xFFFFFFFF);
@@ -14,6 +16,7 @@ void TIMING::init()
 
 void TIMING::deinit()
 {
+    Logger::log("Timing deinit");
     Timers::restore(TIMER);
 }
 

platform/sfml/Graphics.cpp

@@ -1,4 +1,5 @@
 #include "Graphics.h"
+#include "Logger.h"
 #include "sfwindow.h"
 #include <SFML/Graphics.hpp>
 #include "utility/misc.h"
@@ -14,6 +15,7 @@ sf::RenderTexture buffer;
 
 void Graphics::init()
 {
+    Logger::log("Graphics init");
     // window.create(sf::VideoMode::getDesktopMode(), "WalrusRPG",
     // sf::Style::Fullscreen);
     window.create(sf::VideoMode(640, 480), "WalrusRPG");
@@ -24,6 +26,7 @@ void Graphics::init()
 
 void Graphics::deinit()
 {
+    Logger::log("Graphics deinit");
     window.close();
 }
 

platform/sfml/Quirks.cpp

@@ -1,5 +1,6 @@
 #include <cstring>
 #include "Quirks.h"
+#include "Logger.h"
 #include "utility/misc.h"
 #include "sfwindow.h"
 
@@ -8,11 +9,13 @@ using tinystl::string;
 
 void Quirks::init(const char *argv_0)
 {
+    Logger::log("Quirks init");
     UNUSED(argv_0);
 }
 
 void Quirks::deinit()
 {
+    Logger::log("Graphics deinit");
 }
 
 std::unique_ptr<char> Quirks::solve_absolute_path(const char *path)

platform/sfml/Texture.cpp

@@ -7,11 +7,10 @@
 #include "utility/misc.h"
 #include "render/Pixel.h"
 
-#define TEXTURE WalrusRPG::Graphics::Texture
-
+using namespace WalrusRPG::Graphics; /*Texture*/
 using WalrusRPG::Graphics::Pixel;
 
-TEXTURE::Texture(char *data) : data()
+Texture::Texture(char *data) : data()
 {
     uint16_t *data_16 = (uint16_t *) data;
     this->data.create(data_16[0], data_16[1]);
@@ -33,7 +32,7 @@ TEXTURE::Texture(char *data) : data()
     free(pixels);
 }
 
-TEXTURE::Texture(WalrusRPG::PIAF::File entry) : data()
+Texture::Texture(WalrusRPG::PIAF::File entry) : data()
 {
     // UNUSED(data);
     // TOOD : load from PIAF
@@ -41,17 +40,17 @@ TEXTURE::Texture(WalrusRPG::PIAF::File entry) : data()
     this->data.loadFromMemory(entry.get(), entry.file_size);
 }
 
-TEXTURE::~Texture()
+Texture::~Texture()
 {
 }
 
-WalrusRPG::Utils::Rect TEXTURE::get_dimensions()
+WalrusRPG::Utils::Rect Texture::get_dimensions()
 {
     sf::Vector2u size = data.getSize();
     return WalrusRPG::Utils::Rect(0, 0, size.x, size.y);
 }
 
-const WalrusRPG::Graphics::Pixel TEXTURE::get_pixel(unsigned x, unsigned y)
+const WalrusRPG::Graphics::Pixel Texture::get_pixel(unsigned x, unsigned y)
 {
     UNUSED(x);
     UNUSED(y);

platform/sfml/Timing.cpp

@@ -1,20 +1,23 @@
 #include "Timing.h"
+#include "Logger.h"
 #include <SFML/System/Clock.hpp>
 #include <cstdio>
 
-#define TIMING WalrusRPG::Timing
+using namespace WalrusRPG; /*Timing*/
 
 sf::Clock clock;
 
-void TIMING::init()
+void Timing::init()
 {
+    Logger::log("Timing init");
 }
 
-void TIMING::deinit()
+void Timing::deinit()
 {
+    Logger::log("Timing deinit");
 }
 
-unsigned TIMING::gettime()
+unsigned Timing::gettime()
 {
     return clock.getElapsedTime().asMicroseconds();
 }

src/engine/StateMachine.cpp

@@ -1,4 +1,5 @@
 #include "StateMachine.h"
+#include "Logger.h"
 #include "Timing.h"
 #include "platform.h"
 #include "Graphics.h"
@@ -9,6 +10,7 @@
 using namespace WalrusRPG; /*::StateMachine*/
 using namespace WalrusRPG::Graphics;
 using namespace WalrusRPG::Timing;
+using namespace WalrusRPG::Logger;
 using WalrusRPG::Input::Key;
 using WalrusRPG::Input::KeyState;
 using WalrusRPG::States::State;
@@ -60,10 +62,12 @@ namespace
 
 void StateMachine::init()
 {
+    log("State Machine init");
 }
 
 void StateMachine::deinit()
 {
+    log("State Machine deinit");
     stack.clear();
 }