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

Revert "Reshuffle applying of solver results a bit to ensure it works exactly"

Browse Source 
This reverts commit 4c723eb80e.
This commit is contained in:
Lukas Tönne
2015-03-02 12:18:57 +01:00
parent bc20a745be
commit cea3892813
3 changed files with 2 additions and 1101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1093
source/blender/physics/intern/BPH_mass_spring.cpp
View File

File diff suppressed because it is too large Load Diff

3
source/blender/physics/intern/implicit.h
View File

@@ -95,8 +95,7 @@ void BPH_mass_spring_add_constraint_ndof2(struct Implicit_Data *data, int index,
bool BPH_mass_spring_solve_velocities(struct Implicit_Data *data, float dt, struct ImplicitSolverResult *result);
bool BPH_mass_spring_solve_positions(struct Implicit_Data *data, float dt);
void BPH_mass_spring_apply_velocities(struct Implicit_Data *data);
void BPH_mass_spring_apply_positions(struct Implicit_Data *data);
void BPH_mass_spring_apply_result(struct Implicit_Data *data);
/* Clear the force vector at the beginning of the time step */
void BPH_mass_spring_clear_forces(struct Implicit_Data *data);

7
source/blender/physics/intern/implicit_blender.c
View File

@@ -1175,15 +1175,10 @@ bool BPH_mass_spring_solve_positions(Implicit_Data *data, float dt)
return true;
}
void BPH_mass_spring_apply_positions(Implicit_Data *data)
void BPH_mass_spring_apply_result(Implicit_Data *data)
{
int numverts = data->M[0].vcount;
cp_lfvector(data->X, data->Xnew, numverts);
}
void BPH_mass_spring_apply_velocities(Implicit_Data *data)
{
int numverts = data->M[0].vcount;
cp_lfvector(data->V, data->Vnew, numverts);
}