Commit 20d01aed authored by Nghia Truong's avatar Nghia Truong
Browse files

Merge remote-tracking branch 'origin/ParallelCollisionDetectionAndHandling'...

Merge remote-tracking branch 'origin/ParallelCollisionDetectionAndHandling' into ParallelPBDConstraintProjection
parents 352051e7 daa8aab7
......@@ -4,7 +4,7 @@ project(iMSTK VERSION 0.0.1 LANGUAGES C CXX)
if(UNIX AND NOT APPLE)
set(LINUX TRUE)
endif()
#-----------------------------------------------------------------------------
# CTest/Dashboards
#-----------------------------------------------------------------------------
......@@ -18,7 +18,7 @@ set(CMAKE_MODULE_PATH
${CMAKE_CURRENT_SOURCE_DIR}/CMake/Utilities
${CMAKE_MODULE_PATH}
)
set(${PROJECT_NAME}_CMAKE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/CMake)
set(${PROJECT_NAME}_CMAKE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/CMake)
#-----------------------------------------------------------------------------
# Set a default build type if none was specified
......@@ -106,7 +106,7 @@ if(${PROJECT_NAME}_SUPERBUILD)
imstk_define_dependency(glm)
if(${PROJECT_NAME}_USE_Vulkan)
imstk_define_dependency(glfw)
imstk_define_dependency(glfw)
imstk_define_dependency(gli)
endif()
......@@ -135,10 +135,10 @@ if(${PROJECT_NAME}_SUPERBUILD)
if(APPLE OR LINUX)
message("Warning: Building iMSTK WITHOUT audio support!")
set(${PROJECT_NAME}_AUDIO_ENABLED OFF)
set(${PROJECT_NAME}_AUDIO_ENABLED OFF)
else()
set(${PROJECT_NAME}_AUDIO_ENABLED "Windows OS detected: Building iMSTK with AUDIO support." ON)
imstk_define_dependency(SFML)
set(${PROJECT_NAME}_AUDIO_ENABLED "Windows OS detected: Building iMSTK with AUDIO support." ON)
imstk_define_dependency(SFML)
endif()
option(${PROJECT_NAME}_USE_ODE "Build iMSTK with ODE support." OFF)
......@@ -190,9 +190,9 @@ endif()
find_program(Uncrustify_EXECUTABLE uncrustify)
include(SetupUncrustifyConfig)
if(Uncrustify_EXECUTABLE)
include(imstkAddUncrustifyCustomTarget)
include(imstkAddUncrustifyCustomTarget)
else(Uncrustify_EXECUTABLE)
message(WARNING "uncrustify not found! Cannot run code-style test.")
message(WARNING "uncrustify not found! Cannot run code-style test.")
endif(Uncrustify_EXECUTABLE)
# Assimp
......@@ -292,6 +292,8 @@ if(BUILD_TESTING)
endif()
# TBB
# Define __TBB_NO_IMPLICIT_LINKAGE so that MSVC will not always look for tbb_debug in debug mode
add_definitions(-D__TBB_NO_IMPLICIT_LINKAGE)
find_package(tbb REQUIRED)
add_definitions(${TBB_DEFINITIONS})
include_directories( ${TBB_INCLUDE_DIRS} )
......
......@@ -36,15 +36,22 @@ class SpinLock
{
public:
///
/// \brief Constructor
/// \brief Default constructor, initializes the atomic_flag member to memory_order_release state
///
SpinLock() = default;
SpinLock()
{
unlock();
}
///
/// \brief Copy constructor, must be implemented as an empty function
/// because the member variable of type std::atomic_flag has copy constructor deleted
/// because the member variable of type std::atomic_flag has copy constructor deleted.
/// In addition, the constructor initializes the atomic_flag member to memory_order_release state
///
SpinLock(const SpinLock&) {}
SpinLock(const SpinLock&)
{
unlock();
}
///
/// \brief Start a thread-safe region, where only one thread can execute at a time until
......
......@@ -30,7 +30,7 @@ using namespace imstk;
#define SPHERE_RADIUS Real(1)
#define SPHERE_CENTER Vec3r(0, 0, 0)
#define PARTICLE_RADIUS Real(0.05)
#define PARTICLE_RADIUS Real(0.08)
#define ITERATIONS 5
#define STEP Real(1.1)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment