diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_ipo.h | 53 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/curve.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/ipo.c | 6 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_ipo_types.h | 2 | ||||
| -rw-r--r-- | source/blender/src/drawobject.c | 3 |
5 files changed, 17 insertions, 49 deletions
diff --git a/source/blender/blenkernel/BKE_ipo.h b/source/blender/blenkernel/BKE_ipo.h index fdd176e0e64..5b209cb8f5b 100644 --- a/source/blender/blenkernel/BKE_ipo.h +++ b/source/blender/blenkernel/BKE_ipo.h @@ -54,71 +54,41 @@ struct bPoseChannel; struct bActionChannel; struct rctf; -/* ------------ Time Management ------------ */ - float frame_to_float(int cfra); -/* ------------ IPO Management ---------- */ - void free_ipo_curve(struct IpoCurve *icu); void free_ipo(struct Ipo *ipo); - void ipo_default_v2d_cur(int blocktype, struct rctf *cur); - struct Ipo *add_ipo(char *name, int idcode); struct Ipo *copy_ipo(struct Ipo *ipo); - void ipo_idnew(struct Ipo *ipo); - -struct IpoCurve *find_ipocurve(struct Ipo *ipo, int adrcode); -short has_ipo_code(struct Ipo *ipo, int code); - -/* -------------- Make Local -------------- */ - void make_local_obipo(struct Ipo *ipo); void make_local_matipo(struct Ipo *ipo); void make_local_keyipo(struct Ipo *ipo); void make_local_ipo(struct Ipo *ipo); - -/* ------------ IPO-Curve Sanity ---------------- */ +struct IpoCurve *find_ipocurve(struct Ipo *ipo, int adrcode); void calchandles_ipocurve(struct IpoCurve *icu); void testhandles_ipocurve(struct IpoCurve *icu); void sort_time_ipocurve(struct IpoCurve *icu); int test_time_ipocurve(struct IpoCurve *icu); - -/* -------- IPO-Curve (Bezier) Calculations ---------- */ - void correct_bezpart(float *v1, float *v2, float *v3, float *v4); int findzero(float x, float q0, float q1, float q2, float q3, float *o); void berekeny(float f1, float f2, float f3, float f4, float *o, int b); void berekenx(float *f, float *o, int b); - -/* -------- IPO Curve Calculation and Evaluation --------- */ - float eval_icu(struct IpoCurve *icu, float ipotime); void calc_icu(struct IpoCurve *icu, float ctime); float calc_ipo_time(struct Ipo *ipo, float ctime); void calc_ipo(struct Ipo *ipo, float ctime); - -/* ------------ Keyframe Column Tools -------------- */ - -void add_to_cfra_elem(struct ListBase *lb, struct BezTriple *bezt); -void make_cfra_list(struct Ipo *ipo, struct ListBase *elems); - -/* ---------------- IPO DataAPI ----------------- */ - void write_ipo_poin(void *poin, int type, float val); float read_ipo_poin(void *poin, int type); - void *give_mtex_poin(struct MTex *mtex, int adrcode ); -void *get_pchan_ipo_poin(struct bPoseChannel *pchan, int adrcode); + void *get_ipo_poin(struct ID *id, struct IpoCurve *icu, int *type); +void *get_pchan_ipo_poin(struct bPoseChannel *pchan, int adrcode); void set_icu_vars(struct IpoCurve *icu); -/* ---------------- IPO Execution --------------- */ - void execute_ipo(struct ID *id, struct Ipo *ipo); void execute_action_ipo(struct bActionChannel *achan, struct bPoseChannel *pchan); @@ -129,16 +99,21 @@ void do_ob_ipo(struct Object *ob); void do_seq_ipo(struct Sequence *seq, int cfra); void do_ob_ipodrivers(struct Object *ob, struct Ipo *ipo, float ctime); +int has_ipo_code(struct Ipo *ipo, int code); void do_all_data_ipos(void); -short calc_ipo_spec(struct Ipo *ipo, int adrcode, float *ctime); +int calc_ipo_spec(struct Ipo *ipo, int adrcode, float *ctime); void clear_delta_obipo(struct Ipo *ipo); +void add_to_cfra_elem(struct ListBase *lb, struct BezTriple *bezt); +void make_cfra_list(struct Ipo *ipo, struct ListBase *elems); -/* ----------- IPO <-> GameEngine API ---------------- */ - -/* the short is an IPO_Channel... */ +/* the sort is an IPO_Channel... */ +int IPO_GetChannels(struct Ipo *ipo, short *channels); -short IPO_GetChannels(struct Ipo *ipo, short *channels); -float IPO_GetFloatValue(struct Ipo *ipo, short c, float ctime); +float IPO_GetFloatValue(struct Ipo *ipo, +/* struct IPO_Channel channel, */ + /* channels are shorts... bit ugly for now*/ + short c, + float ctime); #ifdef __cplusplus }; diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 6ece16deb4b..06c1dd4ffe6 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -1509,7 +1509,7 @@ void makeBevelList(Object *ob) BevList *bl, *blnew, *blnext; BevPoint *bevp, *bevp2, *bevp1 = NULL, *bevp0; float min, inp, x1, x2, y1, y2, vec[3]; - float *coord_array, *tilt_array=NULL, *radius_array=NULL, *coord_fp, *tilt_fp=NULL, *radius_fp=NULL; + float *coord_array, *tilt_array=NULL, *radius_array=NULL, *coord_fp, *tilt_fp=NULL, *radius_fp; float *v1, *v2; struct bevelsort *sortdata, *sd, *sd1; int a, b, nr, poly, resolu, len=0; diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index f0135636bb1..b58a9e51b05 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -77,8 +77,6 @@ #define SMALL -1.0e-10 -#if 0 // IPO_OLD_TEMP - /* This array concept was meant to make sure that defines such as OB_LOC_X don't have to be enumerated, also for backward compatibility, future changes, and to enable it all can be accessed with a for-next loop. @@ -971,7 +969,7 @@ float eval_icu(IpoCurve *icu, float ipotime) cvalue+= cycyofs; } else if( (prevbezt+a)->vec[1][0]<=ipotime) { - if( (icu->extrap & IPO_DIR) && (icu->ipo!=IPO_CONST)) { + if( (icu->extrap & IPO_DIR) && icu->ipo!=IPO_CONST) { prevbezt+= a; if (icu->ipo==IPO_LIN) { @@ -2582,5 +2580,3 @@ float IPO_GetFloatValue(Ipo *ipo, IPO_Channel channel, float ctime) return ctime; } - -#endif // IPO_OLD_TEMP diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h index 432399e3581..5be6dd727c0 100644 --- a/source/blender/makesdna/DNA_ipo_types.h +++ b/source/blender/makesdna/DNA_ipo_types.h @@ -201,8 +201,6 @@ typedef struct Ipo { #define MA_MAP17 (1<<21) #define MA_MAP18 (1<<22) -/* ********** Texture Slots (MTex) ********** */ - #define TEX_TOTNAM 14 #define MAP_OFS_X 1 diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index b7aa29e2482..b9bcf4063a3 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -4816,8 +4816,7 @@ void draw_object(Base *base, int flag) warning_recursive= 1; elems.first= elems.last= 0; - // warning: no longer checks for certain ob-keys only... (so does this need to use the proper ipokeys then?) - make_cfra_list(ob->ipo, &elems); + make_cfra_list(ob->ipo, &elems); cfraont= (G.scene->r.cfra); drawtype= G.vd->drawtype; |