Completely refactored sph fluid particles. Only the very core of the algorithm remains
the same, but big changes have happened both on the outside and on the inside. New UI: * The old parameters were quite true to the underlying algorithm, but were quite obscure from a users point of view. Now there are only a few intuitive basic parameters that define the basic fluid behavior. ** By default particle size is now used to determine the interaction radius, rest density and spring rest lengths so that it's easy to get stable simulations by simply emitting particles for a few frames and adjusting the particle size (easy when the particle size is drawn) so that the fluid appears continuous (particles are touching eachother). ** Stiffness - in reality most fluids are very incompressible, but this is a very hard problem to solve with particle based fluid simulation so some compromises have to be made. So the bigger the stiffness parameter is the less the fluid will compress under stress, but the more substeps are needed for stable simulation. ** Viscosity - how much internal friction there is in the fluid. Large viscosities also smooth out instabilities, so less viscous fluids again need more substeps to remain stable. ** Buoancy - with high buoancy low pressure areas inside the fluid start to rise against gravity, and high pressure areas start to come down. * In addition to these basic parameters there are separate advanced parameters that can either be tweaked relative to the basic parameters (or particle size) or defined independently. ** Repulsion - the stiffness parameter tries to keep the fluid density constant, but this can lead to small clumps of particles, so the repulsion keeps the particles better separated. ** Stiff viscosity - the normal viscosity only applies when particles are moving closer to eachother to allow free flowing fluids. Stiff viscosity also applies smoothing to particles that are moving away from eachother. ** Interaction radius - by default this is 4 * particle size. ** Rest density - by default this is a density that the particles have when they're packed densely next to eachother. ** Spring rest length - by default this is 2 * particle size. * There are also new options for 3d view particle coloring in the display panel to show particle velocity and acceleration. These make it easier to see what's happening in the fluid simulations, but can of course be used with other particles as well. * Viscoelastic springs have some new options too. The plasticity can now be set to much higher values for instant deletion of springs as the elastic limit is exeeded. In addition to that there is an option to only create springs for a certain number of frames when a particle is born. These options give new possibilities for breaking viscoelastic fluids. New in the code: * Most of the fluids code is now thread safe, so when particle dynamics go threaded there will be a nice speed boost to fluids as well. * Fluids now use a bvh-tree instead of a kd-tree for the neighbor lookups. The bvh-tree implementation makes the code quite a bit cleaner and should also give a slight speed boost to the simulation too. * Previously only force fields were calculated with the different integration methods, but now the fluid calculations are also done using the selected integration method, so there are again more choices in effecting simulation accuracy and stability. This change also included a nice cleanup of the whole particle integration code. As the internals are pretty stirred up old particle fluid simulations will probably not work correctly straight away, but with some tweaking the same level of control is still available by not using the "relative versions" of the advanced parameters (by default these are not used when loading old files).
This commit is contained in:
Janne Karhu
parent
60fe23b100
commit
5b75593c23
|
|
@ -505,33 +505,52 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, bpy.types.Panel):
|
|||
|
||||
split = layout.split()
|
||||
sub = split.column()
|
||||
sub.label(text="Fluid Interaction:")
|
||||
sub.prop(fluid, "fluid_radius")
|
||||
sub.prop(fluid, "repulsion_force")
|
||||
subsub = sub.column(align=True)
|
||||
subsub.prop(fluid, "rest_density")
|
||||
subsub.prop(fluid, "density_force", text="Force")
|
||||
|
||||
sub.label(text="Viscosity:")
|
||||
subsub = sub.column(align=True)
|
||||
subsub.prop(fluid, "linear_viscosity", text="Linear")
|
||||
subsub.prop(fluid, "square_viscosity", text="Square")
|
||||
sub.label(text="Fluid properties:")
|
||||
sub.prop(fluid, "stiffness", text="Stiffness")
|
||||
sub.prop(fluid, "linear_viscosity", text="Viscosity")
|
||||
sub.prop(fluid, "buoyancy", text="Buoancy", slider=True)
|
||||
|
||||
sub = split.column()
|
||||
subsub = sub.row()
|
||||
subsub.label(text="Advanced:")
|
||||
subsub = sub.row()
|
||||
subsub.prop(fluid, "repulsion", slider=fluid.factor_repulsion)
|
||||
subsub.prop(fluid, "factor_repulsion", text="")
|
||||
|
||||
subsub = sub.row()
|
||||
subsub.prop(fluid, "stiff_viscosity", slider=fluid.factor_stiff_viscosity)
|
||||
subsub.prop(fluid, "factor_stiff_viscosity", text="")
|
||||
|
||||
subsub = sub.row()
|
||||
subsub.prop(fluid, "fluid_radius", slider=fluid.factor_radius)
|
||||
subsub.prop(fluid, "factor_radius", text="")
|
||||
|
||||
subsub = sub.row()
|
||||
subsub.prop(fluid, "rest_density", slider=fluid.factor_density)
|
||||
subsub.prop(fluid, "factor_density", text="")
|
||||
|
||||
split = layout.split()
|
||||
|
||||
sub = split.column()
|
||||
|
||||
sub.label(text="Springs:")
|
||||
sub.prop(fluid, "spring_force", text="Force")
|
||||
#Hidden to make ui a bit lighter, can be unhidden for a bit more control
|
||||
#sub.prop(fluid, "rest_length", slider=True)
|
||||
sub.prop(fluid, "use_viscoelastic_springs")
|
||||
subsub = sub.column(align=True)
|
||||
subsub.active = fluid.use_viscoelastic_springs
|
||||
subsub.prop(fluid, "yield_ratio", slider=True)
|
||||
subsub.prop(fluid, "plasticity", slider=True)
|
||||
|
||||
sub = split.column()
|
||||
sub.label(text="Advanced:")
|
||||
subsub = sub.row()
|
||||
subsub.prop(fluid, "rest_length", slider=fluid.factor_rest_length)
|
||||
subsub.prop(fluid, "factor_rest_length", text="")
|
||||
sub.label(text="")
|
||||
subsub = sub.column()
|
||||
subsub.active = fluid.use_viscoelastic_springs
|
||||
subsub.prop(fluid, "use_initial_rest_length")
|
||||
|
||||
sub.label(text="Buoyancy:")
|
||||
sub.prop(fluid, "buoyancy", text="Strength", slider=True)
|
||||
subsub.prop(fluid, "spring_frames", text="Frames")
|
||||
|
||||
|
||||
elif part.physics_type == 'KEYED':
|
||||
split = layout.split()
|
||||
|
|
@ -967,16 +986,15 @@ class PARTICLE_PT_draw(ParticleButtonsPanel, bpy.types.Panel):
|
|||
if part.physics_type == 'BOIDS':
|
||||
col.prop(part, "show_health")
|
||||
|
||||
col = row.column()
|
||||
col.prop(part, "show_material_color", text="Use material color")
|
||||
col = row.column(align=True)
|
||||
col.label(text="Color:")
|
||||
col.prop(part, "draw_color", text="")
|
||||
sub = col.row()
|
||||
sub.active = part.draw_color in ('VELOCITY', 'ACCELERATION')
|
||||
sub.prop(part, "color_maximum", text="Max")
|
||||
|
||||
if (path):
|
||||
col.prop(part, "draw_step")
|
||||
else:
|
||||
sub = col.column()
|
||||
sub.active = (part.show_material_color is False)
|
||||
#sub.label(text="color")
|
||||
#sub.label(text="Override material color")
|
||||
|
||||
|
||||
class PARTICLE_PT_children(ParticleButtonsPanel, bpy.types.Panel):
|
||||
|
|
|
|||
|
|
@ -571,6 +571,7 @@ void psys_free(Object *ob, ParticleSystem * psys)
|
|||
|
||||
BLI_freelistN(&psys->targets);
|
||||
|
||||
BLI_bvhtree_free(psys->bvhtree);
|
||||
BLI_kdtree_free(psys->tree);
|
||||
|
||||
if(psys->fluid_springs)
|
||||
|
|
@ -2703,7 +2704,7 @@ static void psys_thread_create_path(ParticleThread *thread, struct ChildParticle
|
|||
sub_v3_v3v3((child-1)->vel, child->co, (child-2)->co);
|
||||
mul_v3_fl((child-1)->vel, 0.5);
|
||||
|
||||
if(ctx->ma && (part->draw & PART_DRAW_MAT_COL))
|
||||
if(ctx->ma && (part->draw_col == PART_DRAW_COL_MAT))
|
||||
get_strand_normal(ctx->ma, ornor, cur_length, (child-1)->vel);
|
||||
}
|
||||
|
||||
|
|
@ -2722,7 +2723,7 @@ static void psys_thread_create_path(ParticleThread *thread, struct ChildParticle
|
|||
cur_length = 0.0f;
|
||||
}
|
||||
|
||||
if(ctx->ma && (part->draw & PART_DRAW_MAT_COL)) {
|
||||
if(ctx->ma && (part->draw_col == PART_DRAW_COL_MAT)) {
|
||||
VECCOPY(child->col, &ctx->ma->r)
|
||||
get_strand_normal(ctx->ma, ornor, cur_length, child->vel);
|
||||
}
|
||||
|
|
@ -2907,7 +2908,7 @@ void psys_cache_paths(ParticleSimulationData *sim, float cfra)
|
|||
|
||||
psys->lattice = psys_get_lattice(sim);
|
||||
ma= give_current_material(sim->ob, psys->part->omat);
|
||||
if(ma && (psys->part->draw & PART_DRAW_MAT_COL))
|
||||
if(ma && (psys->part->draw_col == PART_DRAW_COL_MAT))
|
||||
VECCOPY(col, &ma->r)
|
||||
|
||||
if((psys->flag & PSYS_GLOBAL_HAIR)==0) {
|
||||
|
|
@ -3535,16 +3536,15 @@ static void default_particle_settings(ParticleSettings *part)
|
|||
part->clength=1.0f;
|
||||
part->clength_thres=0.0f;
|
||||
|
||||
part->draw= PART_DRAW_EMITTER|PART_DRAW_MAT_COL;
|
||||
part->draw= PART_DRAW_EMITTER;
|
||||
part->draw_line[0]=0.5;
|
||||
part->path_start = 0.0f;
|
||||
part->path_end = 1.0f;
|
||||
|
||||
part->keyed_loops = 1;
|
||||
|
||||
#if 0 // XXX old animation system
|
||||
part->ipo = NULL;
|
||||
#endif // XXX old animation system
|
||||
part->color_vec_max = 1.f;
|
||||
part->draw_col = PART_DRAW_COL_MAT;
|
||||
|
||||
part->simplify_refsize= 1920;
|
||||
part->simplify_rate= 1.0f;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -3330,6 +3330,7 @@ static void direct_link_particlesystems(FileData *fd, ListBase *particles)
|
|||
}
|
||||
|
||||
psys->tree = NULL;
|
||||
psys->bvhtree = NULL;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
|
@ -11491,7 +11492,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
|
|||
bScreen *sc;
|
||||
Brush *brush;
|
||||
Object *ob;
|
||||
|
||||
ParticleSettings *part;
|
||||
Material *mat;
|
||||
int tex_nr, transp_tex;
|
||||
|
||||
|
|
@ -11539,6 +11540,12 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* particle draw color from material */
|
||||
for(part = main->particle.first; part; part = part->id.next) {
|
||||
if(part->draw & PART_DRAW_MAT_COL)
|
||||
part->draw_col = PART_DRAW_COL_MAT;
|
||||
}
|
||||
}
|
||||
|
||||
/* put compatibility code here until next subversion bump */
|
||||
|
|
|
|||
|
|
@ -3465,7 +3465,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
|
|||
Material *ma;
|
||||
float vel[3], imat[4][4];
|
||||
float timestep, pixsize=1.0, pa_size, r_tilt, r_length;
|
||||
float pa_time, pa_birthtime, pa_dietime, pa_health;
|
||||
float pa_time, pa_birthtime, pa_dietime, pa_health, intensity;
|
||||
float cfra;
|
||||
float ma_r=0.0f, ma_g=0.0f, ma_b=0.0f;
|
||||
int a, totpart, totpoint=0, totve=0, drawn, draw_as, totchild=0;
|
||||
|
|
@ -3529,7 +3529,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
|
|||
|
||||
if(v3d->zbuf) glDepthMask(1);
|
||||
|
||||
if((ma) && (part->draw&PART_DRAW_MAT_COL)) {
|
||||
if((ma) && (part->draw_col == PART_DRAW_COL_MAT)) {
|
||||
rgb_float_to_byte(&(ma->r), tcol);
|
||||
|
||||
ma_r = ma->r;
|
||||
|
|
@ -3630,6 +3630,10 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
|
|||
normalize_v3(imat[1]);
|
||||
}
|
||||
|
||||
if(ELEM3(draw_as, PART_DRAW_DOT, PART_DRAW_CROSS, PART_DRAW_LINE)
|
||||
&& part->draw_col > PART_DRAW_COL_MAT)
|
||||
create_cdata = 1;
|
||||
|
||||
if(!create_cdata && pdd && pdd->cdata) {
|
||||
MEM_freeN(pdd->cdata);
|
||||
pdd->cdata = pdd->cd = NULL;
|
||||
|
|
@ -3672,7 +3676,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
|
|||
if(create_cdata && !pdd->cdata)
|
||||
pdd->cdata = MEM_callocN(tot_vec_size, "particle_cdata");
|
||||
if(create_ndata && !pdd->ndata)
|
||||
pdd->ndata = MEM_callocN(tot_vec_size, "particle_vdata");
|
||||
pdd->ndata = MEM_callocN(tot_vec_size, "particle_ndata");
|
||||
|
||||
if(part->draw & PART_DRAW_VEL && draw_as != PART_DRAW_LINE) {
|
||||
if(!pdd->vedata)
|
||||
|
|
@ -3727,65 +3731,26 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
|
|||
else
|
||||
pa_health = -1.0;
|
||||
|
||||
#if 0 // XXX old animation system
|
||||
if((part->flag&PART_ABS_TIME)==0){
|
||||
if(ma && ma->ipo){
|
||||
IpoCurve *icu;
|
||||
|
||||
/* correction for lifetime */
|
||||
calc_ipo(ma->ipo, 100.0f*pa_time);
|
||||
|
||||
for(icu = ma->ipo->curve.first; icu; icu=icu->next) {
|
||||
if(icu->adrcode == MA_COL_R)
|
||||
ma_r = icu->curval;
|
||||
else if(icu->adrcode == MA_COL_G)
|
||||
ma_g = icu->curval;
|
||||
else if(icu->adrcode == MA_COL_B)
|
||||
ma_b = icu->curval;
|
||||
}
|
||||
}
|
||||
if(part->ipo) {
|
||||
IpoCurve *icu;
|
||||
|
||||
/* correction for lifetime */
|
||||
calc_ipo(part->ipo, 100*pa_time);
|
||||
|
||||
for(icu = part->ipo->curve.first; icu; icu=icu->next) {
|
||||
if(icu->adrcode == PART_SIZE)
|
||||
pa_size = icu->curval;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif // XXX old animation system
|
||||
|
||||
r_tilt = 2.0f*(PSYS_FRAND(a + 21) - 0.5f);
|
||||
r_length = PSYS_FRAND(a + 22);
|
||||
|
||||
if(part->draw_col > PART_DRAW_COL_MAT) {
|
||||
switch(part->draw_col) {
|
||||
case PART_DRAW_COL_VEL:
|
||||
intensity = len_v3(pa->state.vel)/part->color_vec_max;
|
||||
break;
|
||||
case PART_DRAW_COL_ACC:
|
||||
intensity = len_v3v3(pa->state.vel, pa->prev_state.vel)/((pa->state.time-pa->prev_state.time)*part->color_vec_max);
|
||||
break;
|
||||
}
|
||||
CLAMP(intensity, 0.f, 1.f);
|
||||
weight_to_rgb(intensity, &ma_r, &ma_g, &ma_b);
|
||||
}
|
||||
}
|
||||
else{
|
||||
ChildParticle *cpa= &psys->child[a-totpart];
|
||||
|
||||
pa_time=psys_get_child_time(psys,cpa,cfra,&pa_birthtime,&pa_dietime);
|
||||
|
||||
#if 0 // XXX old animation system
|
||||
if((part->flag&PART_ABS_TIME)==0) {
|
||||
if(ma && ma->ipo){
|
||||
IpoCurve *icu;
|
||||
|
||||
/* correction for lifetime */
|
||||
calc_ipo(ma->ipo, 100.0f*pa_time);
|
||||
|
||||
for(icu = ma->ipo->curve.first; icu; icu=icu->next) {
|
||||
if(icu->adrcode == MA_COL_R)
|
||||
ma_r = icu->curval;
|
||||
else if(icu->adrcode == MA_COL_G)
|
||||
ma_g = icu->curval;
|
||||
else if(icu->adrcode == MA_COL_B)
|
||||
ma_b = icu->curval;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif // XXX old animation system
|
||||
|
||||
pa_size=psys_get_child_size(psys,cpa,cfra,NULL);
|
||||
|
||||
pa_health = -1.0;
|
||||
|
|
@ -3911,7 +3876,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
|
|||
if (1) { //ob_dt > OB_WIRE) {
|
||||
glEnableClientState(GL_NORMAL_ARRAY);
|
||||
|
||||
if(part->draw&PART_DRAW_MAT_COL)
|
||||
if(part->draw_col == PART_DRAW_COL_MAT)
|
||||
glEnableClientState(GL_COLOR_ARRAY);
|
||||
|
||||
glEnable(GL_LIGHTING);
|
||||
|
|
@ -3940,7 +3905,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
|
|||
|
||||
if(1) { //ob_dt > OB_WIRE) {
|
||||
glNormalPointer(GL_FLOAT, sizeof(ParticleCacheKey), path->vel);
|
||||
if(part->draw&PART_DRAW_MAT_COL)
|
||||
if(part->draw_col == PART_DRAW_COL_MAT)
|
||||
glColorPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->col);
|
||||
}
|
||||
|
||||
|
|
@ -3956,7 +3921,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
|
|||
|
||||
if(1) { //ob_dt > OB_WIRE) {
|
||||
glNormalPointer(GL_FLOAT, sizeof(ParticleCacheKey), path->vel);
|
||||
if(part->draw&PART_DRAW_MAT_COL)
|
||||
if(part->draw_col == PART_DRAW_COL_MAT)
|
||||
glColorPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->col);
|
||||
}
|
||||
|
||||
|
|
@ -3966,7 +3931,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
|
|||
|
||||
/* restore & clean up */
|
||||
if(1) { //ob_dt > OB_WIRE) {
|
||||
if(part->draw&PART_DRAW_MAT_COL)
|
||||
if(part->draw_col == PART_DRAW_COL_MAT)
|
||||
glDisable(GL_COLOR_ARRAY);
|
||||
glDisable(GL_COLOR_MATERIAL);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -123,16 +123,23 @@ typedef struct ParticleData {
|
|||
|
||||
typedef struct SPHFluidSettings {
|
||||
/*Particle Fluid*/
|
||||
float spring_k, radius, rest_length, plasticity_constant, yield_ratio;
|
||||
float radius, spring_k, rest_length;
|
||||
float plasticity_constant, yield_ratio;
|
||||
float plasticity_balance, yield_balance;
|
||||
float viscosity_omega, viscosity_beta;
|
||||
float stiffness_k, stiffness_knear, rest_density;
|
||||
float buoyancy;
|
||||
int flag, pad;
|
||||
int flag, spring_frames;
|
||||
} SPHFluidSettings;
|
||||
|
||||
/* fluid->flag */
|
||||
#define SPH_VISCOELASTIC_SPRINGS 1
|
||||
#define SPH_CURRENT_REST_LENGTH 2
|
||||
#define SPH_FAC_REPULSION 4
|
||||
#define SPH_FAC_DENSITY 8
|
||||
#define SPH_FAC_RADIUS 16
|
||||
#define SPH_FAC_VISCOSITY 32
|
||||
#define SPH_FAC_REST_LENGTH 64
|
||||
|
||||
typedef struct ParticleSettings {
|
||||
ID id;
|
||||
|
|
@ -143,12 +150,12 @@ typedef struct ParticleSettings {
|
|||
|
||||
struct EffectorWeights *effector_weights;
|
||||
|
||||
int flag;
|
||||
int flag, rt;
|
||||
short type, from, distr, texact;
|
||||
/* physics modes */
|
||||
short phystype, rotmode, avemode, reactevent;
|
||||
short draw, draw_as, draw_size, childtype;
|
||||
short ren_as, subframes;
|
||||
short ren_as, subframes, draw_col;
|
||||
/* number of path segments, power of 2 except */
|
||||
short draw_step, ren_step;
|
||||
short hair_step, keys_step;
|
||||
|
|
@ -157,12 +164,15 @@ typedef struct ParticleSettings {
|
|||
short adapt_angle, adapt_pix;
|
||||
|
||||
short disp, omat, interpolation, rotfrom, integrator;
|
||||
short kink, kink_axis, rt2;
|
||||
short kink, kink_axis;
|
||||
|
||||
/* billboards */
|
||||
short bb_align, bb_uv_split, bb_anim, bb_split_offset;
|
||||
float bb_tilt, bb_rand_tilt, bb_offset[2];
|
||||
|
||||
/* draw color */
|
||||
float color_vec_max;
|
||||
|
||||
/* simplification */
|
||||
short simplify_flag, simplify_refsize;
|
||||
float simplify_rate, simplify_transition;
|
||||
|
|
@ -249,9 +259,9 @@ typedef struct ParticleSystem{ /* note, make sure all (runtime) are NULL's in
|
|||
char name[32]; /* particle system name */
|
||||
|
||||
float imat[4][4]; /* used for duplicators */
|
||||
float cfra, tree_frame;
|
||||
float cfra, tree_frame, bvhtree_frame;
|
||||
int seed, child_seed;
|
||||
int flag, totpart, totunexist, totchild, totcached, totchildcache, rt;
|
||||
int flag, totpart, totunexist, totchild, totcached, totchildcache;
|
||||
short recalc, target_psys, totkeyed, bakespace;
|
||||
|
||||
char bb_uvname[3][32]; /* billboard uv name */
|
||||
|
|
@ -271,7 +281,8 @@ typedef struct ParticleSystem{ /* note, make sure all (runtime) are NULL's in
|
|||
ParticleSpring *fluid_springs;
|
||||
int tot_fluidsprings, alloc_fluidsprings;
|
||||
|
||||
struct KDTree *tree; /* used for interactions with self and other systems */
|
||||
struct KDTree *tree; /* used for interactions with self and other systems */
|
||||
struct BVHTree *bvhtree; /* used for interactions with self and other systems */
|
||||
|
||||
struct ParticleDrawData *pdd;
|
||||
|
||||
|
|
@ -375,10 +386,17 @@ typedef struct ParticleSystem{ /* note, make sure all (runtime) are NULL's in
|
|||
#define PART_DRAW_RAND_GR 1024
|
||||
#define PART_DRAW_REN_ADAPT 2048
|
||||
#define PART_DRAW_VEL_LENGTH (1<<12)
|
||||
#define PART_DRAW_MAT_COL (1<<13)
|
||||
#define PART_DRAW_MAT_COL (1<<13) /* deprecated, but used in do_versions */
|
||||
#define PART_DRAW_WHOLE_GR (1<<14)
|
||||
#define PART_DRAW_REN_STRAND (1<<15)
|
||||
|
||||
/* part->draw_col */
|
||||
#define PART_DRAW_COL_NONE 0
|
||||
#define PART_DRAW_COL_MAT 1
|
||||
#define PART_DRAW_COL_VEL 2
|
||||
#define PART_DRAW_COL_ACC 3
|
||||
|
||||
|
||||
/* part->simplify_flag */
|
||||
#define PART_SIMPLIFY_ENABLE 1
|
||||
#define PART_SIMPLIFY_VIEWPORT 2
|
||||
|
|
|
|||
|
|
@ -1073,10 +1073,9 @@ static void rna_def_fluid_settings(BlenderRNA *brna)
|
|||
RNA_def_property_ui_text(prop, "Interaction Radius", "Fluid interaction radius");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_reset");
|
||||
|
||||
/* Hidden in ui to give a little easier user experience. */
|
||||
prop= RNA_def_property(srna, "rest_length", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_range(prop, 0.0f, 1.0f);
|
||||
RNA_def_property_ui_text(prop, "Rest Length", "Spring rest length (factor of interaction radius)");
|
||||
RNA_def_property_range(prop, 0.0f, 2.0f);
|
||||
RNA_def_property_ui_text(prop, "Rest Length", "Spring rest length (factor of particle radius)");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_reset");
|
||||
|
||||
prop= RNA_def_property(srna, "use_viscoelastic_springs", PROP_BOOLEAN, PROP_NONE);
|
||||
|
|
@ -1086,12 +1085,12 @@ static void rna_def_fluid_settings(BlenderRNA *brna)
|
|||
|
||||
prop= RNA_def_property(srna, "use_initial_rest_length", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", SPH_CURRENT_REST_LENGTH);
|
||||
RNA_def_property_ui_text(prop, "Initial Rest Length", "Use the initial length as spring rest length instead of interaction radius/2");
|
||||
RNA_def_property_ui_text(prop, "Initial Rest Length", "Use the initial length as spring rest length instead of 2 * particle size");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_reset");
|
||||
|
||||
prop= RNA_def_property(srna, "plasticity", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_float_sdna(prop, NULL, "plasticity_constant");
|
||||
RNA_def_property_range(prop, 0.0f, 1.0f);
|
||||
RNA_def_property_range(prop, 0.0f, 100.0f);
|
||||
RNA_def_property_ui_text(prop, "Plasticity", "How much the spring rest length can change after the elastic limit is crossed");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_reset");
|
||||
|
||||
|
|
@ -1100,6 +1099,11 @@ static void rna_def_fluid_settings(BlenderRNA *brna)
|
|||
RNA_def_property_range(prop, 0.0f, 1.0f);
|
||||
RNA_def_property_ui_text(prop, "Elastic Limit", "How much the spring has to be stretched/compressed in order to change it's rest length");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_reset");
|
||||
|
||||
prop= RNA_def_property(srna, "spring_frames", PROP_INT, PROP_NONE);
|
||||
RNA_def_property_range(prop, 0.0f, 100.0f);
|
||||
RNA_def_property_ui_text(prop, "Spring Frames", "Create springs for this number of frames since particles birth (0 is always)");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_reset");
|
||||
|
||||
/* Viscosity */
|
||||
prop= RNA_def_property(srna, "linear_viscosity", PROP_FLOAT, PROP_NONE);
|
||||
|
|
@ -1109,42 +1113,69 @@ static void rna_def_fluid_settings(BlenderRNA *brna)
|
|||
RNA_def_property_ui_text(prop, "Viscosity", "Linear viscosity");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_reset");
|
||||
|
||||
prop= RNA_def_property(srna, "square_viscosity", PROP_FLOAT, PROP_NONE);
|
||||
prop= RNA_def_property(srna, "stiff_viscosity", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_float_sdna(prop, NULL, "viscosity_beta");
|
||||
RNA_def_property_range(prop, 0.0f, 100.0f);
|
||||
RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3);
|
||||
RNA_def_property_ui_text(prop, "Square viscosity", "Square viscosity");
|
||||
RNA_def_property_ui_range(prop, 0.0f, 2.0f, 1, 3);
|
||||
RNA_def_property_ui_text(prop, "Stiff viscosity", "Creates viscosity for expanding fluid)");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_reset");
|
||||
|
||||
/* Double density relaxation */
|
||||
prop= RNA_def_property(srna, "density_force", PROP_FLOAT, PROP_NONE);
|
||||
prop= RNA_def_property(srna, "stiffness", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_float_sdna(prop, NULL, "stiffness_k");
|
||||
RNA_def_property_range(prop, 0.0f, 100.0f);
|
||||
RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3);
|
||||
RNA_def_property_ui_text(prop, "Density Force", "How strongly the fluid tends to rest density");
|
||||
RNA_def_property_ui_text(prop, "Stiffness", "How incompressible the fluid is");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_reset");
|
||||
|
||||
prop= RNA_def_property(srna, "repulsion_force", PROP_FLOAT, PROP_NONE);
|
||||
prop= RNA_def_property(srna, "repulsion", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_float_sdna(prop, NULL, "stiffness_knear");
|
||||
RNA_def_property_range(prop, 0.0f, 100.0f);
|
||||
RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3);
|
||||
RNA_def_property_ui_text(prop, "Repulsion", "How strongly the fluid tries to keep from clustering");
|
||||
RNA_def_property_ui_range(prop, 0.0f, 2.0f, 1, 3);
|
||||
RNA_def_property_ui_text(prop, "Repulsion Factor", "How strongly the fluid tries to keep from clustering (factor of stiffness)");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_reset");
|
||||
|
||||
prop= RNA_def_property(srna, "rest_density", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_float_sdna(prop, NULL, "rest_density");
|
||||
RNA_def_property_range(prop, 0.0f, 1000.0f);
|
||||
RNA_def_property_ui_range(prop, 0.0f, 100.0f, 1, 3);
|
||||
RNA_def_property_ui_text(prop, "Rest Density", "Rest density of the fluid");
|
||||
RNA_def_property_range(prop, 0.0f, 100.0f);
|
||||
RNA_def_property_ui_range(prop, 0.0f, 2.0f, 1, 3);
|
||||
RNA_def_property_ui_text(prop, "Rest Density", "Fluid rest density");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_reset");
|
||||
|
||||
/* Buoyancy */
|
||||
prop= RNA_def_property(srna, "buoyancy", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_float_sdna(prop, NULL, "buoyancy");
|
||||
RNA_def_property_range(prop, 0.0f, 1.0f);
|
||||
RNA_def_property_range(prop, 0.0f, 10.0f);
|
||||
RNA_def_property_ui_range(prop, 0.0f, 1.0f, 1, 3);
|
||||
RNA_def_property_ui_text(prop, "Buoyancy", "Artificial buoyancy force in negative gravity direction based on pressure differences inside the fluid");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_reset");
|
||||
|
||||
/* Factor flags */
|
||||
|
||||
prop= RNA_def_property(srna, "factor_repulsion", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", SPH_FAC_REPULSION);
|
||||
RNA_def_property_ui_text(prop, "Factor Repulsion", "Repulsion is a factor of stiffness");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_reset");
|
||||
|
||||
prop= RNA_def_property(srna, "factor_density", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", SPH_FAC_DENSITY);
|
||||
RNA_def_property_ui_text(prop, "Factor Density", "Density is calculated as a factor of default density (depends on particle size)");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_reset");
|
||||
|
||||
prop= RNA_def_property(srna, "factor_radius", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", SPH_FAC_RADIUS);
|
||||
RNA_def_property_ui_text(prop, "Factor Radius", "Interaction radius is a factor of 4 * particle size");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_reset");
|
||||
|
||||
prop= RNA_def_property(srna, "factor_stiff_viscosity", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", SPH_FAC_VISCOSITY);
|
||||
RNA_def_property_ui_text(prop, "Factor Stiff Viscosity", "Stiff viscosity is a factor of normal viscosity");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_reset");
|
||||
|
||||
prop= RNA_def_property(srna, "factor_rest_length", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", SPH_FAC_REST_LENGTH);
|
||||
RNA_def_property_ui_text(prop, "Factor Rest Length", "Spring rest length is a factor of 2 * particle size");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_reset");
|
||||
}
|
||||
|
||||
static void rna_def_particle_settings_mtex(BlenderRNA *brna)
|
||||
|
|
@ -1483,6 +1514,14 @@ static void rna_def_particle_settings(BlenderRNA *brna)
|
|||
{0, NULL, 0, NULL, NULL}
|
||||
};
|
||||
|
||||
static EnumPropertyItem draw_col_items[] = {
|
||||
{PART_DRAW_COL_NONE, "NONE", 0, "None", ""},
|
||||
{PART_DRAW_COL_MAT, "MATERIAL", 0, "Material", ""},
|
||||
{PART_DRAW_COL_VEL, "VELOCITY", 0, "Velocity", ""},
|
||||
{PART_DRAW_COL_ACC, "ACCELERATION", 0, "Acceleration", ""},
|
||||
{0, NULL, 0, NULL, NULL}
|
||||
};
|
||||
|
||||
srna= RNA_def_struct(brna, "ParticleSettings", "ID");
|
||||
RNA_def_struct_ui_text(srna, "Particle Settings", "Particle settings, reusable by multiple particle systems");
|
||||
RNA_def_struct_ui_icon(srna, ICON_PARTICLE_DATA);
|
||||
|
|
@ -1725,11 +1764,6 @@ static void rna_def_particle_settings(BlenderRNA *brna)
|
|||
RNA_def_property_ui_text(prop, "Speed", "Multiply line length by particle speed");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_redo");
|
||||
|
||||
prop= RNA_def_property(srna, "show_material_color", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_MAT_COL);
|
||||
RNA_def_property_ui_text(prop, "Material Color", "Draw particles using material's diffuse color");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_redo");
|
||||
|
||||
prop= RNA_def_property(srna, "use_whole_group", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_WHOLE_GR);
|
||||
RNA_def_property_ui_text(prop, "Whole Group", "Use whole group at once");
|
||||
|
|
@ -1754,6 +1788,12 @@ static void rna_def_particle_settings(BlenderRNA *brna)
|
|||
RNA_def_property_ui_text(prop, "Particle Rendering", "How particles are rendered");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_redo");
|
||||
|
||||
prop= RNA_def_property(srna, "draw_color", PROP_ENUM, PROP_NONE);
|
||||
RNA_def_property_enum_sdna(prop, NULL, "draw_col");
|
||||
RNA_def_property_enum_items(prop, draw_col_items);
|
||||
RNA_def_property_ui_text(prop, "Draw Color", "Draw additional particle data as a color");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_redo");
|
||||
|
||||
prop= RNA_def_property(srna, "draw_size", PROP_INT, PROP_NONE);
|
||||
RNA_def_property_range(prop, 0, 1000);
|
||||
RNA_def_property_ui_range(prop, 0, 100, 1, 0);
|
||||
|
|
@ -1865,6 +1905,12 @@ static void rna_def_particle_settings(BlenderRNA *brna)
|
|||
RNA_def_property_ui_text(prop, "Tilt", "Tilt of the billboards");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_redo");
|
||||
|
||||
prop= RNA_def_property(srna, "color_maximum", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_float_sdna(prop, NULL, "color_vec_max");
|
||||
RNA_def_property_range(prop, 0.01f, 100.0f);
|
||||
RNA_def_property_ui_text(prop, "Color Maximum", "Maximum length of the particle color vector");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_redo");
|
||||
|
||||
prop= RNA_def_property(srna, "billboard_tilt_random", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_float_sdna(prop, NULL, "bb_rand_tilt");
|
||||
RNA_def_property_range(prop, 0.0f, 1.0f);
|
||||
|
|
|
|||
Loading…
Reference in New Issue