Nils Thuerey
9a36e9b651
issues in parallel... So this commit contains: an update of the solver (e.g. moving objects), integration of blender IPOs, improved rendering (motion blur, smoothed normals) and a first particle test. In more detail: Solver update: - Moving objects using a relatively simple model, and not yet fully optimized - ok for box falling into water, water in a moving glass might cause trouble. Simulation times are influenced by overall no. of triangles of the mesh, scaling meshes up a lot might also cause slowdowns. - Additional obstacle settings: noslip (as before), free slip (move along wall freely) and part slip (mix of both). - Obstacle settings also added for domain boundaries now, the six walls of the domain are obstacles after all as well - Got rid of templates, should make compiling for e.g. macs more convenient, for linux there's not much difference. Finally got rid of parser (and some other code parts), the simulation now uses the internal API to transfer data. - Some unnecessary file were removed, the GUI now needs 3 settings buttons... This should still be changed (maybe by adding a new panel for domain objects). IPOs: - Animated params: viscosity, time and gravity for domains. In contrast to normal time IPO for Blender objects, the fluidsim one scales the time step size - so a constant 1 has no effect, values towards 0 slow it down, larger ones speed the simulation up (-> longer time steps, more compuations). The viscosity IPO is also only a factor for the selected viscosity (again, 1=no effect). - For objects that are enabled for fluidsim, a new IPO type shows up. Inflow objects can use the velocity channels to animate the inflow. Obstacles, in/outflow objects can be switched on (Active IPO>0) and off (<0) during the simulation. - Movement, rotation and scaling of those 3 types is exported from the normal Blender channels (Loc,dLoc,etc.). Particles: - This is still experimental, so it might be deactivated for a release... It should at some point be used to model smaller splashes, depending on the the realworld size and the particle generation settings particles are generated during simulation (stored in _particles_X.gz files). - These are loaded by enabling the particle field for an arbitrary object, which should be given a halo material. For each frame, similar to the mesh loading, the particle system them loads the simulated particle positions. - For rendering, I "abused" the part->rt field - I couldnt find any use for it in the code and it seems to work fine. The fluidsim particles store their size there. Rendering: - The fluidims particles use scaled sizes and alpha values to give a more varied appearance. In convertblender.c fluidsim particle systems use the p->rt field to scale up the size and down the alpha of "smaller particles". Setting the influence fields in the fluidims settings to 0 gives equally sized particles with same alpha everywhere. Higher values cause larger differences. - Smoothed normals: for unmodified fluid meshes (e.g. no subdivision) the normals computed by the solver are used. This is basically done by switching off the normal recalculation in convertblender.c (the function calc_fluidsimnormals handles other mesh inits instead of calc_vertexnormals). This could also be used to e.g. modify mesh normals in a modifier... - Another change is that fluidsim meshes load the velocities computed during the simulation for image based motion blur. This is inited in load_fluidsimspeedvectors for the vector pass (they're loaded during the normal load in DerivedMesh readBobjgz). Generation and loading can be switched off in the settings. Vector pass currently loads the fluidism meshes 3 times, so this should still be optimized. Examples: - smoothed normals versus normals from subdividing once: http://www10.informatik.uni-erlangen.de/~sinithue/temp/v060227_1smoothnorms.png http://www10.informatik.uni-erlangen.de/~sinithue/temp/v060227_2subdivnorms.png - fluidsim particles, size/alpha influence 0: http://www10.informatik.uni-erlangen.de/~sinithue/temp/v060227_3particlesnorm.png size influence 1: http://www10.informatik.uni-erlangen.de/~sinithue/temp/v060227_4particlessize.png size & alpha influence 1: http://www10.informatik.uni-erlangen.de/~sinithue/temp/v060227_5particlesalpha.png - the standard drop with motion blur and particles: http://www10.informatik.uni-erlangen.de/~sinithue/temp/elbeemupdate_t2new.mpg (here's how it looks without http://www10.informatik.uni-erlangen.de/~sinithue/temp/elbeemupdate_t1old.mpg) - another inflow animation (moving, switched on/off) with a moving obstacle (and strong mblur :) http://www10.informatik.uni-erlangen.de/~sinithue/temp/elbeemupdate_t3ipos.mpg Things still to fix: - rotating & scaling domains causes wrong speed vectors - get rid of SDL code for threading, use pthreads as well? - update wiki documentation - cool effects for rendering would be photon maps for caustics, and motion blur for particles :)
161 lines
5.4 KiB
C++
161 lines
5.4 KiB
C++
/**
|
|
* $Id$
|
|
*
|
|
* ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version. The Blender
|
|
* Foundation also sells licenses for use in proprietary software under
|
|
* the Blender License. See http://www.blender.org/BL/ for information
|
|
* about this.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
|
* All rights reserved.
|
|
*
|
|
* The Original Code is: all of this file.
|
|
*
|
|
* Contributor(s): none yet.
|
|
*
|
|
* ***** END GPL/BL DUAL LICENSE BLOCK *****
|
|
*/
|
|
|
|
#ifndef BSE_EDITIPO_H
|
|
#define BSE_EDITIPO_H
|
|
|
|
struct TransVert;
|
|
struct IpoCurve;
|
|
struct BezTriple;
|
|
struct Ipo;
|
|
struct EditIpo;
|
|
struct ID;
|
|
struct ListBase;
|
|
struct Object;
|
|
struct IpoKey;
|
|
struct TransOb;
|
|
struct Tex;
|
|
|
|
void remake_object_ipos(struct Object *ob);
|
|
char *getname_ac_ei(int nr);
|
|
char *getname_co_ei(int nr);
|
|
char *getname_ob_ei(int nr, int colipo);
|
|
char *getname_mtex_ei(int nr);
|
|
char *getname_tex_ei(int nr);
|
|
char *getname_mat_ei(int nr);
|
|
char *getname_world_ei(int nr);
|
|
char *getname_seq_ei(int nr);
|
|
char *getname_cu_ei(int nr);
|
|
char *getname_la_ei(int nr);
|
|
char *getname_cam_ei(int nr);
|
|
char *getname_snd_ei(int nr);
|
|
char *getname_fluidsim_ei(int nr);
|
|
|
|
struct EditIpo *get_active_editipo(void);
|
|
|
|
void boundbox_ipocurve(struct IpoCurve *icu);
|
|
void boundbox_ipo(struct Ipo *ipo, struct rctf *bb);
|
|
void editipo_changed(struct SpaceIpo *si, int doredraw);
|
|
void scale_editipo(void);
|
|
|
|
unsigned int ipo_rainbow(int cur, int tot);
|
|
|
|
void test_editipo(int doit);
|
|
void get_status_editipo(void);
|
|
void update_editipo_flags(void);
|
|
void set_editflag_editipo(void);
|
|
void ipo_toggle_showkey(void);
|
|
void swap_selectall_editipo(void);
|
|
void swap_visible_editipo(void);
|
|
void deselectall_editipo(void);
|
|
|
|
void move_to_frame(void);
|
|
void do_ipowin_buts(short event);
|
|
void do_ipo_selectbuttons(void);
|
|
|
|
|
|
/* gets ipo curve, creates if needed */
|
|
struct IpoCurve *verify_ipocurve(struct ID *, short, char *, char *, int);
|
|
struct Ipo *verify_ipo(struct ID *, short, char *, char *);
|
|
int texchannel_to_adrcode(int channel);
|
|
|
|
void insert_vert_ipo(struct IpoCurve *icu, float x, float y);
|
|
void add_vert_ipo(void);
|
|
void add_duplicate_editipo(void);
|
|
void remove_doubles_ipo(void);
|
|
void join_ipo_menu(void);
|
|
void join_ipo(int mode);
|
|
void ipo_snap_menu(void);
|
|
void ipo_snap(short event);
|
|
void mouse_select_ipo(void);
|
|
void sethandles_ipo(int code);
|
|
void select_ipo_bezier_keys(struct Ipo *ipo, int selectmode);
|
|
void set_ipotype(void);
|
|
void borderselect_ipo(void);
|
|
void del_ipo(void);
|
|
void del_ipoCurve ( struct IpoCurve * icu );
|
|
void free_ipocopybuf(void);
|
|
void copy_editipo(void);
|
|
void paste_editipo(void);
|
|
|
|
void set_exprap_ipo(int mode);
|
|
|
|
void set_speed_editipo(float speed);
|
|
void insertkey(ID *id, int blocktype, char *actname, char *constname, int adrcode);
|
|
void insertkey_editipo(void);
|
|
void common_insertkey(void);
|
|
void free_ipokey(struct ListBase *lb);
|
|
void add_to_ipokey(struct ListBase *lb, struct BezTriple *bezt, int nr, int len);
|
|
void make_ipokey(void);
|
|
void make_ipokey_spec(struct ListBase *lb, struct Ipo *ipo);
|
|
void make_ipokey_transform(struct Object *ob, struct ListBase *lb, int sel);
|
|
void update_ipokey_val(void);
|
|
void set_tob_old(float *old, float *poin);
|
|
void set_ipo_pointers_transob(struct IpoKey *ik, struct TransOb *tob);
|
|
void nextkey(struct ListBase *elems, int dir);
|
|
void movekey_ipo(int dir);
|
|
void movekey_obipo(int dir);
|
|
void nextkey_ipo(int dir);
|
|
void nextkey_obipo(int dir);
|
|
void remake_ipo_transverts(struct TransVert *transmain, float *dvec, int tot);
|
|
void transform_ipo(int mode);
|
|
void filter_sampledata(float *data, int sfra, int efra);
|
|
void sampledata_to_ipocurve(float *data, int sfra, int efra, struct IpoCurve *icu);
|
|
void ipo_record(void);
|
|
|
|
void sethandles_ipo_keys(struct Ipo *ipo, int code);
|
|
void snap_ipo_keys(struct Ipo *ipo);
|
|
void setipotype_ipo(struct Ipo *ipo, int code);
|
|
void set_ipo_key_selection(struct Ipo *ipo, int sel);
|
|
int is_ipo_key_selected(struct Ipo *ipo);
|
|
void delete_ipo_keys(struct Ipo *ipo);
|
|
int fullselect_ipo_keys(struct Ipo *ipo);
|
|
int add_trans_ipo_keys(struct Ipo *ipo, struct TransVert *tv, int tvtot);
|
|
void duplicate_ipo_keys(struct Ipo *ipo);
|
|
void borderselect_ipo_key(struct Ipo *ipo, float xmin, float xmax, int val);
|
|
void borderselect_icu_key(struct IpoCurve *icu, float xmin, float xmax,
|
|
int (*select_function)(struct BezTriple *));
|
|
void bone2objectspace(float obSpaceBoneMat[][4], float obSpace[][4], float restPos[][4]);
|
|
void insertmatrixkey(ID *id, int blocktype, char *actname, char *constname, int adrcode, float matrixvalue);
|
|
|
|
void select_ipo_key(struct Ipo *ipo, float selx, int sel);
|
|
void select_icu_key(struct IpoCurve *icu, float selx, int selectmode);
|
|
void setexprap_ipoloop(struct Ipo *ipo, int code);
|
|
|
|
/* callbacks */
|
|
int select_bezier_add(struct BezTriple *bezt);
|
|
int select_bezier_subtract(struct BezTriple *bezt);
|
|
int select_bezier_invert(struct BezTriple *bezt);
|
|
|
|
#endif /* BSE_EDITIPO_H */
|
|
|