diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 00:16:53 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 00:16:53 +0300 |
commit | bdfe7d89e2f1292644577972c716931b4ce3c6c3 (patch) | |
tree | d00eb50b749cb001e2b08272c91791e66740b05d /source/blender/blenkernel/BKE_ipo.h | |
parent | 78a1c27c4a6abe0ed31ca93ad21910f3df04da56 (diff) | |
parent | 7e4db234cee71ead34ee81a12e27da4bd548eb4b (diff) |
Merge of trunk into blender 2.5:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416
Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
later added in trunk also, but reverted partially, specifically revision
16683. I have left out this reversion in the 2.5 branch since I think it is
needed there.
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
-W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
differently. Since this is changed so much, and I don't think those fixes
would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
initialized when running with -P. The code that initializes the screen there
I had to disable, that can't work in 2.5 anymore but left it commented as a
reminder.
Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.
Still to be done:
* Go over files and functions that were moved to a different location but could
still use changes that were done in trunk.
Diffstat (limited to 'source/blender/blenkernel/BKE_ipo.h')
-rw-r--r-- | source/blender/blenkernel/BKE_ipo.h | 61 |
1 files changed, 47 insertions, 14 deletions
diff --git a/source/blender/blenkernel/BKE_ipo.h b/source/blender/blenkernel/BKE_ipo.h index 922f3201345..fdd176e0e64 100644 --- a/source/blender/blenkernel/BKE_ipo.h +++ b/source/blender/blenkernel/BKE_ipo.h @@ -31,6 +31,10 @@ #ifndef BKE_IPO_H #define BKE_IPO_H +#ifdef __cplusplus +extern "C" { +#endif + typedef struct CfraElem { struct CfraElem *next, *prev; float cfra; @@ -50,41 +54,71 @@ 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); -struct IpoCurve *find_ipocurve(struct Ipo *ipo, int adrcode); + +/* ------------ IPO-Curve Sanity ---------------- */ 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_ipo_poin(struct ID *id, struct IpoCurve *icu, 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 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); @@ -95,21 +129,20 @@ 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); -int calc_ipo_spec(struct Ipo *ipo, int adrcode, float *ctime); +short 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); -/* the sort is an IPO_Channel... */ -int IPO_GetChannels(struct Ipo *ipo, short *channels); +/* ----------- IPO <-> GameEngine API ---------------- */ + +/* the short is an IPO_Channel... */ -float IPO_GetFloatValue(struct Ipo *ipo, -/* struct IPO_Channel channel, */ - /* channels are shorts... bit ugly for now*/ - short c, - float ctime); +short IPO_GetChannels(struct Ipo *ipo, short *channels); +float IPO_GetFloatValue(struct Ipo *ipo, short c, float ctime); + +#ifdef __cplusplus +}; +#endif #endif |