Revert "Revert "Marching Tetrahedra (#716)" (#924)" (#925)

This reverts commit 65aa93e9ef [formerly 47634615ce].

Former-commit-id: fd8d66156c
This commit is contained in:
Alec Jacobson
2018-10-14 19:17:01 -04:00
committed by GitHub
parent 65aa93e9ef
commit 1fe4eb190f
17 changed files with 462 additions and 467 deletions
+1 -1
View File
@@ -1275,7 +1275,7 @@ const char *__doc_igl_slice_mask = R"igl_Qu8mg5v7(// Act like the matlab X(row_m
// Y #trues-in-R by #trues-in-C matrix
//
// See also: slice_mask)igl_Qu8mg5v7";
const char *__doc_igl_slice_tets = R"igl_Qu8mg5v7(// SLICE_TETS Slice through a tet mesh (V,T) along a given plane (via its
const char *__doc_igl_marching_tets = R"igl_Qu8mg5v7(// SLICE_TETS Slice through a tet mesh (V,T) along a given plane (via its
// implicit equation).
//
// Inputs:
+2 -2
View File
@@ -108,7 +108,7 @@ extern const char *__doc_igl_signed_distance_winding_number;
extern const char *__doc_igl_slice;
extern const char *__doc_igl_slice_into;
extern const char *__doc_igl_slice_mask;
extern const char *__doc_igl_slice_tets;
extern const char *__doc_igl_marching_tets;
extern const char *__doc_igl_sortrows;
extern const char *__doc_igl_streamlines_init;
extern const char *__doc_igl_streamlines_next;
@@ -127,4 +127,4 @@ extern const char *__doc_igl_winding_number_2;
extern const char *__doc_igl_writeMESH;
extern const char *__doc_igl_writeOBJ;
extern const char *__doc_igl_writePLY;
extern const char *__doc_igl_readPLY;
extern const char *__doc_igl_readPLY;
+2 -2
View File
@@ -92,7 +92,7 @@
#include <igl/slice.h>
#include <igl/slice_into.h>
#include <igl/slice_mask.h>
#include <igl/slice_tets.h>
#include <igl/marching_tets.h>
#include <igl/sortrows.h>
#include <igl/triangle_triangle_adjacency.h>
#include <igl/unique.h>
@@ -191,7 +191,7 @@ void python_export_igl(py::module &m)
#include "py_igl/py_slice.cpp"
#include "py_igl/py_slice_into.cpp"
#include "py_igl/py_slice_mask.cpp"
#include "py_igl/py_slice_tets.cpp"
#include "py_igl/py_marching_tets.cpp"
#include "py_igl/py_sortrows.cpp"
#include "py_igl/py_triangle_triangle_adjacency.cpp"
#include "py_igl/py_unique.cpp"
@@ -5,7 +5,7 @@
// This Source Code Form is subject to the terms of the Mozilla Public License
// v. 2.0. If a copy of the MPL was not distributed with this file, You can
// obtain one at http://mozilla.org/MPL/2.0/.
m.def("slice_tets", []
m.def("marching_tets", []
(
const Eigen::MatrixXd& V,
const Eigen::MatrixXi& T,
@@ -21,8 +21,8 @@ m.def("slice_tets", []
if (plane.size() != 0)
planev = plane;
Eigen::VectorXi Jv;
igl::slice_tets(V, T, planev, U, G, Jv, BC);
igl::marching_tets(V, T, planev, U, G, Jv, BC);
J = Jv;
}, __doc_igl_slice_tets,
}, __doc_igl_marching_tets,
py::arg("V"), py::arg("T"), py::arg("plane"), py::arg("U"), py::arg("G"), py::arg("J"), py::arg("BC"));
+1 -1
View File
@@ -147,7 +147,7 @@ PYBIND11_PLUGIN(pyigl) {
slice
slice_into
slice_mask
slice_tets
marching_tets
sortrows
streamlines
triangle_triangle_adjacency
+1 -1
View File
@@ -35,7 +35,7 @@ def update(viewer):
F_vis = igl.eigen.MatrixXi()
J = igl.eigen.MatrixXi()
bary = igl.eigen.SparseMatrixd()
igl.slice_tets(V, T, plane, V_vis, F_vis, J, bary)
igl.marching_tets(V, T, plane, V_vis, F_vis, J, bary)
W_vis = igl.eigen.MatrixXd()
igl.slice(W, J, W_vis)
C_vis = igl.eigen.MatrixXd()
+1 -1
View File
@@ -55,7 +55,7 @@ def update_visualization(viewer):
# Extract triangle mesh slice through volume mesh and subdivide nasty triangles
J = igl.eigen.MatrixXi()
bary = igl.eigen.SparseMatrixd()
igl.slice_tets(V, T, plane, V_vis, F_vis, J, bary)
igl.marching_tets(V, T, plane, V_vis, F_vis, J, bary)
max_l = 0.03
while True:
l = igl.eigen.MatrixXd()