From 8e5bc917659288a257d5de9827458039f5498ef5 Mon Sep 17 00:00:00 2001 From: Leonard Kugis Date: Tue, 23 Jan 2018 01:08:38 +0100 Subject: OpenGL rendering added, cleaned up paths --- src/render.c | 146 +++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 102 insertions(+), 44 deletions(-) (limited to 'src/render.c') diff --git a/src/render.c b/src/render.c index e06c967..9e7f1a4 100644 --- a/src/render.c +++ b/src/render.c @@ -6,67 +6,125 @@ */ #include "render.h" +#define HAVE_STRUCT_TIMESPEC -void render_init(Config *config, u32 (*sfunc) (double, double, u32)) +void render_init(Config *config, u32 (*sfunc) (long double, long double, u32)) { + delta = glutGet(GLUT_ELAPSED_TIME); + x_min_s = -2.0; + x_max_s = 1.0; + y_min_s= -1.0; + y_max_s = 1.0; + x_min = x_min_s; + x_max = x_max_s; + y_min = y_min_s; + y_max = y_max_s; _config = config; _sfunc = sfunc; + s_arr = (u32 *) malloc((_config->width) * (_config->height) * sizeof(u32)); + calculate(x_min, y_min, x_max, y_max, _sfunc, s_arr); + //glutInit(0, NULL); + glutInitWindowPosition(0, 0); + glutInitWindowSize(_config->width, _config->height); + glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_DEPTH); + glutCreateWindow("Renderer"); + glutDisplayFunc(gl_render); + glutIdleFunc(gl_idle); - ui_render.window = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL)); - gtk_window_set_default_size(ui_render.window, config->width, config->height); - - ui_render.frame = GTK_FRAME(gtk_frame_new(NULL)); - gtk_container_add(GTK_CONTAINER(ui_render.window), ui_render.frame); - - ui_render.drawing_area = GTK_DRAWING_AREA(gtk_drawing_area_new()); - gtk_widget_set_size_request(GTK_WIDGET(ui_render.drawing_area), config->width, config->height); - g_signal_connect(G_OBJECT(ui_render.drawing_area), "draw", G_CALLBACK(on_draw), NULL); - gtk_container_add(GTK_CONTAINER(ui_render.frame), ui_render.drawing_area); + glGenTextures(1, &tex); + glBindTexture(GL_TEXTURE_2D, tex); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, _config->width, _config->height, 0, GL_RGBA, GL_UNSIGNED_BYTE, s_arr); + glBindTexture(GL_TEXTURE_2D, 0); + //glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, _config->width, _config->height, 0, GL_RGBA, GL_UNSIGNED_BYTE, s_arr); + glMatrixMode(GL_PROJECTION); + glOrtho(0, _config->width, 0, _config->height, -1, 1); + glMatrixMode(GL_MODELVIEW); + glutMainLoop(); } void render_show() { - gtk_widget_show_all(GTK_WIDGET(ui_render.window)); + } -void on_draw(GtkWidget *widget, cairo_t *cr, gpointer data) +void gl_render(void) { - cairo_surface_t *image; - // TODO: MUSS UNBEDINGT SEPARAT GECALLT WERDEN, SONST KEINE 60 FPS - image = render_surface(); - cairo_set_source_surface(cr, image, 0, 0); - cairo_paint(cr); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + glBindTexture(GL_TEXTURE_2D, tex); + glEnable(GL_TEXTURE_2D); + glBegin(GL_QUADS); + glTexCoord2i(0, 0); glVertex2i(0, 0); + glTexCoord2i(0, 1); glVertex2i(0, _config->height); + glTexCoord2i(1, 1); glVertex2i(_config->width, _config->height); + glTexCoord2i(1, 0); glVertex2i(_config->width, 0); + glEnd(); + glDisable(GL_TEXTURE_2D); + glBindTexture(GL_TEXTURE_2D, 0); + +// glBegin(GL_TRIANGLES); +// glVertex3f(-0.5,-0.5,0.0); +// glVertex3f(0.5,0.0,0.0); +// glVertex3f(0.0,0.5,0.0); +// glEnd(); + + glutSwapBuffers(); } -cairo_surface_t *render_surface() +void calculate(long double x_min, long double y_min, long double x_max, long double y_max, u32 (*sfunc) (long double, long double, u32), u32 *arr) { - cairo_surface_t *result; - unsigned char *current_row; - int stride; - double x_math, y_math; - u32 iterations; + pthread_t thread; + ThreadArgs *args = (ThreadArgs *) malloc(_config->threads * sizeof(ThreadArgs)); + for(u8 i = 0; i < _config->threads; i++) + { + args[i] = (ThreadArgs) { .tc = _config->threads, .tid = i, .x_min = x_min, .y_min = y_min, .x_max = x_max, .y_max = y_max, .sfunc = sfunc, .arr = arr }; + pthread_create(&thread, NULL, calculate_t, (void *)&args[i]); + } + pthread_join(thread, NULL); +} - result = cairo_image_surface_create(CAIRO_FORMAT_RGB24, _config->width, _config->height); - if (cairo_surface_status(result) != CAIRO_STATUS_SUCCESS) - return result; +void calculate_t(void *args) +{ + ThreadArgs *_args = (ThreadArgs *)args; + long double x_math, y_math; + u32 iterations; + for (u32 y = (_config->height/_args->tc)*(_args->tid); y < _config->height; y++) + { + for (u32 x = 0; x < _config->width; x++) + { + x_math = _args->x_min + ((long double) x * (_args->x_max - _args->x_min)) / _config->width; + y_math = _args->y_min + ((long double) (_config->height - y) * (_args->y_max - _args->y_min)) / _config->height; + iterations = _args->sfunc(x_math, y_math, _config->iterations); + _args->arr[COORDS(x, y, _config->width)] = (((1<<24)-1)*iterations)/_config->iterations; + } + } +} - cairo_surface_flush(result); - current_row = cairo_image_surface_get_data(result); - stride = cairo_image_surface_get_stride(result); - for (int y = 0; y < _config->height; y++) { - u32 *row = (void *) current_row; - for (int x = 0; x < _config->width; x++) { - x_math = /*x_MIN*/-2.0 + ((double) x * (/*x_MAX*/1.0 - /*x_MIN*/-2.0)) / _config->width; - y_math = /*y_MIN*/-1.0 + ((double) (_config->height - y) * (/*y_MAX*/1.0 - /*y_MIN*/-1.0)) / _config->height; - iterations = _sfunc(x_math, y_math, _config->iterations); - row[x] = (((1<<24)-1)*iterations)/_config->iterations; -// if (iterations > 1<<8) -// printf("schon gruen\n"); - } +long double zoom_func(long double ft, long double s) +{ + return (s - expl(-ft)); +} - current_row += stride; - } - cairo_surface_mark_dirty(result); - return result; +void gl_idle(void) +{ + calculate(x_min, y_min, x_max, y_max, _sfunc, s_arr); + //glGenTextures(1, &tex); + glBindTexture(GL_TEXTURE_2D, tex); + //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, _config->width, _config->height, 0, GL_RGBA, GL_UNSIGNED_BYTE, s_arr); + glBindTexture(GL_TEXTURE_2D, 0); + int t = glutGet(GLUT_ELAPSED_TIME); + dt = (t - delta) / 1000.0; + delta = t; + ft+=(0.1*dt); + x_min = x_min_s + zoom_func(ft, (long double)2.0 + _config->to_x); + y_min = y_min_s + zoom_func(ft, (long double)1.0 + _config->to_y); + x_max = x_max_s - zoom_func(ft, (long double)1.0 - _config->to_x); + y_max = y_max_s - zoom_func(ft, (long double)1.0 - _config->to_y); + glutPostRedisplay(); } + + -- cgit v1.2.1