diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2021-02-22 14:51:03 +0100 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2021-02-22 14:51:03 +0100 |
| commit | e5a71b9a0c68987720b1719c21ff13260ad87e6d (patch) | |
| tree | 2a148444702dcc9d9dd6326b1625b05234d38d84 | |
| parent | 322c1a49f59d3fc6441804bbbb29da22567e4bcb (diff) | |
| download | mandelbrot-opengl3.3.tar.gz mandelbrot-opengl3.3.tar.bz2 mandelbrot-opengl3.3.zip | |
Changed opengl version to 3.3opengl3.3
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | shader/fragment.glsl | 3 | ||||
| -rw-r--r-- | shader/vertex.glsl | 2 | ||||
| -rw-r--r-- | src/event.c | 5 | ||||
| -rw-r--r-- | src/state.c | 4 |
5 files changed, 10 insertions, 5 deletions
@@ -2,3 +2,4 @@ a.out mandel *.o vgcore.* +tags diff --git a/shader/fragment.glsl b/shader/fragment.glsl index 6bc028c..1d28b15 100644 --- a/shader/fragment.glsl +++ b/shader/fragment.glsl @@ -1,4 +1,4 @@ -#version 400 core +#version 330 core out vec4 out_color; @@ -119,7 +119,6 @@ void main() c.x = u_real_start + float(gl_FragCoord.x) / float(u_width) * (u_real_end - u_real_start); c.y = u_imag_start + float(gl_FragCoord.y) / float(u_height) * (u_imag_end - u_imag_start); - if (u_samples == 1.0) out_color = mandelbrot_color(c); else diff --git a/shader/vertex.glsl b/shader/vertex.glsl index 714e089..88c0b8c 100644 --- a/shader/vertex.glsl +++ b/shader/vertex.glsl @@ -1,4 +1,4 @@ -#version 400 core +#version 330 core layout (location = 0) in vec2 in_position; diff --git a/src/event.c b/src/event.c index d5f1180..8cb0016 100644 --- a/src/event.c +++ b/src/event.c @@ -34,6 +34,11 @@ void event_handle(State *state) break; case SDL_KEYDOWN: + if (e.key.keysym.sym == SDLK_ESCAPE) + { + state->running = false; + break; + } if (e.key.keysym.sym == SDLK_s) state->smooth = !state->smooth; else if (e.key.keysym.sym == SDLK_w) diff --git a/src/state.c b/src/state.c index 5df4f02..c5c7271 100644 --- a/src/state.c +++ b/src/state.c @@ -4,8 +4,8 @@ bool state_init(State *state) { SDL_CALL(SDL_Init(SDL_INIT_VIDEO)); - SDL_CALL(SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 4)); - SDL_CALL(SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0)); + SDL_CALL(SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3)); + SDL_CALL(SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3)); SDL_CALL(SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE)); SDL_CALL(SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1)); SDL_CALL(state->window = SDL_CreateWindow( |