Browse Source

glew wrapper moved to gaming core

Kajetan Johannes Hammerle 3 years ago
parent
commit
6dfde6d8b9
3 changed files with 4 additions and 12 deletions
  1. 2 11
      Main.cpp
  2. 1 1
      gaming-core
  3. 1 0
      meson.build

+ 2 - 11
Main.cpp

@@ -3,6 +3,7 @@
 
 #include "gaming-core/wrapper/GLFW.h"
 #include "gaming-core/wrapper/GL.h"
+#include "gaming-core/wrapper/GLEW.h"
 #include "rendering/wrapper/Window.h"
 #include "rendering/Options.h"
 #include "gaming-core/utils/Clock.h"
@@ -10,16 +11,6 @@
 #include "rendering/Renderer.h"
 #include "Game.h"
 
-bool initGLEW() {
-    GLenum err = glewInit();
-    if(err != GLEW_OK) {
-        std::cout << "could not initialize GLEW: " << glewGetErrorString(err) << "\n";
-        return true;
-    }
-    std::cout << "using GLEW " << glewGetString(GLEW_VERSION) << "\n";
-    return false;
-}
-
 bool parseArgs(int argAmount, char* const* args, Options& options) {
     while(true) {
         switch(getopt(argAmount, args, "fv")) {
@@ -50,7 +41,7 @@ int main(int argAmount, char* const* args) {
     Size size(800, 480);
     Controller controller;
     Window window(size, controller, options);
-    if(window.hasError() || initGLEW()) {
+    if(window.hasError() || GLEW::init()) {
         return 0;
     }
 

+ 1 - 1
gaming-core

@@ -1 +1 @@
-Subproject commit 4a994d3a5cf2ae6e058ca33162143b82cfd9abfd
+Subproject commit 144ae380f04a521d93dc63a58d644c84cf944e5b

+ 1 - 0
meson.build

@@ -4,6 +4,7 @@ sources = [
     'Main.cpp', 
     'gaming-core/wrapper/GLFW.cpp', 
     'gaming-core/wrapper/GL.cpp', 
+    'gaming-core/wrapper/GLEW.cpp', 
     'gaming-core/utils/Size.cpp', 
     'rendering/wrapper/Window.cpp', 
     'gaming-core/utils/Clock.cpp',