diff options
| -rw-r--r-- | src/flam3.c | 14 | ||||
| -rw-r--r-- | src/rect.c | 2 | ||||
| -rw-r--r-- | src/variations.c | 2 | ||||
| -rw-r--r-- | src/variations.h | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/flam3.c b/src/flam3.c index b7a4ea2..088eb61 100644 --- a/src/flam3.c +++ b/src/flam3.c @@ -309,7 +309,7 @@ int flam3_xform_preview(flam3_genome *cp, int xi, double range, int numvals, int cp->xform[xi].density = 1.0; /* Prepare the function pointers */ - if (prepare_xform_fn_ptrs(cp,rc)) { + if (prepare_precalc_flags(cp)) { cp->xform[xi].density = oldweight; return(1); } @@ -369,7 +369,7 @@ int flam3_colorhist(flam3_genome *cp, int num_batches, double *hist) { sub_batch[3] = 0; // get into the attractor - if (prepare_xform_fn_ptrs(cp,&rc)) + if (prepare_precalc_flags(cp)) return(1); xform_distrib = flam3_create_xform_distrib(cp); @@ -3419,7 +3419,7 @@ int flam3_estimate_bounding_box(flam3_genome *cp, double eps, int nsamples, points[2] = 0.0; points[3] = 0.0; - if (prepare_xform_fn_ptrs(cp,rc)) + if (prepare_precalc_flags(cp)) return(-1); xform_distrib = flam3_create_xform_distrib(cp); if (xform_distrib==NULL) @@ -3834,7 +3834,7 @@ double flam3_dimension(flam3_genome *cp, int ntries, int clip_to_camera) { subb[1] = flam3_random_isaac_11(&rc); subb[2] = 0.0; subb[3] = 0.0; - if (prepare_xform_fn_ptrs(cp,&rc)) + if (prepare_precalc_flags(cp)) return(-1.0); xform_distrib = flam3_create_xform_distrib(cp); if (xform_distrib==NULL) @@ -3929,7 +3929,7 @@ double flam3_lyapunov(flam3_genome *cp, int ntries) { p[3] = 0.0; // get into the attractor - if (prepare_xform_fn_ptrs(cp,&rc)) + if (prepare_precalc_flags(cp)) return(-1.0); xform_distrib = flam3_create_xform_distrib(cp); if (xform_distrib==NULL) @@ -3944,7 +3944,7 @@ double flam3_lyapunov(flam3_genome *cp, int ntries) { // take one deterministic step srandom(i); - if (prepare_xform_fn_ptrs(cp,&rc)) + if (prepare_precalc_flags(cp)) return(-1.0); xform_distrib = flam3_create_xform_distrib(cp); if (xform_distrib==NULL) @@ -3973,7 +3973,7 @@ double flam3_lyapunov(flam3_genome *cp, int ntries) { // take the same step but with eps srandom(i); - if (prepare_xform_fn_ptrs(cp,&rc)) + if (prepare_precalc_flags(cp)) return(-1.0); xform_distrib = flam3_create_xform_distrib(cp); if (xform_distrib==NULL) @@ -746,7 +746,7 @@ static int render_rectangle(flam3_frame *spec, void *out, flam3_interpolate(spec->genomes, spec->ngenomes, temporal_sample_time, 0, &cp); /* Get the xforms ready to render */ - if (prepare_xform_fn_ptrs(&cp, &spec->rc)) { + if (prepare_precalc_flags(&cp)) { fprintf(stderr,"prepare xform pointers returned error: aborting.\n"); return(1); } diff --git a/src/variations.c b/src/variations.c index c070b0d..e40c48f 100644 --- a/src/variations.c +++ b/src/variations.c @@ -1982,7 +1982,7 @@ void xform_precalc(flam3_genome *cp, int xi) { wedgeJulia_precalc(&(cp->xform[xi])); } -int prepare_xform_fn_ptrs(flam3_genome *cp, randctx *rc) { +int prepare_precalc_flags(flam3_genome *cp) { double d; int i,j,totnum; diff --git a/src/variations.h b/src/variations.h index fdec2ad..c724b58 100644 --- a/src/variations.h +++ b/src/variations.h @@ -133,7 +133,7 @@ void supershape_precalc(flam3_xform *xf); void wedgeJulia_precalc(flam3_xform *xf); void xform_precalc(flam3_genome *cp, int xi); -int prepare_xform_fn_ptrs(flam3_genome *, randctx *); +int prepare_precalc_flags(flam3_genome *); int apply_xform(flam3_genome *cp, int fn, double *p, double *q, randctx *rc); void initialize_xforms(flam3_genome *thiscp, int start_here); |