Commit: 29553c06845728cc5fe5ddd948add25f07ec77aa Author: Sebastián Barschkis Date: Mon Jun 26 23:46:11 2017 +0200 Branches: fluid-mantaflow https://developer.blender.org/rB29553c06845728cc5fe5ddd948add25f07ec77aa
replaced particle dim getter with domain dim getter =================================================================== M intern/mantaflow/extern/manta_fluid_API.h M intern/mantaflow/intern/manta_fluid_API.cpp M source/blender/blenkernel/intern/particle_system.c =================================================================== diff --git a/intern/mantaflow/extern/manta_fluid_API.h b/intern/mantaflow/extern/manta_fluid_API.h index bdbd21a774a..ed76fbee91a 100644 --- a/intern/mantaflow/extern/manta_fluid_API.h +++ b/intern/mantaflow/extern/manta_fluid_API.h @@ -109,9 +109,6 @@ float liquid_get_triangle_x_at(struct FLUID *liquid, int i); float liquid_get_triangle_y_at(struct FLUID *liquid, int i); float liquid_get_triangle_z_at(struct FLUID *liquid, int i); int liquid_get_num_particles(struct FLUID *liquid); -int liquid_get_particle_dim_x(struct FLUID *liquid); -int liquid_get_particle_dim_y(struct FLUID *liquid); -int liquid_get_particle_dim_z(struct FLUID *liquid); int liquid_get_particle_flag_at(struct FLUID *liquid, int i); float liquid_get_particle_position_x_at(struct FLUID *liquid, int i); float liquid_get_particle_position_y_at(struct FLUID *liquid, int i); @@ -128,6 +125,9 @@ void liquid_manta_export(struct FLUID* smoke, struct SmokeModifierData *smd); int *fluid_get_num_obstacle(struct FLUID *fluid); float *fluid_get_inflow(struct FLUID *fluid); +int fluid_get_res_x(struct FLUID *fluid); +int fluid_get_res_y(struct FLUID *fluid); +int fluid_get_res_z(struct FLUID *fluid); #ifdef __cplusplus } diff --git a/intern/mantaflow/intern/manta_fluid_API.cpp b/intern/mantaflow/intern/manta_fluid_API.cpp index a16e43280ed..5e9da740cf8 100644 --- a/intern/mantaflow/intern/manta_fluid_API.cpp +++ b/intern/mantaflow/intern/manta_fluid_API.cpp @@ -614,21 +614,6 @@ extern "C" int liquid_get_num_particles(FLUID *liquid) return liquid->getNumParticles(); } -extern "C" int liquid_get_particle_dim_x(FLUID *liquid) -{ - return liquid->getParticleDimX(); -} - -extern "C" int liquid_get_particle_dim_y(FLUID *liquid) -{ - return liquid->getParticleDimY(); -} - -extern "C" int liquid_get_particle_dim_z(FLUID *liquid) -{ - return liquid->getParticleDimZ(); -} - extern "C" int liquid_get_particle_flag_at(FLUID *liquid, int i) { return liquid->getParticleFlagAt(i); @@ -685,3 +670,18 @@ extern "C" float *fluid_get_inflow(FLUID* fluid) { return fluid->getInflow(); } + +extern "C" int fluid_get_res_x(FLUID* fluid) +{ + return fluid->getResX(); +} + +extern "C" int fluid_get_res_y(FLUID* fluid) +{ + return fluid->getResY(); +} + +extern "C" int fluid_get_res_z(FLUID* fluid) +{ + return fluid->getResZ(); +} diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 48a5dd69c78..b056bca9535 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -3807,14 +3807,14 @@ static void particles_manta_step(ParticleSimulationData *sim, int UNUSED(cfra), pa->state.co[2] = liquid_get_particle_position_z_at(sds->fluid, p); // translate particles coordinates to origin (0,0,0) - pa->state.co[0] -= liquid_get_particle_dim_x(sds->fluid) / 2.0f; - pa->state.co[1] -= liquid_get_particle_dim_y(sds->fluid) / 2.0f; - pa->state.co[2] -= liquid_get_particle_dim_z(sds->fluid) / 2.0f; + pa->state.co[0] -= fluid_get_res_x(sds->fluid) / 2.0f; + pa->state.co[1] -= fluid_get_res_y(sds->fluid) / 2.0f; + pa->state.co[2] -= fluid_get_res_z(sds->fluid) / 2.0f; // scale down - pa->state.co[0] *= 1.0f / liquid_get_particle_dim_x(sds->fluid); - pa->state.co[1] *= 1.0f / liquid_get_particle_dim_y(sds->fluid); - pa->state.co[2] *= 1.0f / liquid_get_particle_dim_z(sds->fluid); + pa->state.co[0] *= 1.0f / fluid_get_res_x(sds->fluid); + pa->state.co[1] *= 1.0f / fluid_get_res_y(sds->fluid); + pa->state.co[2] *= 1.0f / fluid_get_res_z(sds->fluid); // scale up mul_v3_fl(pa->state.co, sds->scale); @@ -3841,9 +3841,9 @@ static void particles_manta_step(ParticleSimulationData *sim, int UNUSED(cfra), pa->state.vel[2] = liquid_get_particle_velocity_z_at(sds->fluid, p); // scale down - pa->state.vel[0] *= 1.0f / liquid_get_particle_dim_x(sds->fluid); - pa->state.vel[1] *= 1.0f / liquid_get_particle_dim_y(sds->fluid); - pa->state.vel[2] *= 1.0f / liquid_get_particle_dim_z(sds->fluid); + pa->state.vel[0] *= 1.0f / fluid_get_res_x(sds->fluid); + pa->state.vel[1] *= 1.0f / fluid_get_res_y(sds->fluid); + pa->state.vel[2] *= 1.0f / fluid_get_res_z(sds->fluid); // printf("pa->state.vel[0]: %f, pa->state.vel[1]: %f, pa->state.vel[2]: %f\n", pa->state.vel[0], pa->state.vel[1], pa->state.vel[2]); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs