diff options
author | over0219 <over0219@umn.edu> | 2020-06-22 22:26:23 +0300 |
---|---|---|
committer | over0219 <over0219@umn.edu> | 2020-06-22 22:26:23 +0300 |
commit | c214acce20b6066dd8b0f70dfa16a597059358a6 (patch) | |
tree | 34a48d8e1ad91a9be0b80e0b80f2c263528ac4c3 /extern/softbody | |
parent | 688643c9fdf19802fe7c3bb4e6b53754fa9e7cca (diff) |
fixed issue with rand causing mem error
Diffstat (limited to 'extern/softbody')
-rw-r--r-- | extern/softbody/src/admmpd_lattice.cpp | 36 | ||||
-rw-r--r-- | extern/softbody/src/admmpd_solver.cpp | 23 | ||||
-rw-r--r-- | extern/softbody/src/admmpd_solver.h | 10 |
3 files changed, 49 insertions, 20 deletions
diff --git a/extern/softbody/src/admmpd_lattice.cpp b/extern/softbody/src/admmpd_lattice.cpp index 84b65260ded..d97ab9c7bc8 100644 --- a/extern/softbody/src/admmpd_lattice.cpp +++ b/extern/softbody/src/admmpd_lattice.cpp @@ -9,12 +9,13 @@ #include <unordered_map> #include <set> #include "BLI_task.h" // threading +#include "BLI_assert.h" namespace admmpd { using namespace Eigen; typedef struct KeepTetThreadData { - AABBTree<double,3> *tree; // of embedded faces + const AABBTree<double,3> *tree; // of embedded faces const MatrixXd *pts; // of embedded verts const MatrixXi *faces; // embedded faces const std::vector<Vector3d> *tet_x; @@ -39,13 +40,22 @@ static void parallel_keep_tet( // Returns true if the tet intersects the // surface mesh. Even if it doesn't, we want to keep // the tet if it's totally enclosed in the mesh. - TetIntersectsMeshTraverse<double> traverser( + TetIntersectsMeshTraverse<double> tet_hits_mesh( tet_pts, td->pts, td->faces); - bool hit = td->tree->traverse(traverser); + bool hit = td->tree->traverse(tet_hits_mesh); if (!hit) { - if (traverser.output.ray_hit_count % 2 == 1) + // We only need to check if one vertex of the + // tet is inside the mesh. If a subset of + // vertices are inside the mesh, then there would + // be tri/tri intersection. + PointInTriangleMeshTraverse<double> pt_in_mesh( + tet_pts[0], td->pts, td->faces); + td->tree->traverse(pt_in_mesh); + if (pt_in_mesh.output.num_hits() % 2 == 1) + { hit = true; + } } if (hit) { td->keep_tet->at(i) = 1; } @@ -181,23 +191,28 @@ bool Lattice::generate( bool keep = keep_tet[tet_idx]; if (keep) { - refd_verts.emplace((*it)[0]); - refd_verts.emplace((*it)[1]); - refd_verts.emplace((*it)[2]); - refd_verts.emplace((*it)[3]); + const Vector4i &t = *it; + refd_verts.emplace(t[0]); + refd_verts.emplace(t[1]); + refd_verts.emplace(t[2]); + refd_verts.emplace(t[3]); ++it; } else { it = tets.erase(it); } } + printf("Lattice: removed %d tets\n", tet_idx-(int)tets.size()); + } // end remove unnecessary tets // Copy data into matrices and remove unreferenced { // Computing a mapping of vertices from old to new + // Delete any unreferenced vertices std::unordered_map<int,int> vtx_old_to_new; int ntv0 = verts.size(); // original num verts int ntv1 = refd_verts.size(); // reduced num verts + BLI_assert(ntv1 <= ntv0); X->resize(ntv1,3); int vtx_count = 0; for (int i=0; i<ntv0; ++i) @@ -247,7 +262,7 @@ static void parallel_point_in_tet( { FindTetThreadData *td = (FindTetThreadData*)userdata; Vector3d pt = td->pts->row(i); - PointInTetTraverse<double> traverser(pt, td->tet_x, td->tets); + PointInTetMeshTraverse<double> traverser(pt, td->tet_x, td->tets); bool success = td->tree->traverse(traverser); int tet_idx = traverser.output.prim; if (success && tet_idx >= 0) @@ -288,6 +303,7 @@ bool Lattice::compute_vtx_tet_mapping( // barycoords for each embedded vertex std::vector<AlignedBox<double,3> > tet_aabbs; tet_aabbs.resize(nt); + Vector3d veta = Vector3d::Ones()*1e-12; for (int i=0; i<nt; ++i) { tet_aabbs[i].setEmpty(); @@ -296,6 +312,8 @@ bool Lattice::compute_vtx_tet_mapping( { tet_aabbs[i].extend(x_->row(tet[j]).transpose()); } + tet_aabbs[i].extend(tet_aabbs[i].min()-veta); + tet_aabbs[i].extend(tet_aabbs[i].max()+veta); } AABBTree<double,3> tree; diff --git a/extern/softbody/src/admmpd_solver.cpp b/extern/softbody/src/admmpd_solver.cpp index 706eb9dce11..03680425427 100644 --- a/extern/softbody/src/admmpd_solver.cpp +++ b/extern/softbody/src/admmpd_solver.cpp @@ -11,6 +11,7 @@ #include <stdio.h> #include <iostream> +#include <unordered_map> #include "BLI_task.h" // threading #include "BLI_assert.h" @@ -163,12 +164,12 @@ void Solver::update_constraints( std::vector<Eigen::Triplet<double> > trips_z; // TODO collision detection - FloorCollider().jacobian( - &data->x, - &trips_x, - &trips_y, - &trips_z, - &l_coeffs); +// FloorCollider().jacobian( +// &data->x, +// &trips_x, +// &trips_y, +// &trips_z, +// &l_coeffs); // Check number of constraints. // If no constraints, clear Jacobian. @@ -418,6 +419,16 @@ void Solver::compute_masses( data->m[tet[2]] += tet_mass / 4.f; data->m[tet[3]] += tet_mass / 4.f; } + // Verify masses + int nx = data->m.rows(); + for (int i=0; i<nx; ++i) + { + if (data->m[i] <= 0.0) + { + printf("**Solver::compute_masses Error: unreferenced vertex\n"); + data->m[i]=1; + } + } } // end compute masses void Solver::append_energies( diff --git a/extern/softbody/src/admmpd_solver.h b/extern/softbody/src/admmpd_solver.h index b10105eba84..e61ddfeb82e 100644 --- a/extern/softbody/src/admmpd_solver.h +++ b/extern/softbody/src/admmpd_solver.h @@ -12,23 +12,23 @@ namespace admmpd { struct Options { - double timestep_s; + double timestep_s; // TODO: Figure out delta time from blender api int max_admm_iters; int max_cg_iters; double mult_k; // stiffness multiplier for constraints double min_res; // min residual for CG solver double density_kgm3; // unit-volume density - double youngs; // Young's modulus - double poisson; // Poisson ratio + double youngs; // Young's modulus // TODO variable per-tet + double poisson; // Poisson ratio // TODO variable per-tet Eigen::Vector3d grav; Options() : - timestep_s(1.0/100.0), // TODO: Figure out delta time from blender api + timestep_s(1.0/100.0), max_admm_iters(20), max_cg_iters(10), mult_k(1.0), min_res(1e-4), density_kgm3(1100), - youngs(10000000), + youngs(100000000), poisson(0.399), grav(0,0,-9.8) {} |