Did this work?

This commit is contained in:
2017-10-05 23:30:12 -07:00
parent 2d2a854f0f
commit 58ef1da02a
19 changed files with 366 additions and 428 deletions

View File

@@ -34,9 +34,8 @@
// Srsly people who macro error codes are the devil
#undef ERROR
#include "Logger.h"
#include "FrameWatcher.h"
class Application: private Gui {
class Application {
public:
const int WINDOW_X = 1536;
@@ -72,8 +71,6 @@ private:
Input input_handler;
std::shared_ptr<WindowHandler> window_handler;
FrameWatcher frame_watcher;
// The sfml imgui wrapper I'm using requires Update be called with sf::Time
// Might modify it to also accept seconds
sf::Clock sf_delta_clock;
@@ -93,9 +90,4 @@ private:
delta_time = 0.0,
accumulator_time = 0.0,
current_time = 0.0;
public:
virtual void render_gui() override;
virtual void update_gui() override;
};
};