X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2Finit.hpp;h=f1378e0c6d5a63ad81fc844ec3dbcef1ed891269;hb=ed2711d42a7815657bf0653c25b8b9be8b7f1368;hp=ba263c4b38138a6dec54aaaf24cd177f0bc93868;hpb=b999aef37fd70e6a776fb1eb787fbcec0156c660;p=blobs.git diff --git a/src/app/init.hpp b/src/app/init.hpp index ba263c4..f1378e0 100644 --- a/src/app/init.hpp +++ b/src/app/init.hpp @@ -1,41 +1,15 @@ #ifndef BLOBS_APP_INIT_HPP_ #define BLOBS_APP_INIT_HPP_ +#include "../graphics/Viewport.hpp" + #include #include -#include #include namespace blobs { - -class AlutError -: public std::runtime_error { - -public: - explicit AlutError(ALenum); - AlutError(ALenum, const std::string &); - -}; - -class SDLError -: public std::runtime_error { - -public: - SDLError(); - explicit SDLError(const std::string &); - -}; - -class NetError -: public std::runtime_error { - -public: - NetError(); - explicit NetError(const std::string &); - -}; - +namespace app { class InitSDL { @@ -123,7 +97,7 @@ public: class Window { public: - Window(); + Window(int w, int h); ~Window(); Window(const Window &) = delete; @@ -171,15 +145,6 @@ public: }; -struct InitHeadless { - - InitHeadless(); - - InitSDL init_sdl; - InitNet init_net; - -}; - struct Init { Init(bool double_buffer = true, int sample_size = 1); @@ -192,9 +157,11 @@ struct Init { Window window; GLContext ctx; InitGLEW init_glew; + graphics::Viewport viewport; }; +} } #endif