Skip to content
Open
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
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
cmake_minimum_required(VERSION 3.25)
project(PennerOptimization)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

add_compile_options(-fPIC)
Expand Down Expand Up @@ -106,6 +105,8 @@ add_library(DirectionalLib INTERFACE)
target_include_directories(DirectionalLib SYSTEM INTERFACE
${directional_SOURCE_DIR}/include
)
target_compile_features(DirectionalLib INTERFACE cxx_std_20)


# Optionally create rendering library
if(RENDER_TEXTURE)
Expand Down
2 changes: 2 additions & 0 deletions cmake/conformal_ideal_delaunay.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ FetchContent_Declare(
GIT_TAG penner_optimization
)
FetchContent_MakeAvailable(conformal_ideal_delaunay)
target_compile_features(conformal_cpp PRIVATE cxx_std_20)

1 change: 1 addition & 0 deletions cmake/directional.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ FetchContent_Declare(
directional
SYSTEM
GIT_REPOSITORY https://github.com/avaxman/Directional.git
GIT_TAG v2.0.0
)
FetchContent_MakeAvailable(directional)

2 changes: 1 addition & 1 deletion cmake/libigl.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ include(FetchContent)
GIT_REPOSITORY https://github.com/libigl/libigl.git
GIT_TAG v2.4.0
)
FetchContent_MakeAvailable(libigl)
FetchContent_MakeAvailable(libigl)
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ if(FALSE)
set_target_properties(penner PROPERTIES PREFIX
"${PYTHON_MODULE_PREFIX}"
)
endif()
endif()
2 changes: 1 addition & 1 deletion src/holonomy/field/facet_field.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ else {
is >> id[0] >> id[1] >> id[2] >> m[0] >> m[1] >> m[2];
if (load_sharp) is >> sh[0] >> sh[1] >> sh[2];
if (!fin || !is) {
spdlog::error("{} facet {}: unable to read matchings. File partially loaded.", fname);
spdlog::error("{} facet {}: unable to read matchings. File partially loaded.", fname, i);
return empty_output;
}

Expand Down
2 changes: 1 addition & 1 deletion src/holonomy/field/intrinsic_field.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1931,7 +1931,7 @@ void IntrinsicNRosyField::fix_cone_pair(const Mesh<Scalar>& m)
if (cones[vi] < 4) pos_cone = vi;
}
int size = (4 - cones[pos_cone]);
spdlog::info("Fixing cone pair at {} and {} of size {}", pos_cone, neg_cone);
spdlog::info("Fixing cone pair at {} and {} of size {}", pos_cone, neg_cone, size);

// move curvature
move_cone(m, pos_cone, neg_cone, size);
Expand Down
6 changes: 3 additions & 3 deletions src/optimization/parameterization/layout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ Scalar triangle_area(
int hij)
{
int hjk = m.n[hij];
int hli = prev_halfedge(m, hij);
int hli = prev_halfedge(dynamic_cast<const OverlayMesh<Scalar>&>(m), hij);
Eigen::Vector2d A = {u[hli], v[hli]};
Eigen::Vector2d B = {u[hij], v[hij]};
Eigen::Vector2d C = {u[hjk], v[hjk]};
Expand Down Expand Up @@ -278,8 +278,8 @@ Scalar compute_uv_length_error(
int hji = m.opp[hij];

// get other halfedges in the face for vertex computation
int hki = prev_halfedge(m, hij);
int hlj = prev_halfedge(m, hji);
int hki = prev_halfedge(dynamic_cast<const OverlayMesh<Scalar>&>(m), hij);
int hlj = prev_halfedge(dynamic_cast<const OverlayMesh<Scalar>&>(m), hji);

// get uv vertices on the edge
Eigen::Vector2d uv0i = {u[hki], v[hki]};
Expand Down
1 change: 1 addition & 0 deletions src/util/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ target_link_libraries(PennerUtilLib PUBLIC
${SUITESPARSE_LIBS}
${POLYSCOPE_LIBRARIES}
)
target_compile_features(PennerUtilLib PUBLIC cxx_std_17)

target_compile_definitions(PennerUtilLib PUBLIC
SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_DEBUG
Expand Down