From 2a10eae5e6794a93c8b92b14836f196bd03b53c3 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 10 May 2015 17:32:24 +0200
Subject: Drop motion_*
---
flam3.c | 1 -
flam3.h | 8 --------
parser.c | 22 ----------------------
3 files changed, 31 deletions(-)
diff --git a/flam3.c b/flam3.c
index 616fe8c..3e82da7 100644
--- a/flam3.c
+++ b/flam3.c
@@ -795,7 +795,6 @@ void clear_cp(flam3_genome *cp, int default_flag) {
cp->width = -1;
cp->height = -1;
cp->gam_lin_thresh = -1;
-// cp->motion_exp = -999;
cp->interpolation_type = -1;
cp->palette_mode = -1;
}
diff --git a/flam3.h b/flam3.h
index 983d33e..b011d81 100644
--- a/flam3.h
+++ b/flam3.h
@@ -371,9 +371,6 @@ typedef struct xform {
int num_active_vars;
double active_var_weights[flam3_nvariations];
int varFunc[flam3_nvariations];
-
- int motion_freq;
- int motion_func;
} flam3_xform;
#include "palettes.h"
@@ -481,11 +478,6 @@ typedef struct {
int sub_batch_size;
} flam3_frame;
-/* Motion function indices */
-#define MOTION_SIN 1
-#define MOTION_TRIANGLE 2
-#define MOTION_HILL 3
-
/* Mutation modes */
#define MUTATE_NOT_SPECIFIED -1
#define MUTATE_ALL_VARIATIONS 0
diff --git a/parser.c b/parser.c
index 89f587f..89467bd 100644
--- a/parser.c
+++ b/parser.c
@@ -647,13 +647,6 @@ static int parse_flame_element(xmlNode *flame_node, flam3_genome *loc_current_cp
fprintf(stderr,"Error: Final xforms should not have weight specified.\n");
return(1);
}
-
- /* Check for non-zero motion_* params */
- if (cp->xform[xf].motion_freq != 0 || cp->xform[xf].motion_func != 0) {
- fprintf(stderr,"Error: Motion parameters should not be specified in xforms.\n");
- return(1);
- }
-
}
} /* Done parsing flame element. */
@@ -729,21 +722,6 @@ static int parse_xform_xml(xmlNode *chld_node,flam3_xform *this_xform, int *num_
this_xform->color_speed = flam3_atof(att_str);
} else if (!xmlStrcmp(cur_att->name, (const xmlChar *)"animate")) {
this_xform->animate = flam3_atof(att_str);
- } else if (!xmlStrcmp(cur_att->name, (const xmlChar *)"motion_frequency")) {
- this_xform->motion_freq = flam3_atoi(att_str);
- } else if (!xmlStrcmp(cur_att->name, (const xmlChar *)"motion_function")) {
- if (!strcmp("sin", att_str)) {
- this_xform->motion_func = MOTION_SIN;
- } else if (!strcmp("triangle",att_str)) {
- this_xform->motion_func = MOTION_TRIANGLE;
- } else if (!strcmp("hill",att_str)) {
- this_xform->motion_func = MOTION_HILL;
- } else {
- fprintf(stderr,"Error: unknown motion function '%s'\n",att_str);
- xmlFree(att_str);
- return(1);
- }
-
} else if (!xmlStrcmp(cur_att->name, (const xmlChar *)"color")) {
double tmpc1;
this_xform->color = 0.0;
--
cgit v1.2.3