Skip to content

Commit

Permalink
Disabling fairing algorithms for psalm_cli
Browse files Browse the repository at this point in the history
This is not the optimal treatment of this issue, but I am not sure how
to handle this otherwise for now---I am thinking about removing the
fairing algorithms completely...
  • Loading branch information
Pseudomanifold committed Sep 19, 2016
1 parent 427a335 commit 241fb73
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 4 deletions.
15 changes: 12 additions & 3 deletions FairingAlgorithms/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
SET( FAIRING_ALGORITHMS_SRC
FairingAlgorithm.cpp
CurvatureFlow.cpp
FairingAlgorithm.cpp
)

IF( EXISTS ${Boost_INCLUDE_DIRS}/boost/numeric/bindings/traits/ublas_sparse.hpp)
LIST( APPEND FAIRING_ALGORITHMS_SRC
CurvatureFlow.cpp
)
ENDIF()

ADD_LIBRARY(FairingAlgorithms SHARED ${FAIRING_ALGORITHMS_SRC})
TARGET_LINK_LIBRARIES(FairingAlgorithms umfpack)

# FIXME: This is not optimal
IF( EXISTS ${Boost_INCLUDE_DIRS}/boost/numeric/bindings/traits/ublas_sparse.hpp)
TARGET_LINK_LIBRARIES(FairingAlgorithms umfpack)
ENDIF()

# FIXME: Include path should be set by other means
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR} ../external /usr/include/suitesparse)
12 changes: 11 additions & 1 deletion psalm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,12 @@
#include "SubdivisionAlgorithms/Loop.h"
#include "SubdivisionAlgorithms/Liepa.h"

#include "FairingAlgorithms/CurvatureFlow.h"
#include "FairingAlgorithms/FairingAlgorithm.h"

// FIXME: This should be conditional
#if 0
#include "FairingAlgorithms/CurvatureFlow.h"
#endif

#include "mesh.h"

Expand Down Expand Up @@ -311,7 +316,12 @@ int main(int argc, char* argv[])
// As there is currently only _one_ fairing algorithm, there is really
// not much choice here
if(vm.count("fair"))
{
// FIXME: Should be conditionally disabled...
#if 0
fairing_algorithm = new psalm::CurvatureFlow();
#endif
}

// We use this instance to create an instance of a subdivision
// algorithm class. Further class parameters are set _afterwards_,
Expand Down

0 comments on commit 241fb73

Please sign in to comment.