also show peak in frame counter

[blank.git] / src / app / Application.hpp

diff --git a/src/app/Application.hpp b/src/app/Application.hpp
index ea7421161b9031e45aa9f54d78bff38c5be6db73..a8e0f2d00f3fdafda8df72d5533e4f86cbfe7c3c 100644 (file)
--- a/src/app/Application.hpp
+++ b/src/app/Application.hpp
@@ -2,12 +2,10 @@
 #define BLANK_APP_APPLICATION_HPP_
 
 #include "Assets.hpp"
+#include "FrameCounter.hpp"
 #include "init.hpp"
 #include "RandomWalk.hpp"
-#include "../graphics/BlendedSprite.hpp"
-#include "../graphics/BlockLighting.hpp"
-#include "../graphics/Camera.hpp"
-#include "../graphics/DirectionalLighting.hpp"
+#include "../graphics/Viewport.hpp"
 #include "../ui/Interface.hpp"
 #include "../world/World.hpp"
 
@@ -56,20 +54,11 @@ public:
        static Entity &MakeTestEntity(World &);
 
 private:
-       InitSDL init_sdl;
-       InitIMG init_img;
-       InitTTF init_ttf;
-       InitGL init_gl;
-       Window window;
-       GLContext ctx;
-       InitGLEW init_glew;
+       Init init;
+       Viewport viewport;
        Assets assets;
+       FrameCounter counter;
 
-       BlockLighting chunk_prog;
-       DirectionalLighting entity_prog;
-       BlendedSprite sprite_prog;
-
-       Camera cam;
        World world;
        Interface interface;