Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/wmtk_data.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ExternalProject_Add(
SOURCE_DIR ${WMTK_DATA_ROOT}

GIT_REPOSITORY https://github.com/wildmeshing/data2.git
GIT_TAG 36bb3968aa1e685d3da2e38b87bc6fa5ab328a13
GIT_TAG fc5576bb4d6444776911f16b8b4bdde94c5c9b1a

CONFIGURE_COMMAND ""
BUILD_COMMAND ""
Expand Down
1 change: 1 addition & 0 deletions components/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ add_subdirectory("shortest_edge_collapse/wmtk/components/shortest_edge_collapse"
add_subdirectory("isotropic_remeshing/wmtk/components/isotropic_remeshing")
add_subdirectory("qslim/wmtk/components/qslim")
add_subdirectory("tetwild/wmtk/components/tetwild")
add_subdirectory("triwild/wmtk/components/triwild")
add_subdirectory("simplicial_embedding/wmtk/components/simplicial_embedding")
add_subdirectory("image_simulation/wmtk/components/image_simulation")
add_subdirectory("c1_simplification/wmtk/components/c1_simplification")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1259,7 +1259,7 @@ bool EmbedSurface::embed_surface_tetgen()

m_V_emb_r.resizeLike(m_V_emb);
for (int i = 0; i < m_V_emb.rows(); ++i) {
m_V_emb_r.row(i) = to_rational(m_V_emb.row(i));
m_V_emb_r.row(i) = to_rational(Vector3d(m_V_emb.row(i)));
}

// add tags
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1273,7 +1273,6 @@ bool ImageSimulationMeshTri::collapse_edge_before(const Tuple& loc)
}

bool ImageSimulationMeshTri::collapse_edge_after(const Tuple& loc)

{
auto& VA = m_vertex_attribute;
auto& cache = collapse_cache.local();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ void ImageSimulationMesh::init_from_image(

for (int i = 0; i < vert_capacity(); i++) {
m_vertex_attribute[i].m_pos = V.row(i);
m_vertex_attribute[i].m_posf = to_double(V.row(i));
m_vertex_attribute[i].m_posf = to_double(m_vertex_attribute[i].m_pos);
}

// sanity check
Expand Down Expand Up @@ -704,8 +704,8 @@ void ImageSimulationMesh::init_from_image(
m_face_attribute.m_attributes.resize(T.rows() * 4);

for (int i = 0; i < vert_capacity(); i++) {
m_vertex_attribute[i].m_pos = to_rational(V.row(i));
m_vertex_attribute[i].m_posf = V.row(i);
m_vertex_attribute[i].m_pos = to_rational(m_vertex_attribute[i].m_posf);
m_vertex_attribute[i].m_is_rounded = true;
}

Expand Down
45 changes: 45 additions & 0 deletions components/triwild/wmtk/components/triwild/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# triwild

set(COMPONENT_NAME triwild)
add_component(${COMPONENT_NAME})

if(NOT ${WMTK_ENABLE_COMPONENT_${COMPONENT_NAME}})
return()
endif()

set(SRC_FILES
TriWildMesh.cpp
TriWildMesh.h

Parameters.h

EdgeSplitting.cpp
EdgeCollapsing.cpp
EdgeSwapping.cpp
Smooth.cpp

triwild.hpp
triwild.cpp
triwild_spec.hpp

init_from_delaunay.hpp
init_from_delaunay.cpp
)

target_sources(wmtk_${COMPONENT_NAME} PRIVATE ${SRC_FILES})

target_link_libraries(wmtk_${COMPONENT_NAME} PUBLIC
wmtk::toolkit
wmtk::data
igl::predicates
jse::jse
)

######################
## TESTS
######################

# if(${WMTK_COMPONENT_TESTS})
# add_subdirectory(tests)
# endif()

Loading
Loading