From a7842df438eda518325138b2207c9a898171ba47 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 30 Mar 2015 20:49:52 +0200 Subject: Drop rotation center Equal to camera center anyway --- flam3.h | 1 - interpolation.c | 2 -- main.c | 2 -- parser.c | 2 -- rect.c | 2 +- 5 files changed, 1 insertion(+), 8 deletions(-) diff --git a/flam3.h b/flam3.h index 207b920..46286a4 100644 --- a/flam3.h +++ b/flam3.h @@ -438,7 +438,6 @@ typedef struct { double highlight_power; int width, height; /* of the final image */ double center[2]; /* of camera */ - double rot_center[2]; /* really the center */ double rotate; /* camera */ double vibrancy; /* blend between color algs (0=old,1=new) */ double hue_rotation; /* applies to cmap, 0-1 */ diff --git a/interpolation.c b/interpolation.c index 600d1d8..a316116 100644 --- a/interpolation.c +++ b/interpolation.c @@ -408,8 +408,6 @@ void flam3_interpolate_n(flam3_genome *result, int ncp, INTERI(height); INTERP(center[0]); INTERP(center[1]); - INTERP(rot_center[0]); - INTERP(rot_center[1]); INTERP(pixels_per_unit); INTERP(zoom); INTERP(rotate); diff --git a/main.c b/main.c index 5637da7..61ed4d9 100644 --- a/main.c +++ b/main.c @@ -227,8 +227,6 @@ static void adjust_bounding_box (flam3_genome * const genome, randctx * const rc genome->center[0] = mix0 * bmin[0] + (1-mix0)*bmax[0]; genome->center[1] = mix1 * bmin[1] + (1-mix1)*bmax[1]; } - genome->rot_center[0] = genome->center[0]; - genome->rot_center[1] = genome->center[1]; genome->pixels_per_unit = genome->width / (bmax[0] - bmin[0]); } diff --git a/parser.c b/parser.c index 8f93f4c..cafada0 100644 --- a/parser.c +++ b/parser.c @@ -352,8 +352,6 @@ int parse_flame_element(xmlNode *flame_node, flam3_genome *loc_current_cp, xmlFree(att_str); return(1); } - cp->rot_center[0] = cp->center[0]; - cp->rot_center[1] = cp->center[1]; } else if (!xmlStrcmp(cur_att->name, (const xmlChar *)"scale")) { cp->pixels_per_unit = flam3_atof(att_str); } else if (!xmlStrcmp(cur_att->name, (const xmlChar *)"rotate")) { diff --git a/rect.c b/rect.c index 1dc47b0..7c12b2e 100644 --- a/rect.c +++ b/rect.c @@ -263,7 +263,7 @@ static void compute_camera (const flam3_genome * const genome, const double corner1 = genome->center[1] - bucket->dim[1] / ppuy / 2.0; double2 rot_matrix[3]; - rotate_center ((double2) { genome->rot_center[0], genome->rot_center[1] }, + rotate_center ((double2) { genome->center[0], genome->center[1] }, genome->rotate, rot_matrix); const double4 from_rect = (double4) { corner0, corner1, -- cgit v1.2.3