blender
/
blender
137
404
Fork 586
Code Issues 6.2k Pull Requests 759 Projects 19 Wiki Activity

Fix T77766: support animated global gravity toggle 

Reviewers: sebbas

Differential Revision: https://developer.blender.org/D8281
This commit is contained in:
Jacques Lucke 2020-07-14 13:47:32 +02:00
parent 4096330b81
commit 01ec76842f
Notes: blender-bot 2023-02-14 10:14:07 +01:00 
Referenced by issue #77766, Simulations don't take animated global gravity toggle into account
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/mantaflow/intern/MANTA_main.cpp
View File

@ -870,9 +870,9 @@ void MANTA::initializeRNAMap(FluidModifierData *fmd)
mRNAMap["GUIDING_ALPHA"] = to_string(fds->guide_alpha);
mRNAMap["GUIDING_BETA"] = to_string(fds->guide_beta);
mRNAMap["GUIDING_FACTOR"] = to_string(fds->guide_vel_factor);
mRNAMap["GRAVITY_X"] = to_string(fds->gravity[0]);
mRNAMap["GRAVITY_Y"] = to_string(fds->gravity[1]);
mRNAMap["GRAVITY_Z"] = to_string(fds->gravity[2]);
mRNAMap["GRAVITY_X"] = to_string(fds->gravity_final[0]);
mRNAMap["GRAVITY_Y"] = to_string(fds->gravity_final[1]);
mRNAMap["GRAVITY_Z"] = to_string(fds->gravity_final[2]);
mRNAMap["CACHE_DIR"] = cacheDirectory;
mRNAMap["COMPRESSION_OPENVDB"] = vdbCompressionMethod;
mRNAMap["PRECISION_OPENVDB"] = vdbPrecisionHalf;

21
source/blender/blenkernel/intern/fluid.c
View File

@ -491,6 +491,17 @@ static void manta_set_domain_from_mesh(FluidDomainSettings *fds,
fds->cell_size[2] /= (float)fds->base_res[2];
}
static void update_final_gravity(FluidDomainSettings *fds, Scene *scene)
{
if (scene->physics_settings.flag & PHYS_GLOBAL_GRAVITY) {
copy_v3_v3(fds->gravity_final, scene->physics_settings.gravity);
}
else {
copy_v3_v3(fds->gravity_final, fds->gravity);
}
mul_v3_fl(fds->gravity_final, fds->effector_weights->global_gravity);
}
static bool BKE_fluid_modifier_init(
FluidModifierData *fmd, Depsgraph *depsgraph, Object *ob, Scene *scene, Mesh *me)
{
@ -502,10 +513,7 @@ static bool BKE_fluid_modifier_init(
/* Set domain dimensions from mesh. */
manta_set_domain_from_mesh(fds, ob, me, true);
/* Set domain gravity, use global gravity if enabled. */
if (scene->physics_settings.flag & PHYS_GLOBAL_GRAVITY) {
copy_v3_v3(fds->gravity, scene->physics_settings.gravity);
}
mul_v3_fl(fds->gravity, fds->effector_weights->global_gravity);
update_final_gravity(fds, scene);
/* Reset domain values. */
zero_v3_int(fds->shift);
zero_v3(fds->shift_f);
@ -3808,10 +3816,7 @@ static void BKE_fluid_modifier_processDomain(FluidModifierData *fmd,
fds->time_per_frame = 0;
/* Ensure that gravity is copied over every frame (could be keyframed). */
if (scene->physics_settings.flag & PHYS_GLOBAL_GRAVITY) {
copy_v3_v3(fds->gravity, scene->physics_settings.gravity);
mul_v3_fl(fds->gravity, fds->effector_weights->global_gravity);
}
update_final_gravity(fds, scene);
int next_frame = scene_framenr + 1;
int prev_frame = scene_framenr - 1;

8
source/blender/makesdna/DNA_fluid_types.h
View File

@ -471,9 +471,10 @@ typedef struct FluidDomainSettings {
int res_max[3]; /* Cell max. */
int res[3]; /* Data resolution (res_max-res_min). */
int total_cells;
float dx; /* 1.0f / res. */
float scale; /* Largest domain size. */
int boundary_width; /* Usually this is just 1. */
float dx; /* 1.0f / res. */
float scale; /* Largest domain size. */
int boundary_width; /* Usually this is just 1. */
float gravity_final[3]; /* Scene or domain gravity multiplied with gravity weight. */
/* -- User-accesible fields (from here on). -- */
@ -481,7 +482,6 @@ typedef struct FluidDomainSettings {
int adapt_margin;
int adapt_res;
float adapt_threshold;
char _pad1[4]; /* Unused. */
/* Fluid domain options */
int maxres; /* Longest axis on the BB gets this resolution assigned. */