From 379803180921534a42743c1c5fb40647015c3dba Mon Sep 17 00:00:00 2001 From: majortom6 Date: Sun, 19 Feb 2017 11:13:04 -0600 Subject: -removed rectdrawer -removed unused shader -cleaned up main and window --- src/window.cpp | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) (limited to 'src/window.cpp') diff --git a/src/window.cpp b/src/window.cpp index 77d9549..9306b15 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -2,23 +2,22 @@ Window::Window(int width, int height, const std::string& title) { - SDL_Init(SDL_INIT_EVERYTHING); - - SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8); - SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8); - SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8); - SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8); - SDL_GL_SetAttribute(SDL_GL_BUFFER_SIZE, 32); - SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); - - main = SDL_CreateWindow(title.c_str(), SDL_WINDOWPOS_CENTERED,SDL_WINDOWPOS_CENTERED,width,height,SDL_WINDOW_OPENGL); - glContext = SDL_GL_CreateContext(main); - GLenum status = glewInit(); - closed = false; - - if(status != GLEW_OK) - std::cerr << "Failiure to init." << std::endl; - + SDL_Init(SDL_INIT_EVERYTHING); + + SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8); + SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8); + SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8); + SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8); + SDL_GL_SetAttribute(SDL_GL_BUFFER_SIZE, 32); + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); + + main = SDL_CreateWindow(title.c_str(), SDL_WINDOWPOS_CENTERED,SDL_WINDOWPOS_CENTERED,width,height,SDL_WINDOW_OPENGL); + glContext = SDL_GL_CreateContext(main); + GLenum status = glewInit(); + closed = false; + + if(status != GLEW_OK) + std::cerr << "Failiure to init." << std::endl; } Window::~Window() @@ -30,12 +29,12 @@ Window::~Window() void Window::swapBuffers() { - SDL_GL_SwapWindow(main); + SDL_GL_SwapWindow(main); } -void Window::Clear(float r, float g, float b, float a) +void Window::Clear() { - glClearColor(r, g, b, a); - glClear(GL_COLOR_BUFFER_BIT); + glClearColor(0.0f, 0.0f, 0.0f, 1.0f); + glClear(GL_COLOR_BUFFER_BIT); } -- cgit v1.2.3