Commit: a8066c5e18f54bdaf3d6f3f5b5112b6a5e17aa9b
Author: over0219
Date: Tue Jun 9 18:23:28 2020 -0500
Branches: soc-2020-soft-body
https://developer.blender.org/rBa8066c5e18f54bdaf3d6f3f5b5112b6a5e17aa9b
stiffness settings
===================================================================
M extern/softbody/src/admmpd_energy.cpp
M extern/softbody/src/admmpd_solver.cpp
===================================================================
diff --git a/extern/softbody/src/admmpd_energy.cpp
b/extern/softbody/src/admmpd_energy.cpp
index 3b90d506a2a..cbe60cb1511 100644
--- a/extern/softbody/src/admmpd_energy.cpp
+++ b/extern/softbody/src/admmpd_energy.cpp
@@ -9,7 +9,7 @@ using namespace Eigen;
Lame::Lame() : m_model(0)
{
- set_from_youngs_poisson(10000000,0.399);
+ set_from_youngs_poisson(100000,0.299);
}
void Lame::set_from_youngs_poisson(double youngs, double poisson)
@@ -94,6 +94,7 @@ int EnergyTerm::init_tet(
if( volume < 0 )
throw std::runtime_error("**Solver::energy_init: Inverted
initial tet");
double k = lame.m_bulk_mod;
+std::cout << "IDX: " << index << " bulk mod: " << k << std::endl;
weight = std::sqrt(k*volume);
Matrix<double,4,3> S = Matrix<double,4,3>::Zero();
S(0,0) = -1; S(0,1) = -1; S(0,2) = -1;
diff --git a/extern/softbody/src/admmpd_solver.cpp
b/extern/softbody/src/admmpd_solver.cpp
index 008db80720e..c5831077b0b 100644
--- a/extern/softbody/src/admmpd_solver.cpp
+++ b/extern/softbody/src/admmpd_solver.cpp
@@ -237,10 +237,9 @@ void Solver::compute_matrices(
data->v.setZero();
}
if (data->m.rows() != nx)
- { // TODO get from BodyPoint
+ { // TODO get from input
data->m.resize(nx);
data->m.setOnes();
- data->m *= 0.01;
}
// Add per-element energies to data
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
