archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Simulation: Change BPH prefix to SIM

Browse Source 
In a previous commit the `physics` folder has been renamed to `simulation`.
This commit updates the function/file prefix accordingly.
This commit is contained in:
Jacques Lucke
2020-07-16 14:37:21 +02:00
parent 9363c4de06
commit 9b6088cb9d
9 changed files with 252 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/blenkernel/intern/cloth.c
View File

@@ -47,7 +47,7 @@
#include "BKE_modifier.h"
#include "BKE_pointcache.h"
#include "BPH_mass_spring.h"
#include "SIM_mass_spring.h"
// #include "PIL_time.h" /* timing for debug prints */
@@ -344,12 +344,12 @@ static int do_init_cloth(Object *ob, ClothModifierData *clmd, Mesh *result, int
return 0;
}
BKE_cloth_solver_set_positions(clmd);
SIM_cloth_solver_set_positions(clmd);
ClothSimSettings *parms = clmd->sim_parms;
if (parms->flags & CLOTH_SIMSETTINGS_FLAG_PRESSURE &&
!(parms->flags & CLOTH_SIMSETTINGS_FLAG_PRESSURE_VOL)) {
BKE_cloth_solver_set_volume(clmd);
SIM_cloth_solver_set_volume(clmd);
}
clmd->clothObject->last_frame = MINFRAME - 1;
@@ -404,7 +404,7 @@ static int do_step_cloth(
// TIMEIT_START(cloth_step)
/* call the solver. */
ret = BPH_cloth_solve(depsgraph, ob, framenr, clmd, effectors);
ret = SIM_cloth_solve(depsgraph, ob, framenr, clmd, effectors);
// TIMEIT_END(cloth_step)
@@ -479,7 +479,7 @@ void clothModifier_do(ClothModifierData *clmd,
if (cache_result == PTCACHE_READ_EXACT || cache_result == PTCACHE_READ_INTERPOLATED ||
(!can_simulate && cache_result == PTCACHE_READ_OLD)) {
BKE_cloth_solver_set_positions(clmd);
SIM_cloth_solver_set_positions(clmd);
cloth_to_object(ob, clmd, vertexCos);
BKE_ptcache_validate(cache, framenr);
@@ -493,7 +493,7 @@ void clothModifier_do(ClothModifierData *clmd,
return;
}
if (cache_result == PTCACHE_READ_OLD) {
BKE_cloth_solver_set_positions(clmd);
SIM_cloth_solver_set_positions(clmd);
}
else if (
/* 2.4x disabled lib, but this can be used in some cases, testing further - campbell */
@@ -537,7 +537,7 @@ void cloth_free_modifier(ClothModifierData *clmd)
cloth = clmd->clothObject;
if (cloth) {
BPH_cloth_solver_free(clmd);
SIM_cloth_solver_free(clmd);
// Free the verts.
if (cloth->verts != NULL) {
@@ -619,7 +619,7 @@ void cloth_free_modifier_extern(ClothModifierData *clmd)
printf("cloth_free_modifier_extern in\n");
}
BPH_cloth_solver_free(clmd);
SIM_cloth_solver_free(clmd);
// Free the verts.
if (cloth->verts != NULL) {
@@ -919,10 +919,10 @@ static int cloth_from_object(
}
// init our solver
BPH_cloth_solver_init(ob, clmd);
SIM_cloth_solver_init(ob, clmd);
if (!first) {
BKE_cloth_solver_set_positions(clmd);
SIM_cloth_solver_set_positions(clmd);
}
clmd->clothObject->bvhtree = bvhtree_build_from_cloth(clmd, clmd->coll_parms->epsilon);