various runtime improvements and sor for GS

mattoverby · Feb 7, 2018 · cafa785 · cafa785
1 parent 3d781c0
commit cafa785
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 17,988 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -84,16 +84,7 @@ set( RENDER_LIBS
 #
 ############################################################
 
-add_subdirectory( ${CMAKE_CURRENT_SOURCE_DIR}/samples )
-
 enable_testing()
-
-add_executable(test_lineartet samples/tests/test_lineartet.cpp)
-target_link_libraries(test_lineartet admmelastic)
-add_test(test_lineartet test_lineartet)
-
-add_executable(test_ncmcgs samples/tests/test_ncmcgs.cpp)
-target_link_libraries(test_ncmcgs admmelastic)
-add_test(test_ncmcgs test_ncmcgs)
+add_subdirectory( ${CMAKE_CURRENT_SOURCE_DIR}/samples )
 
 
diff --git a/README.md b/README.md
@@ -22,6 +22,7 @@ Todo:
 - [Stable Neo-Hookean](http://graphics.pixar.com/library/StableElasticity)
 - Slide constraints
 - Bending force
+- 1D reduction matrix with nx3 vars (x and v)
 - Demos from SCA/TVCG papers
 - More unit tests
 

diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
@@ -2,4 +2,4 @@
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/utils)
 add_subdirectory(sca2016)
 add_subdirectory(tvcg2017)
-
+add_subdirectory(tests)
diff --git a/samples/tests/CMakeLists.txt b/samples/tests/CMakeLists.txt
@@ -0,0 +1,4 @@
+
+add_executable(test_lineartet test_lineartet.cpp)
+target_link_libraries(test_lineartet admmelastic)
+add_test(test_lineartet test_lineartet)