Removed copy header

Author: zfergus

CMakeLists.txt

@@ -51,8 +51,6 @@ if(TIGHT_INCLUSION_TOPLEVEL_PROJECT)
 endif()
 
 ### Configuration
-set(TIGHT_INCLUSION_SOURCE_DIR "${PROJECT_SOURCE_DIR}/src")
-
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/tight_inclusion/")
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/recipes/")
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/find/")
@@ -68,10 +66,10 @@ include(tight_inclusion_utils)
 add_library(tight_inclusion)
 add_library(tight_inclusion::tight_inclusion ALIAS tight_inclusion)
 
-add_subdirectory(tight_inclusion)
+add_subdirectory(src/tight_inclusion)
 
 # Public include directory for Tight Inclusion
-target_include_directories(tight_inclusion PUBLIC ${PROJECT_BINARY_DIR}/include)
+target_include_directories(tight_inclusion PUBLIC src)
 
 ################################################################################
 # Optional Definitions

cmake/tight_inclusion/tight_inclusion_utils.cmake

@@ -1,13 +1,3 @@
-# Copy header files into the build directory
-function(tight_inclusion_copy_headers)
-  foreach(filepath IN ITEMS ${ARGN})
-    file(RELATIVE_PATH filename "${TIGHT_INCLUSION_SOURCE_DIR}" "${filepath}")
-    if(${filename} MATCHES ".*\.(hpp|h|ipp|tpp)$")
-      configure_file(${filepath} ${PROJECT_BINARY_DIR}/include/tight_inclusion/${filename})
-    endif()
-  endforeach()
-endfunction()
-
 function(tight_inclusion_prepend_current_path SOURCE_FILES)
   # Use recursive substitution to expand SOURCE_FILES
   unset(MODIFIED)

tight_inclusion/CMakeLists.txt renamed to src/tight_inclusion/CMakeLists.txt

@@ -12,7 +12,6 @@ set(SOURCES
 )
 
 tight_inclusion_prepend_current_path(SOURCES)
-tight_inclusion_copy_headers(${SOURCES})
 tight_inclusion_set_source_group(${SOURCES})
 target_sources(tight_inclusion PRIVATE ${SOURCES})
 

tight_inclusion/avx.cpp renamed to src/tight_inclusion/avx.cpp

@@ -376,9 +376,7 @@ namespace ticcd {
         // current intervals
         Interval3 current;
         int refine = 0;
-        Scalar impact_ratio;
-
-        impact_ratio = 1;
+        Scalar impact_ratio = 1;
 
         toi = std::numeric_limits<Scalar>::infinity(); //set toi as infinate
         // temp_toi is to catch the toi of each level
@@ -429,10 +427,7 @@ namespace ticcd {
             {
                 TIGHT_INCLUSION_SCOPED_TIMER(time_predicates);
                 // #ifdef TIGHT_INCLUSION_USE_GMP // this is defined in the begining of this file
-                // Array3 ms_3d;
-                // ms_3d[0] = ms;
-                // ms_3d[1] = ms;
-                // ms_3d[2] = ms;
+                // Array3 ms_3d = Array3::Constant(ms);
                 // zero_in = origin_in_function_bounding_box_rational_return_tolerance<
                 //     check_vf>(
                 //     current, a0s, a1s, b0s, b1s, a0e, a1e, b0e, b1e, ms_3d, box_in,
@@ -568,9 +563,14 @@ namespace ticcd {
         Scalar &toi,
         Scalar &output_tolerance)
     {
-        //build interval set [0,1]x[0,1]x[0,1]
+        // build interval set [0,t_max]x[0,1]x[0,1]
         const Interval zero_to_one = Interval(NumCCD(0, 0), NumCCD(1, 0));
-        Interval3 iset = {{zero_to_one, zero_to_one, zero_to_one}};
+        Interval3 iset = {{
+            // Interval(NumCCD(0, 0), NumCCD(max_time)),
+            zero_to_one,
+            zero_to_one,
+            zero_to_one,
+        }};
 
         return interval_root_finder_BFS<check_vf>(
             a0s, a1s, b0s, b1s, a0e, a1e, b0e, b1e, iset, tol,