diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-19 20:39:41 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 11:30:04 +0300 |
commit | 4a16242e6008d7573c52b39274a88f0713d1345f (patch) | |
tree | a4b4779f75e87039c32b6984c1c25f6a8b9431e7 /source/blender/blenkernel/intern/cloth.c | |
parent | 0b0acb612436fcbc7889f480a2faba2b2dd1bfb5 (diff) |
Cleanup: Removed the unnecessary cloth solver abstraction (there is only
one solver anyway), and split some particle cloth functions for clarity.
Conflicts:
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/intern/particle_system.c
source/blender/blenloader/intern/versioning_270.c
source/blender/makesdna/DNA_particle_types.h
source/blender/makesrna/intern/rna_particle.c
Diffstat (limited to 'source/blender/blenkernel/intern/cloth.c')
-rw-r--r-- | source/blender/blenkernel/intern/cloth.c | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index a77357faee5..a8d7d0ac82b 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -51,15 +51,6 @@ // #include "PIL_time.h" /* timing for debug prints */ -/* Our available solvers. */ -// 255 is the magic reserved number, so NEVER try to put 255 solvers in here! -// 254 = MAX! -static CM_SOLVER_DEF solvers [] = -{ - { "Implicit", CM_IMPLICIT, BPH_cloth_solver_init, BPH_cloth_solve, BPH_cloth_solver_free }, - // { "Implicit C++", CM_IMPLICITCPP, implicitcpp_init, implicitcpp_solver, implicitcpp_free }, -}; - /* ********** cloth engine ******* */ /* Prototypes for internal functions. */ @@ -419,8 +410,7 @@ static int do_step_cloth(Object *ob, ClothModifierData *clmd, DerivedMesh *resul // TIMEIT_START(cloth_step) /* call the solver. */ - if (solvers [clmd->sim_parms->solver_type].solver) - ret = solvers[clmd->sim_parms->solver_type].solver(ob, framenr, clmd, effectors); + ret = BPH_cloth_solve(ob, framenr, clmd, effectors); // TIMEIT_END(cloth_step) @@ -615,10 +605,7 @@ void cloth_free_modifier(ClothModifierData *clmd ) if ( cloth ) { - // If our solver provides a free function, call it - if ( solvers [clmd->sim_parms->solver_type].free ) { - solvers [clmd->sim_parms->solver_type].free ( clmd ); - } + BPH_cloth_solver_free(clmd); // Free the verts. if ( cloth->verts != NULL ) @@ -684,10 +671,7 @@ void cloth_free_modifier_extern(ClothModifierData *clmd ) if (G.debug_value > 0) printf("cloth_free_modifier_extern in\n"); - // If our solver provides a free function, call it - if ( solvers [clmd->sim_parms->solver_type].free ) { - solvers [clmd->sim_parms->solver_type].free ( clmd ); - } + BPH_cloth_solver_free(clmd); // Free the verts. if ( cloth->verts != NULL ) @@ -965,9 +949,7 @@ static int cloth_from_object(Object *ob, ClothModifierData *clmd, DerivedMesh *d } // init our solver - if ( solvers [clmd->sim_parms->solver_type].init ) { - solvers [clmd->sim_parms->solver_type].init ( ob, clmd ); - } + BPH_cloth_solver_init(ob, clmd); if (!first) BKE_cloth_solver_set_positions(clmd); |