fix direct rendering

[blank.git] / src / app / init.cpp

diff --git a/src/app/init.cpp b/src/app/init.cpp
index 1cc0c2485b50db7e79a5fdd5baf242ef4201a72d..fea5653cf1cf6499bb378b22286169cf2c15fff8 100644 (file)
--- a/src/app/init.cpp
+++ b/src/app/init.cpp
@@ -1,8 +1,10 @@
 #include "init.hpp"
 
 #include <algorithm>
+#include <alut.h>
 #include <SDL.h>
 #include <SDL_image.h>
+#include <SDL_net.h>
 #include <SDL_ttf.h>
 #include <GL/glew.h>
 
@@ -19,10 +21,50 @@ std::string sdl_error_append(std::string msg) {
        return msg;
 }
 
+std::string net_error_append(std::string msg) {
+       const char *error = SDLNet_GetError();
+       if (*error != '\0') {
+               msg += ": ";
+               msg += error;
+       }
+       return msg;
+}
+
+std::string alut_error_append(ALenum num, std::string msg) {
+       const char *error = alutGetErrorString(num);
+       if (*error != '\0') {
+               msg += ": ";
+               msg += error;
+       }
+       return msg;
+}
+
 }
 
 namespace blank {
 
+AlutError::AlutError(ALenum num)
+: std::runtime_error(alutGetErrorString(num)) {
+
+}
+
+AlutError::AlutError(ALenum num, const std::string &msg)
+: std::runtime_error(alut_error_append(num, msg)) {
+
+}
+
+
+NetError::NetError()
+: std::runtime_error(SDLNet_GetError()) {
+
+}
+
+NetError::NetError(const std::string &msg)
+: std::runtime_error(net_error_append(msg)) {
+
+}
+
+
 SDLError::SDLError()
 : std::runtime_error(SDL_GetError()) {
 
@@ -35,8 +77,8 @@ SDLError::SDLError(const std::string &msg)
 
 
 InitSDL::InitSDL() {
-       if (SDL_Init(SDL_INIT_VIDEO) != 0) {
-               throw SDLError("SDL_Init(SDL_INIT_VIDEO)");
+       if (SDL_Init(SDL_INIT_EVENTS) != 0) {
+               throw SDLError("SDL_Init(SDL_INIT_EVENTS)");
        }
 }
 
@@ -45,6 +87,19 @@ InitSDL::~InitSDL() {
 }
 
 
+InitVideo::InitVideo() {
+       if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0) {
+               throw SDLError("SDL_InitSubSystem(SDL_INIT_VIDEO)");
+       }
+       // SDL seems to start out in text input state
+       SDL_StopTextInput();
+}
+
+InitVideo::~InitVideo() {
+       SDL_QuitSubSystem(SDL_INIT_VIDEO);
+}
+
+
 InitIMG::InitIMG() {
        if (IMG_Init(IMG_INIT_PNG) == 0) {
                throw SDLError("IMG_Init(IMG_INIT_PNG)");
@@ -56,6 +111,17 @@ InitIMG::~InitIMG() {
 }
 
 
+InitNet::InitNet() {
+       if (SDLNet_Init() != 0) {
+               throw SDLError("SDLNet_Init()");
+       }
+}
+
+InitNet::~InitNet() {
+       SDLNet_Quit();
+}
+
+
 InitTTF::InitTTF() {
        if (TTF_Init() != 0) {
                throw SDLError("TTF_Init()");
@@ -67,6 +133,19 @@ InitTTF::~InitTTF() {
 }
 
 
+InitAL::InitAL() {
+       if (!alutInit(nullptr, nullptr)) {
+               throw AlutError(alutGetError(), "alutInit");
+       }
+}
+
+InitAL::~InitAL() {
+       if (!alutExit()) {
+               throw AlutError(alutGetError(), "alutExit");
+       }
+}
+
+
 InitGL::InitGL(bool double_buffer, int sample_size) {
        if (SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3) != 0) {
                throw SDLError("SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3)");
@@ -78,9 +157,9 @@ InitGL::InitGL(bool double_buffer, int sample_size) {
                throw SDLError("SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE)");
        }
 
-       if (double_buffer) {
-               if (SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1) != 0) {
-                       throw SDLError("SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1)");
+       if (!double_buffer) {
+               if (SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 0) != 0) {
+                       throw SDLError("SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 0)");
                }
        }
 
@@ -164,8 +243,14 @@ InitGLEW::InitGLEW() {
 }
 
 
-Init::Init(bool double_buffer, int sample_size)
+InitHeadless::InitHeadless()
 : init_sdl()
+, init_net() {
+
+}
+
+Init::Init(bool double_buffer, int sample_size)
+: init_video()
 , init_img()
 , init_ttf()
 , init_gl(double_buffer, sample_size)