From ef4961a319af82cc72261ef65a8237df7289ec11 Mon Sep 17 00:00:00 2001 From: "DALAB\\sjtud" <sjtudalab@163.com> Date: Fri, 24 Feb 2023 14:01:27 +0800 Subject: [PATCH] Adjust the order --- {4-1_spinning => 3-1_spinning}/CMakeLists.txt | 2 +- {4-1_spinning => 3-1_spinning}/SpinSim.cpp | 0 {4-1_spinning => 3-1_spinning}/SpinSim.h | 0 {4-1_spinning => 3-1_spinning}/main.cpp | 0 .../CMakeLists.txt | 2 +- .../CollisionDetection.cpp | 0 .../CollisionDetection.h | 0 .../CollisionSim.h | 0 {4-2_collision => 3-2_collision}/main.cpp | 0 {3_cloth => 4_cloth}/CMakeLists.txt | 2 +- {3_cloth => 4_cloth}/ClothSim.cpp | 0 {3_cloth => 4_cloth}/ClothSim.h | 0 {3_cloth => 4_cloth}/main.cpp | 0 CMakeLists.txt | 18 +++++++++--------- 14 files changed, 12 insertions(+), 12 deletions(-) rename {4-1_spinning => 3-1_spinning}/CMakeLists.txt (98%) rename {4-1_spinning => 3-1_spinning}/SpinSim.cpp (100%) rename {4-1_spinning => 3-1_spinning}/SpinSim.h (100%) rename {4-1_spinning => 3-1_spinning}/main.cpp (100%) rename {4-2_collision => 3-2_collision}/CMakeLists.txt (98%) rename {4-2_collision => 3-2_collision}/CollisionDetection.cpp (100%) rename {4-2_collision => 3-2_collision}/CollisionDetection.h (100%) rename {4-2_collision => 3-2_collision}/CollisionSim.h (100%) rename {4-2_collision => 3-2_collision}/main.cpp (100%) rename {3_cloth => 4_cloth}/CMakeLists.txt (99%) rename {3_cloth => 4_cloth}/ClothSim.cpp (100%) rename {3_cloth => 4_cloth}/ClothSim.h (100%) rename {3_cloth => 4_cloth}/main.cpp (100%) diff --git a/4-1_spinning/CMakeLists.txt b/3-1_spinning/CMakeLists.txt similarity index 98% rename from 4-1_spinning/CMakeLists.txt rename to 3-1_spinning/CMakeLists.txt index fca18b9..d790111 100644 --- a/4-1_spinning/CMakeLists.txt +++ b/3-1_spinning/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.1) -project(4-1_spinning) +project(3-1_spinning) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) set(CMAKE_CXX_FLAGS "-Wall") diff --git a/4-1_spinning/SpinSim.cpp b/3-1_spinning/SpinSim.cpp similarity index 100% rename from 4-1_spinning/SpinSim.cpp rename to 3-1_spinning/SpinSim.cpp diff --git a/4-1_spinning/SpinSim.h b/3-1_spinning/SpinSim.h similarity index 100% rename from 4-1_spinning/SpinSim.h rename to 3-1_spinning/SpinSim.h diff --git a/4-1_spinning/main.cpp b/3-1_spinning/main.cpp similarity index 100% rename from 4-1_spinning/main.cpp rename to 3-1_spinning/main.cpp diff --git a/4-2_collision/CMakeLists.txt b/3-2_collision/CMakeLists.txt similarity index 98% rename from 4-2_collision/CMakeLists.txt rename to 3-2_collision/CMakeLists.txt index f4bc44c..17dc082 100644 --- a/4-2_collision/CMakeLists.txt +++ b/3-2_collision/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.1) -project(4-2_collision) +project(3-2_collision) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) set(CMAKE_CXX_FLAGS "-Wall") diff --git a/4-2_collision/CollisionDetection.cpp b/3-2_collision/CollisionDetection.cpp similarity index 100% rename from 4-2_collision/CollisionDetection.cpp rename to 3-2_collision/CollisionDetection.cpp diff --git a/4-2_collision/CollisionDetection.h b/3-2_collision/CollisionDetection.h similarity index 100% rename from 4-2_collision/CollisionDetection.h rename to 3-2_collision/CollisionDetection.h diff --git a/4-2_collision/CollisionSim.h b/3-2_collision/CollisionSim.h similarity index 100% rename from 4-2_collision/CollisionSim.h rename to 3-2_collision/CollisionSim.h diff --git a/4-2_collision/main.cpp b/3-2_collision/main.cpp similarity index 100% rename from 4-2_collision/main.cpp rename to 3-2_collision/main.cpp diff --git a/3_cloth/CMakeLists.txt b/4_cloth/CMakeLists.txt similarity index 99% rename from 3_cloth/CMakeLists.txt rename to 4_cloth/CMakeLists.txt index d1a557c..e05fd0c 100644 --- a/3_cloth/CMakeLists.txt +++ b/4_cloth/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.1) -project(3_cloth) +project(4_cloth) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) set(CMAKE_CXX_FLAGS "-Wall") diff --git a/3_cloth/ClothSim.cpp b/4_cloth/ClothSim.cpp similarity index 100% rename from 3_cloth/ClothSim.cpp rename to 4_cloth/ClothSim.cpp diff --git a/3_cloth/ClothSim.h b/4_cloth/ClothSim.h similarity index 100% rename from 3_cloth/ClothSim.h rename to 4_cloth/ClothSim.h diff --git a/3_cloth/main.cpp b/4_cloth/main.cpp similarity index 100% rename from 3_cloth/main.cpp rename to 4_cloth/main.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 1743953..de35e18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,13 +27,13 @@ if (NOT LIBIGL_FOUND) find_package(LIBIGL REQUIRED QUIET) endif() -# add_subdirectory(0_dummy) -# add_subdirectory(1-0_earth) -# add_subdirectory(1-1_cannonball) -# add_subdirectory(1-2_spring) -# add_subdirectory(2-1_bead) -# add_subdirectory(2-2_pendulum) -# add_subdirectory(3_cloth) -# add_subdirectory(4-1_spinning) -# add_subdirectory(4-2_collision) +add_subdirectory(0_dummy) +add_subdirectory(1-0_earth) +add_subdirectory(1-1_cannonball) +add_subdirectory(1-2_spring) +add_subdirectory(2-1_bead) +add_subdirectory(2-2_pendulum) +add_subdirectory(3-1_spinning) +add_subdirectory(3-2_collision) +add_subdirectory(4_cloth) add_subdirectory(5_fluid) \ No newline at end of file -- GitLab