diff options
author | over0219 <over0219@umn.edu> | 2020-06-23 03:00:36 +0300 |
---|---|---|
committer | over0219 <over0219@umn.edu> | 2020-06-23 03:00:36 +0300 |
commit | 88ab1c138dcb370829ae0362ad6ee8a462d8a6ca (patch) | |
tree | f8a1f130be9bd564141e720114e31aef4839e748 /extern/softbody/src/admmpd_types.h | |
parent | 50e2c479cc22d0efd1d744720df64311d8fefb80 (diff) |
more interface changes
Diffstat (limited to 'extern/softbody/src/admmpd_types.h')
-rw-r--r-- | extern/softbody/src/admmpd_types.h | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/extern/softbody/src/admmpd_types.h b/extern/softbody/src/admmpd_types.h index 48f3121f721..925072b282f 100644 --- a/extern/softbody/src/admmpd_types.h +++ b/extern/softbody/src/admmpd_types.h @@ -36,9 +36,23 @@ struct Options { {} }; -struct Data { +struct TetMesh { + Eigen::MatrixXd x_rest; // verts at rest + Eigen::MatrixXi faces; // surface elements, m x 3 + Eigen::MatrixXi tets; // internal elements, m x 4 +}; // type 0 + +struct EmbeddedMeshData { // i.e. the lattice + Eigen::MatrixXd x_rest; // embedded verts at rest + Eigen::MatrixXi faces; // embedded faces + Eigen::MatrixXi tets; // lattice elements, m x 4 + Eigen::VectorXi vtx_to_tet; // what tet vtx is embedded in, p x 1 + Eigen::MatrixXd barys; // barycoords of the embedding, p x 4 +}; // type 1 + +struct SolverData { // Set from input - Eigen::MatrixXi tets; // elements t x 4 + Eigen::MatrixXi tets; // elements t x 4, copy from mesh Eigen::MatrixXd x; // vertices, n x 3 Eigen::MatrixXd v; // velocity, n x 3 // Set in compute_matrices: @@ -71,14 +85,6 @@ struct Data { std::vector<double> weights; // per-energy weights }; -struct EmbeddedMeshData { // i.e. the lattice - Eigen::MatrixXd x_rest; // embedded verts at rest - Eigen::MatrixXi faces; // embedded faces - Eigen::MatrixXi tets; // lattice elements, m x 4 - Eigen::VectorXi vtx_to_tet; // what tet vtx is embedded in, p x 1 - Eigen::MatrixXd barys; // barycoords of the embedding, p x 4 -}; - } // namespace admmpd #endif // ADMMPD_TYPES_H_ |