+glad

1 files changed, 18 insertions, 6 deletions

diff --git a/src/libjin/graphics/je_gl.cpp b/src/libjin/graphics/je_gl.cpp
index 3ce869a..1783ef1 100644
--- a/src/libjin/graphics/je_gl.cpp
+++ b/src/libjin/graphics/je_gl.cpp
@@ -1,4 +1,6 @@
 #define OGL2D_IMPLEMENT
+#include "../utils/je_log.h"
+
 #include "je_gl.h"
 #include "je_color.h"
 #include "je_canvas.h"
@@ -18,7 +20,7 @@ namespace JinEngine
 
         OpenGL gl;
 
-        Canvas* const OpenGL::DEFAULT_CANVAS = new Canvas(0);
+        Canvas* const OpenGL::SCREEN = NULL;
 
         OpenGL::OpenGL()
         {
@@ -35,10 +37,21 @@ namespace JinEngine
         {
         }
 
+        bool OpenGL::initContext()
+        {
+            // Init glad library.
+            if (!gladLoadGLLoader(SDL_GL_GetProcAddress))
+            {
+                jin_log_error("init opengl context failed");
+                return false;
+            }
+
+            return true;
+        }
+
         void OpenGL::init()
         {
             enable(GL_BLEND);
-            //enable(GL_TEXTURE_2D);
             setClearColor(0, 0, 0, 0xff);
             setColor(0xff, 0xff, 0xff, 0xff);
             setBlendMode(OpenGL::BlendMode::ALPHA);
@@ -350,18 +363,17 @@ namespace JinEngine
         void OpenGL::unbindCanvas()
         {
             // Default bind to default canvas.
-            if (getCanvas() == DEFAULT_CANVAS)
+            if (getCanvas() == SCREEN)
                 return;
             // Get window size as viewport.
             Window* wnd = Window::get();
             int w = wnd->getW();
             int h = wnd->getH();
-            GLuint fbo = DEFAULT_CANVAS->getGLFrameBuffer();
-            glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+            glBindFramebuffer(GL_FRAMEBUFFER, 0);
             glViewport(0, 0, w, h);
             gl.setProjectionMatrix(0, w, h, 0, -1, 1);
 
-            mCanvas = DEFAULT_CANVAS;
+            mCanvas = SCREEN;
         }
 
         Canvas* OpenGL::getCanvas()