Kaynağa Gözat

refactor: minor refactorings

Douglas Andreani 1 yıl önce
ebeveyn
işleme
105458fbd3
3 değiştirilmiş dosya ile 10 ekleme ve 9 silme
  1. 1 2
      src/main.c
  2. 5 6
      src/renderer.c
  3. 4 1
      src/renderer.h

+ 1 - 2
src/main.c

@@ -2,6 +2,7 @@
 
 #include <stdio.h>
 #include <assert.h>
+
 #include <glad/glad.h>
 #include <GLFW/glfw3.h>
 
@@ -38,8 +39,6 @@ int main() {
 		ERROR_AND_QUIT(err, "could not initialize glfw");
 	}
 	
-	//assert(renderer != NULL && "failed to initialize renderer");
-	
 	glfwSetErrorCallback(error_callback);
 	glfwSetKeyCallback(renderer.window, key_callback);
 

+ 5 - 6
src/renderer.c

@@ -2,13 +2,12 @@
 #include "renderer.h"
 #include "fio.h"
 
-#include <linmath.h>
-
-#include <glad/glad.h>
-#include <assert.h>
 #include <stdio.h>
 #include <stdbool.h>
 #include <stdlib.h>
+
+#include <linmath.h>
+#include <glad/glad.h>
 #include <GLFW/glfw3.h>
 
 
@@ -73,7 +72,7 @@ RENDERER_ERROR renderer_init(Renderer *renderer, int width, int height) {
     renderer_init_quad(renderer);
     renderer_init_textures(renderer);
 	
-    return RENDERER_ERROR_GLFW;
+    return RENDERER_ERROR_OK;
 
 }
 
@@ -96,7 +95,7 @@ RENDERER_ERROR renderer_init_glfw(Renderer* renderer, int width, int height)
 
     if (!gladLoadGLLoader((GLADloadproc)glfwGetProcAddress))
     {
-        fprintf(stderr, "Failed to initialize GLAD\n");
+        fprintf(stderr, "Failed to initialize GLAD (OpenGL)\n");
         return RENDERER_ERROR_GLAD;
     }
     glViewport(0, 0, renderer->width, renderer->width);

+ 4 - 1
src/renderer.h

@@ -1,8 +1,11 @@
 #ifndef _RENDERER_H_
 #define _RENDERER_H_
+
 #include <linmath.h>
 
 #include <stdbool.h>
+#include <stdlib.h>
+
 #include <glad/glad.h>
 #include <GLFW/glfw3.h>
 
@@ -21,7 +24,7 @@ typedef int RENDERER_ERROR;
 #define ERROR_AND_QUIT(R, ...) \
 ( R==RENDERER_ERROR_GLFW ? fprintf(stderr, "GLFW: %s\n", __VA_ARGS__) \
  : R==RENDERER_ERROR_GLAD ? fprintf(stderr, "GLAD: %s\n", __VA_ARGS__) \
- : 0); exit(1)
+ : fprintf(stderr, "%s\n", __VA_ARGS__)); exit(1)
 
 
 #if 0