From d3e7738a5f7b0b41dfd5174096def9219872f8b3 Mon Sep 17 00:00:00 2001 From: Alexander Medvednikov Date: Sat, 22 Jun 2019 21:27:59 +0200 Subject: [PATCH] clean up gl --- gl/gl.v | 25 +++++++++---------------- gl/gl_lin.v | 2 -- gl/gl_mac.v | 18 ------------------ gl/gl_win.v | 12 ------------ 4 files changed, 9 insertions(+), 48 deletions(-) delete mode 100644 gl/gl_mac.v delete mode 100644 gl/gl_win.v diff --git a/gl/gl.v b/gl/gl.v index 3939c42fbd..1fc164bef6 100644 --- a/gl/gl.v +++ b/gl/gl.v @@ -1,8 +1,5 @@ module gl -// #define STB_IMAGE_IMPLEMENTATION -// #include -// /////// import const ( GL_TEXTURE_2D GL_TEXTURE0 @@ -12,27 +9,23 @@ import const ( GL_DEPTH_TEST ) -/* -type Vec3 { - x float - y float - z float +#include +#include +#include "glad.h" +#include "glad.c" +fn init_glad() { + ok := C.gladLoadGL() + if !ok { + os.exit('Failed to initialize glad OpenGL context') + } } -type Vec2 { - x int - y int -} -*/ pub fn viewport(a int, b int, c int, d int) { C.glViewport(a, b, c, d) } pub fn clear_color(r, g, b, a int) { # glClearColor(((float)r)/255.0,((float)g)/255.0,b/255.0, a/255.0); - // println('CLEAR COLOR') - // #glClearColor(0.3f, 0.9f, 0.32f, 1.0f); - // C.glClearColor(r, g, b, a) } pub fn clear() { diff --git a/gl/gl_lin.v b/gl/gl_lin.v index 83b901132c..696c1eed47 100644 --- a/gl/gl_lin.v +++ b/gl/gl_lin.v @@ -1,7 +1,5 @@ module gl -// #include -// #flag -framework OpenGL #include "glad.h" #include "glad.c" fn init_glad() { diff --git a/gl/gl_mac.v b/gl/gl_mac.v deleted file mode 100644 index bdd211c7af..0000000000 --- a/gl/gl_mac.v +++ /dev/null @@ -1,18 +0,0 @@ -module gl - -#include -#include -// #include -// #flag -framework OpenGL -#include "/Users/alex/code/lang/gl/glad.h" -#include "/Users/alex/code/lang/gl/glad.c" -fn init_glad() { - println('init_glad() win') - ok := C.gladLoadGL() - // # ok= gladLoadGLLoader((GLADloadproc) glfwGetProcAddress); - if !ok { - os.exit('Failed to initialize glad OpenGL context') - } - // # printf("glClear ADDR=%p\n", glClear); -} - diff --git a/gl/gl_win.v b/gl/gl_win.v deleted file mode 100644 index 529f1ac1b0..0000000000 --- a/gl/gl_win.v +++ /dev/null @@ -1,12 +0,0 @@ -module gl - -fn init_glad() { - println('init_glad() win') - ok := false - # ok= gladLoadGLLoader((GLADloadproc) glfwGetProcAddress); - if !ok { - os.exit('Failed to initialize glad OpenGL context') - } - # printf("glClear ADDR=%p\n", glClear); -} -