From be4f2582062196dd6ecf393f55566367bc1dfa9f Mon Sep 17 00:00:00 2001 From: Leonard Kugis Date: Thu, 1 Feb 2018 00:26:36 +0100 Subject: reorganized configs --- src/mandelbrot-zoom.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) (limited to 'src/mandelbrot-zoom.c') diff --git a/src/mandelbrot-zoom.c b/src/mandelbrot-zoom.c index f009e10..33b0353 100644 --- a/src/mandelbrot-zoom.c +++ b/src/mandelbrot-zoom.c @@ -103,8 +103,7 @@ void on_colorToBtn_clicked() void on_startBtn_clicked() { - config.config_cpu.iterations = gtk_spin_button_get_value(ui_settings.iterationsSp); - config.config_opencl.iterations = gtk_spin_button_get_value(ui_settings.iterationsSp); + config.iterations = gtk_spin_button_get_value(ui_settings.iterationsSp); config.zoomSpecific = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ui_settings.zoomSpecificCb)); @@ -119,15 +118,10 @@ void on_startBtn_clicked() config.width = gtk_spin_button_get_value(ui_settings.widthSp); - config.config_cpu.width = gtk_spin_button_get_value(ui_settings.widthSp); - config.config_opencl.width = gtk_spin_button_get_value(ui_settings.widthSp); config.height = gtk_spin_button_get_value(ui_settings.heightSp); - config.config_cpu.height = gtk_spin_button_get_value(ui_settings.heightSp); - config.config_opencl.height = gtk_spin_button_get_value(ui_settings.heightSp); - config.config_cpu.renderFPS = gtk_spin_button_get_value(ui_settings.fpsRenderSp); - config.config_opencl.renderFPS = gtk_spin_button_get_value(ui_settings.fpsRenderSp); + config.renderFPS = gtk_spin_button_get_value(ui_settings.fpsRenderSp); config.videoFPS = gtk_spin_button_get_value(ui_settings.fpsVideoSp); @@ -137,24 +131,21 @@ void on_startBtn_clicked() sscanf(gtk_entry_get_text(ui_settings.zoomToXEntry), "%lf", &x); sscanf(gtk_entry_get_text(ui_settings.zoomToYEntry), "%lf", &y); sscanf(gtk_entry_get_text(ui_settings.speedEntry), "%lf", &speed); - config.config_cpu.to_x = x; - config.config_cpu.to_y = y; - config.config_cpu.speed = speed; - config.config_opencl.to_x = x; - config.config_opencl.to_y = y; - config.config_opencl.speed = speed; + config.to_x = x; + config.to_y = y; + config.speed = speed; config.mode = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ui_settings.modeGPURd)); //config.mode = MODE_CPU; if (strcmp(gtk_combo_box_text_get_active_text(ui_settings.setCombo), "Mandelbrot") == 0) { - config.config_cpu.set_func = mandelbrot_r; + config.set_func = mandelbrot_r; config.config_opencl.set_func = SFUNC_MANDELBROT; } else if (strcmp(gtk_combo_box_text_get_active_text(ui_settings.setCombo), "Julia") == 0) { - config.config_cpu.set_func = julia; + config.set_func = julia; config.config_opencl.set_func = SFUNC_JULIA; } -- cgit v1.2.1