ソースを参照

glew wrapper moved to gaming core

Kajetan Johannes Hammerle 4 年 前
コミット
3a561094f9
3 ファイル変更4 行追加12 行削除
  1. 2 11
      client/Main.cpp
  2. 1 1
      gaming-core
  3. 1 0
      meson.build

+ 2 - 11
client/Main.cpp

@@ -2,6 +2,7 @@
 
 #include "gaming-core/wrapper/GLFW.h"
 #include "gaming-core/wrapper/GL.h"
+#include "gaming-core/wrapper/GLEW.h"
 #include "gaming-core/utils/Size.h"
 #include "client/rendering/wrapper/Window.h"
 #include "client/rendering/Shaders.h"
@@ -11,16 +12,6 @@
 #include "gaming-core/utils/Clock.h"
 #include "client/rendering/RenderSettings.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;
-}
-
 void initCallbacks(Window& w, Size& size, Framebuffers& framebuffers, Control& control) {
     static Size& cSize = size;
     static Framebuffers& cFramebuffers = framebuffers;
@@ -57,7 +48,7 @@ int main() {
     
     Size size(1024, 620);
     Window window(size, "Test");
-    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

@@ -25,6 +25,7 @@ sourcesClient = ['client/Main.cpp',
     'client/rendering/Framebuffers.cpp',
     'gaming-core/wrapper/GLFW.cpp',
     'gaming-core/wrapper/GL.cpp',
+    'gaming-core/wrapper/GLEW.cpp',
     'client/rendering/wrapper/Window.cpp',
     'client/rendering/Engine.cpp',
     'client/input/Keys.cpp',