build: update cmake

Signed-off-by: Zone.N <[email protected]>
Simple-XX · Oct 31, 2023 · 2c1e3b9 · 2c1e3b9
1 parent 2513e06
commit 2c1e3b9
Show file tree

Hide file tree

Showing 240 changed files with 141 additions and 675 deletions.
diff --git a/cmake/3rd.cmake b/cmake/3rd.cmake
@@ -82,6 +82,8 @@ CPMAddPackage(
 )
 
 # https://github.com/g-truc/glm
+set(gRPC_INSTALL ON CACHE BOOL "")
+set(gRPC_BUILD_TESTS OFF CACHE BOOL "")
 CPMAddPackage(
         NAME glm
         GITHUB_REPOSITORY g-truc/glm

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -4,6 +4,91 @@
 #
 # CMakeLists.txt for Simple-XX/SimplePhysicsEngine.
 
-add_subdirectory(engine)
-add_subdirectory(demo2d)
-add_subdirectory(demo3d)
+add_library(${PROJECT_NAME}-static STATIC
+        dtk/dtk.cpp
+        dtk/dtkAssert.cpp
+        dtk/dtkCollisionDetectBasic.cpp
+        dtk/dtkCollisionDetectHierarchy.cpp
+        dtk/dtkCollisionDetectHierarchyKDOPS.cpp
+        dtk/dtkCollisionDetectNode.cpp
+        dtk/dtkCollisionDetectNodeKDOPS.cpp
+        dtk/dtkCollisionDetectPrimitive.cpp
+        dtk/dtkCollisionDetectStage.cpp
+        # dtk/dtkCollisionDetectStage.cpp.bak
+        dtk/dtkErrorManager.cpp
+        dtk/dtkGraphicsKernel.cpp
+        # dtk/dtkGraphicsKernel.h.bak
+        dtk/dtkIntersectTest.cpp
+        dtk/dtkPhysCore.cpp
+        # dtk/dtkPhysCore.cpp.bak
+        dtk/dtkPhysKnotPlanner.cpp
+        dtk/dtkPhysMassPoint.cpp
+        dtk/dtkPhysMassSpring.cpp
+        # dtk/dtkPhysMassSpring.h.bak
+        dtk/dtkPhysMassSpringCollisionResponse.cpp
+        dtk/dtkPhysMassSpringThread.cpp
+        dtk/dtkPhysMassSpringThreadCollisionResponse.cpp
+        dtk/dtkPhysParticle.cpp
+        dtk/dtkPhysParticleSystem.cpp
+        dtk/dtkPhysSpring.cpp
+        dtk/dtkPhysTetraMassSpring.cpp
+        dtk/dtkPointsReader.cpp
+        dtk/dtkPointsWriter.cpp
+        dtk/dtkScene.cpp
+        dtk/dtkSign.cpp
+        dtk/dtkStaticMeshEliminator.cpp
+        dtk/dtkStaticTetraMesh.cpp
+        dtk/dtkStaticTetraMeshReader.cpp
+        dtk/dtkStaticTetraMeshWriter.cpp
+        dtk/dtkStaticTriangleMesh.cpp
+        dtk/dtkStaticTriangleMeshReader.cpp
+        dtk/dtkStaticTriangleMeshWriter.cpp
+
+        math/dtkMatrixOp.cpp
+        math/dtkMatrixOP.h
+
+        physics/dtkJoint.cpp
+        physics/dtkRigidBody.cpp
+)
+
+target_include_directories(${PROJECT_NAME}-static PRIVATE 
+        $<BUILD_INTERFACE:
+        ${PROJECT_SOURCE_DIR}/src/dtk
+        ${PROJECT_SOURCE_DIR}/src/math
+        ${PROJECT_SOURCE_DIR}/src/physics
+        >
+
+        $<INSTALL_INTERFACE:include/${PROJECT_NAME}-${PROJECT_VERSION}>
+
+)
+
+target_link_libraries(${PROJECT_NAME}-static PRIVATE
+        Boost::headers
+        CGAL
+        glfw
+        glm::glm
+)
+
+# 打包
+# @todo 导出静态库与动态库
+packageProject(
+        # 要导出的 target
+        NAME ${PROJECT_NAME}-static
+        # 版本
+        VERSION ${PROJECT_VERSION}
+        # 生成文件目录
+        BINARY_DIR ${PROJECT_BINARY_DIR}
+        # 头文件路径
+        INCLUDE_DIR ${PROJECT_SOURCE_DIR}/src
+        # 与 target 的 INSTALL_INTERFACE 一致
+        INCLUDE_DESTINATION include/${PROJECT_NAME}-${PROJECT_VERSION}
+        # 头文件过滤
+        INCLUDE_HEADER_PATTERN "*.h"
+        # namespace 名称，不能包含 '::'
+        NAMESPACE ${PROJECT_NAMESPACE}
+        # (optional) option to disable the versioning of install destinations
+        DISABLE_VERSION_SUFFIX YES
+        ARCH_INDEPENDENT YES
+        # 生成 CPack 变量
+        CPACK YES
+)
diff --git a/src/engine/dtk/dtk.cpp → src/dtk/dtk.cpp b/src/engine/dtk/dtk.cpp → src/dtk/dtk.cpp
diff --git a/src/engine/dtk/dtk.h → src/dtk/dtk.h b/src/engine/dtk/dtk.h → src/dtk/dtk.h
diff --git a/src/engine/dtk/dtkArray.h → src/dtk/dtkArray.h b/src/engine/dtk/dtkArray.h → src/dtk/dtkArray.h
diff --git a/src/engine/dtk/dtkAssert.cpp → src/dtk/dtkAssert.cpp b/src/engine/dtk/dtkAssert.cpp → src/dtk/dtkAssert.cpp
diff --git a/src/engine/dtk/dtkAssert.h → src/dtk/dtkAssert.h b/src/engine/dtk/dtkAssert.h → src/dtk/dtkAssert.h
diff --git a/src/engine/dtk/dtkCollisionDetectBasic.cpp → src/dtk/dtkCollisionDetectBasic.cpp b/src/engine/dtk/dtkCollisionDetectBasic.cpp → src/dtk/dtkCollisionDetectBasic.cpp
diff --git a/src/engine/dtk/dtkCollisionDetectBasic.h → src/dtk/dtkCollisionDetectBasic.h b/src/engine/dtk/dtkCollisionDetectBasic.h → src/dtk/dtkCollisionDetectBasic.h
diff --git a/...ngine/dtk/dtkCollisionDetectHierarchy.cpp → src/dtk/dtkCollisionDetectHierarchy.cpp b/...ngine/dtk/dtkCollisionDetectHierarchy.cpp → src/dtk/dtkCollisionDetectHierarchy.cpp
diff --git a/src/engine/dtk/dtkCollisionDetectHierarchy.h → src/dtk/dtkCollisionDetectHierarchy.h b/src/engine/dtk/dtkCollisionDetectHierarchy.h → src/dtk/dtkCollisionDetectHierarchy.h
diff --git a/.../dtk/dtkCollisionDetectHierarchyKDOPS.cpp → src/dtk/dtkCollisionDetectHierarchyKDOPS.cpp b/.../dtk/dtkCollisionDetectHierarchyKDOPS.cpp → src/dtk/dtkCollisionDetectHierarchyKDOPS.cpp
diff --git a/...ne/dtk/dtkCollisionDetectHierarchyKDOPS.h → src/dtk/dtkCollisionDetectHierarchyKDOPS.h b/...ne/dtk/dtkCollisionDetectHierarchyKDOPS.h → src/dtk/dtkCollisionDetectHierarchyKDOPS.h
diff --git a/src/engine/dtk/dtkCollisionDetectNode.cpp → src/dtk/dtkCollisionDetectNode.cpp b/src/engine/dtk/dtkCollisionDetectNode.cpp → src/dtk/dtkCollisionDetectNode.cpp
diff --git a/src/engine/dtk/dtkCollisionDetectNode.h → src/dtk/dtkCollisionDetectNode.h b/src/engine/dtk/dtkCollisionDetectNode.h → src/dtk/dtkCollisionDetectNode.h
diff --git a/...ngine/dtk/dtkCollisionDetectNodeKDOPS.cpp → src/dtk/dtkCollisionDetectNodeKDOPS.cpp b/...ngine/dtk/dtkCollisionDetectNodeKDOPS.cpp → src/dtk/dtkCollisionDetectNodeKDOPS.cpp
diff --git a/src/engine/dtk/dtkCollisionDetectNodeKDOPS.h → src/dtk/dtkCollisionDetectNodeKDOPS.h b/src/engine/dtk/dtkCollisionDetectNodeKDOPS.h → src/dtk/dtkCollisionDetectNodeKDOPS.h
diff --git a/...ngine/dtk/dtkCollisionDetectPrimitive.cpp → src/dtk/dtkCollisionDetectPrimitive.cpp b/...ngine/dtk/dtkCollisionDetectPrimitive.cpp → src/dtk/dtkCollisionDetectPrimitive.cpp
diff --git a/src/engine/dtk/dtkCollisionDetectPrimitive.h → src/dtk/dtkCollisionDetectPrimitive.h b/src/engine/dtk/dtkCollisionDetectPrimitive.h → src/dtk/dtkCollisionDetectPrimitive.h
diff --git a/src/engine/dtk/dtkCollisionDetectStage.cpp → src/dtk/dtkCollisionDetectStage.cpp b/src/engine/dtk/dtkCollisionDetectStage.cpp → src/dtk/dtkCollisionDetectStage.cpp
diff --git a/...ngine/dtk/dtkCollisionDetectStage.cpp.bak → src/dtk/dtkCollisionDetectStage.cpp.bak b/...ngine/dtk/dtkCollisionDetectStage.cpp.bak → src/dtk/dtkCollisionDetectStage.cpp.bak
diff --git a/src/engine/dtk/dtkCollisionDetectStage.h → src/dtk/dtkCollisionDetectStage.h b/src/engine/dtk/dtkCollisionDetectStage.h → src/dtk/dtkCollisionDetectStage.h
diff --git a/src/engine/dtk/dtkConfig.h → src/dtk/dtkConfig.h b/src/engine/dtk/dtkConfig.h → src/dtk/dtkConfig.h
diff --git a/src/engine/dtk/dtkError.h → src/dtk/dtkError.h b/src/engine/dtk/dtkError.h → src/dtk/dtkError.h
diff --git a/src/engine/dtk/dtkErrorManager.cpp → src/dtk/dtkErrorManager.cpp b/src/engine/dtk/dtkErrorManager.cpp → src/dtk/dtkErrorManager.cpp
diff --git a/src/engine/dtk/dtkErrorManager.h → src/dtk/dtkErrorManager.h b/src/engine/dtk/dtkErrorManager.h → src/dtk/dtkErrorManager.h
diff --git a/src/engine/dtk/dtkExports.h → src/dtk/dtkExports.h b/src/engine/dtk/dtkExports.h → src/dtk/dtkExports.h
diff --git a/src/engine/dtk/dtkGraphics.h → src/dtk/dtkGraphics.h b/src/engine/dtk/dtkGraphics.h → src/dtk/dtkGraphics.h
diff --git a/src/engine/dtk/dtkGraphicsKernel.cpp → src/dtk/dtkGraphicsKernel.cpp b/src/engine/dtk/dtkGraphicsKernel.cpp → src/dtk/dtkGraphicsKernel.cpp
diff --git a/src/engine/dtk/dtkGraphicsKernel.h → src/dtk/dtkGraphicsKernel.h b/src/engine/dtk/dtkGraphicsKernel.h → src/dtk/dtkGraphicsKernel.h
diff --git a/src/engine/dtk/dtkGraphicsKernel.h.bak → src/dtk/dtkGraphicsKernel.h.bak b/src/engine/dtk/dtkGraphicsKernel.h.bak → src/dtk/dtkGraphicsKernel.h.bak
diff --git a/src/engine/dtk/dtkGraphicsTools.h → src/dtk/dtkGraphicsTools.h b/src/engine/dtk/dtkGraphicsTools.h → src/dtk/dtkGraphicsTools.h
diff --git a/src/engine/dtk/dtkIDTypes.h → src/dtk/dtkIDTypes.h b/src/engine/dtk/dtkIDTypes.h → src/dtk/dtkIDTypes.h
diff --git a/src/engine/dtk/dtkIO.h → src/dtk/dtkIO.h b/src/engine/dtk/dtkIO.h → src/dtk/dtkIO.h
diff --git a/src/engine/dtk/dtkImports.h → src/dtk/dtkImports.h b/src/engine/dtk/dtkImports.h → src/dtk/dtkImports.h
diff --git a/src/engine/dtk/dtkInit.h → src/dtk/dtkInit.h b/src/engine/dtk/dtkInit.h → src/dtk/dtkInit.h
diff --git a/src/engine/dtk/dtkIntersectTest.cpp → src/dtk/dtkIntersectTest.cpp b/src/engine/dtk/dtkIntersectTest.cpp → src/dtk/dtkIntersectTest.cpp
diff --git a/src/engine/dtk/dtkIntersectTest.h → src/dtk/dtkIntersectTest.h b/src/engine/dtk/dtkIntersectTest.h → src/dtk/dtkIntersectTest.h
diff --git a/src/engine/dtk/dtkMatrixAlgorithm.h → src/dtk/dtkMatrixAlgorithm.h b/src/engine/dtk/dtkMatrixAlgorithm.h → src/dtk/dtkMatrixAlgorithm.h
diff --git a/src/engine/dtk/dtkPhysCore.cpp → src/dtk/dtkPhysCore.cpp b/src/engine/dtk/dtkPhysCore.cpp → src/dtk/dtkPhysCore.cpp
diff --git a/src/engine/dtk/dtkPhysCore.cpp.bak → src/dtk/dtkPhysCore.cpp.bak b/src/engine/dtk/dtkPhysCore.cpp.bak → src/dtk/dtkPhysCore.cpp.bak
diff --git a/src/engine/dtk/dtkPhysCore.h → src/dtk/dtkPhysCore.h b/src/engine/dtk/dtkPhysCore.h → src/dtk/dtkPhysCore.h
diff --git a/src/engine/dtk/dtkPhysKnotPlanner.cpp → src/dtk/dtkPhysKnotPlanner.cpp b/src/engine/dtk/dtkPhysKnotPlanner.cpp → src/dtk/dtkPhysKnotPlanner.cpp
diff --git a/src/engine/dtk/dtkPhysKnotPlanner.h → src/dtk/dtkPhysKnotPlanner.h b/src/engine/dtk/dtkPhysKnotPlanner.h → src/dtk/dtkPhysKnotPlanner.h
diff --git a/src/engine/dtk/dtkPhysMassPoint.cpp → src/dtk/dtkPhysMassPoint.cpp b/src/engine/dtk/dtkPhysMassPoint.cpp → src/dtk/dtkPhysMassPoint.cpp
diff --git a/src/engine/dtk/dtkPhysMassPoint.h → src/dtk/dtkPhysMassPoint.h b/src/engine/dtk/dtkPhysMassPoint.h → src/dtk/dtkPhysMassPoint.h
diff --git a/src/engine/dtk/dtkPhysMassSpring.cpp → src/dtk/dtkPhysMassSpring.cpp b/src/engine/dtk/dtkPhysMassSpring.cpp → src/dtk/dtkPhysMassSpring.cpp
diff --git a/src/engine/dtk/dtkPhysMassSpring.h → src/dtk/dtkPhysMassSpring.h b/src/engine/dtk/dtkPhysMassSpring.h → src/dtk/dtkPhysMassSpring.h
diff --git a/src/engine/dtk/dtkPhysMassSpring.h.bak → src/dtk/dtkPhysMassSpring.h.bak b/src/engine/dtk/dtkPhysMassSpring.h.bak → src/dtk/dtkPhysMassSpring.h.bak
diff --git a/...tk/dtkPhysMassSpringCollisionResponse.cpp → ...tk/dtkPhysMassSpringCollisionResponse.cpp b/...tk/dtkPhysMassSpringCollisionResponse.cpp → ...tk/dtkPhysMassSpringCollisionResponse.cpp
diff --git a/.../dtk/dtkPhysMassSpringCollisionResponse.h → src/dtk/dtkPhysMassSpringCollisionResponse.h b/.../dtk/dtkPhysMassSpringCollisionResponse.h → src/dtk/dtkPhysMassSpringCollisionResponse.h
diff --git a/src/engine/dtk/dtkPhysMassSpringThread.cpp → src/dtk/dtkPhysMassSpringThread.cpp b/src/engine/dtk/dtkPhysMassSpringThread.cpp → src/dtk/dtkPhysMassSpringThread.cpp
diff --git a/src/engine/dtk/dtkPhysMassSpringThread.h → src/dtk/dtkPhysMassSpringThread.h b/src/engine/dtk/dtkPhysMassSpringThread.h → src/dtk/dtkPhysMassSpringThread.h
diff --git a/...PhysMassSpringThreadCollisionResponse.cpp → ...PhysMassSpringThreadCollisionResponse.cpp b/...PhysMassSpringThreadCollisionResponse.cpp → ...PhysMassSpringThreadCollisionResponse.cpp
diff --git a/...tkPhysMassSpringThreadCollisionResponse.h → ...tkPhysMassSpringThreadCollisionResponse.h b/...tkPhysMassSpringThreadCollisionResponse.h → ...tkPhysMassSpringThreadCollisionResponse.h
diff --git a/src/engine/dtk/dtkPhysParticle.cpp → src/dtk/dtkPhysParticle.cpp b/src/engine/dtk/dtkPhysParticle.cpp → src/dtk/dtkPhysParticle.cpp
diff --git a/src/engine/dtk/dtkPhysParticle.h → src/dtk/dtkPhysParticle.h b/src/engine/dtk/dtkPhysParticle.h → src/dtk/dtkPhysParticle.h
diff --git a/src/engine/dtk/dtkPhysParticleSystem.cpp → src/dtk/dtkPhysParticleSystem.cpp b/src/engine/dtk/dtkPhysParticleSystem.cpp → src/dtk/dtkPhysParticleSystem.cpp
diff --git a/src/engine/dtk/dtkPhysParticleSystem.h → src/dtk/dtkPhysParticleSystem.h b/src/engine/dtk/dtkPhysParticleSystem.h → src/dtk/dtkPhysParticleSystem.h
diff --git a/src/engine/dtk/dtkPhysSpring.cpp → src/dtk/dtkPhysSpring.cpp b/src/engine/dtk/dtkPhysSpring.cpp → src/dtk/dtkPhysSpring.cpp
diff --git a/src/engine/dtk/dtkPhysSpring.h → src/dtk/dtkPhysSpring.h b/src/engine/dtk/dtkPhysSpring.h → src/dtk/dtkPhysSpring.h
diff --git a/src/engine/dtk/dtkPhysTetraMassSpring.cpp → src/dtk/dtkPhysTetraMassSpring.cpp b/src/engine/dtk/dtkPhysTetraMassSpring.cpp → src/dtk/dtkPhysTetraMassSpring.cpp
diff --git a/src/engine/dtk/dtkPhysTetraMassSpring.h → src/dtk/dtkPhysTetraMassSpring.h b/src/engine/dtk/dtkPhysTetraMassSpring.h → src/dtk/dtkPhysTetraMassSpring.h
diff --git a/src/engine/dtk/dtkPoints.h → src/dtk/dtkPoints.h b/src/engine/dtk/dtkPoints.h → src/dtk/dtkPoints.h
diff --git a/src/engine/dtk/dtkPointsReader.cpp → src/dtk/dtkPointsReader.cpp b/src/engine/dtk/dtkPointsReader.cpp → src/dtk/dtkPointsReader.cpp
diff --git a/src/engine/dtk/dtkPointsReader.h → src/dtk/dtkPointsReader.h b/src/engine/dtk/dtkPointsReader.h → src/dtk/dtkPointsReader.h
diff --git a/src/engine/dtk/dtkPointsVector.h → src/dtk/dtkPointsVector.h b/src/engine/dtk/dtkPointsVector.h → src/dtk/dtkPointsVector.h
diff --git a/src/engine/dtk/dtkPointsWriter.cpp → src/dtk/dtkPointsWriter.cpp b/src/engine/dtk/dtkPointsWriter.cpp → src/dtk/dtkPointsWriter.cpp
diff --git a/src/engine/dtk/dtkPointsWriter.h → src/dtk/dtkPointsWriter.h b/src/engine/dtk/dtkPointsWriter.h → src/dtk/dtkPointsWriter.h
diff --git a/src/engine/dtk/dtkProperty.h → src/dtk/dtkProperty.h b/src/engine/dtk/dtkProperty.h → src/dtk/dtkProperty.h
diff --git a/src/engine/dtk/dtkRandom.h → src/dtk/dtkRandom.h b/src/engine/dtk/dtkRandom.h → src/dtk/dtkRandom.h
diff --git a/src/engine/dtk/dtkScene.cpp → src/dtk/dtkScene.cpp b/src/engine/dtk/dtkScene.cpp → src/dtk/dtkScene.cpp
diff --git a/src/engine/dtk/dtkScene.h → src/dtk/dtkScene.h b/src/engine/dtk/dtkScene.h → src/dtk/dtkScene.h
diff --git a/src/engine/dtk/dtkSign.cpp → src/dtk/dtkSign.cpp b/src/engine/dtk/dtkSign.cpp → src/dtk/dtkSign.cpp
diff --git a/src/engine/dtk/dtkSign.h → src/dtk/dtkSign.h b/src/engine/dtk/dtkSign.h → src/dtk/dtkSign.h
diff --git a/src/engine/dtk/dtkStaticMeshEliminator.cpp → src/dtk/dtkStaticMeshEliminator.cpp b/src/engine/dtk/dtkStaticMeshEliminator.cpp → src/dtk/dtkStaticMeshEliminator.cpp
diff --git a/src/engine/dtk/dtkStaticMeshEliminator.h → src/dtk/dtkStaticMeshEliminator.h b/src/engine/dtk/dtkStaticMeshEliminator.h → src/dtk/dtkStaticMeshEliminator.h
diff --git a/src/engine/dtk/dtkStaticTetraMesh.cpp → src/dtk/dtkStaticTetraMesh.cpp b/src/engine/dtk/dtkStaticTetraMesh.cpp → src/dtk/dtkStaticTetraMesh.cpp
diff --git a/src/engine/dtk/dtkStaticTetraMesh.h → src/dtk/dtkStaticTetraMesh.h b/src/engine/dtk/dtkStaticTetraMesh.h → src/dtk/dtkStaticTetraMesh.h
diff --git a/src/engine/dtk/dtkStaticTetraMeshReader.cpp → src/dtk/dtkStaticTetraMeshReader.cpp b/src/engine/dtk/dtkStaticTetraMeshReader.cpp → src/dtk/dtkStaticTetraMeshReader.cpp
diff --git a/src/engine/dtk/dtkStaticTetraMeshReader.h → src/dtk/dtkStaticTetraMeshReader.h b/src/engine/dtk/dtkStaticTetraMeshReader.h → src/dtk/dtkStaticTetraMeshReader.h
diff --git a/src/engine/dtk/dtkStaticTetraMeshWriter.cpp → src/dtk/dtkStaticTetraMeshWriter.cpp b/src/engine/dtk/dtkStaticTetraMeshWriter.cpp → src/dtk/dtkStaticTetraMeshWriter.cpp
diff --git a/src/engine/dtk/dtkStaticTetraMeshWriter.h → src/dtk/dtkStaticTetraMeshWriter.h b/src/engine/dtk/dtkStaticTetraMeshWriter.h → src/dtk/dtkStaticTetraMeshWriter.h
diff --git a/src/engine/dtk/dtkStaticTriangleMesh.cpp → src/dtk/dtkStaticTriangleMesh.cpp b/src/engine/dtk/dtkStaticTriangleMesh.cpp → src/dtk/dtkStaticTriangleMesh.cpp
diff --git a/src/engine/dtk/dtkStaticTriangleMesh.h → src/dtk/dtkStaticTriangleMesh.h b/src/engine/dtk/dtkStaticTriangleMesh.h → src/dtk/dtkStaticTriangleMesh.h
diff --git a/...ngine/dtk/dtkStaticTriangleMeshReader.cpp → src/dtk/dtkStaticTriangleMeshReader.cpp b/...ngine/dtk/dtkStaticTriangleMeshReader.cpp → src/dtk/dtkStaticTriangleMeshReader.cpp
diff --git a/src/engine/dtk/dtkStaticTriangleMeshReader.h → src/dtk/dtkStaticTriangleMeshReader.h b/src/engine/dtk/dtkStaticTriangleMeshReader.h → src/dtk/dtkStaticTriangleMeshReader.h
diff --git a/...ngine/dtk/dtkStaticTriangleMeshWriter.cpp → src/dtk/dtkStaticTriangleMeshWriter.cpp b/...ngine/dtk/dtkStaticTriangleMeshWriter.cpp → src/dtk/dtkStaticTriangleMeshWriter.cpp
diff --git a/src/engine/dtk/dtkStaticTriangleMeshWriter.h → src/dtk/dtkStaticTriangleMeshWriter.h b/src/engine/dtk/dtkStaticTriangleMeshWriter.h → src/dtk/dtkStaticTriangleMeshWriter.h
diff --git a/src/engine/dtk/dtkTime.h → src/dtk/dtkTime.h b/src/engine/dtk/dtkTime.h → src/dtk/dtkTime.h
diff --git a/src/engine/dtk/dtkUtility.h → src/dtk/dtkUtility.h b/src/engine/dtk/dtkUtility.h → src/dtk/dtkUtility.h
diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt
diff --git a/src/engine/math/dtkMatrix.h → src/math/dtkMatrix.h b/src/engine/math/dtkMatrix.h → src/math/dtkMatrix.h
diff --git a/src/engine/math/dtkMatrixOP.h → src/math/dtkMatrixOP.h b/src/engine/math/dtkMatrixOP.h → src/math/dtkMatrixOP.h
diff --git a/src/engine/math/dtkMatrixOp.cpp → src/math/dtkMatrixOp.cpp b/src/engine/math/dtkMatrixOp.cpp → src/math/dtkMatrixOp.cpp
diff --git a/src/engine/math/dtkTx.h → src/math/dtkTx.h b/src/engine/math/dtkTx.h → src/math/dtkTx.h
diff --git a/src/engine/math/dtkTxIO.h → src/math/dtkTxIO.h b/src/engine/math/dtkTxIO.h → src/math/dtkTxIO.h
diff --git a/src/engine/math/dtkTxOP.h → src/math/dtkTxOP.h b/src/engine/math/dtkTxOP.h → src/math/dtkTxOP.h
diff --git a/src/engine/physics/dtkJoint.cpp → src/physics/dtkJoint.cpp b/src/engine/physics/dtkJoint.cpp → src/physics/dtkJoint.cpp
diff --git a/src/engine/physics/dtkJoint.h → src/physics/dtkJoint.h b/src/engine/physics/dtkJoint.h → src/physics/dtkJoint.h
diff --git a/src/engine/physics/dtkRigidBody.cpp → src/physics/dtkRigidBody.cpp b/src/engine/physics/dtkRigidBody.cpp → src/physics/dtkRigidBody.cpp
diff --git a/src/engine/physics/dtkRigidBody.h → src/physics/dtkRigidBody.h b/src/engine/physics/dtkRigidBody.h → src/physics/dtkRigidBody.h
diff --git a/src/viewer/opengl/camera.h → src/viewer_will_del/opengl/camera.h b/src/viewer/opengl/camera.h → src/viewer_will_del/opengl/camera.h
diff --git a/src/viewer/opengl/dtkGUIOpenGLbyFreeGLUT.h → ..._will_del/opengl/dtkGUIOpenGLbyFreeGLUT.h b/src/viewer/opengl/dtkGUIOpenGLbyFreeGLUT.h → ..._will_del/opengl/dtkGUIOpenGLbyFreeGLUT.h
diff --git a/src/viewer/opengl/dtkGUIOpenGLbyGLAD.h → ...ewer_will_del/opengl/dtkGUIOpenGLbyGLAD.h b/src/viewer/opengl/dtkGUIOpenGLbyGLAD.h → ...ewer_will_del/opengl/dtkGUIOpenGLbyGLAD.h
diff --git a/src/viewer/opengl/shader.cpp → src/viewer_will_del/opengl/shader.cpp b/src/viewer/opengl/shader.cpp → src/viewer_will_del/opengl/shader.cpp
diff --git a/src/viewer/opengl/shader.h → src/viewer_will_del/opengl/shader.h b/src/viewer/opengl/shader.h → src/viewer_will_del/opengl/shader.h
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -38,9 +38,9 @@ link_libraries(
         SimplePhysicsEngine-static
 )
 
-#add_subdirectory(unit_test)
+add_subdirectory(unit_test)
 #add_subdirectory(integration_test)
-#add_subdirectory(system_test)
+add_subdirectory(system_test)
 
 add_coverage_target(
         DEPENDS unit_test

diff --git a/test/system_test/CMakeLists.txt b/test/system_test/CMakeLists.txt
@@ -12,15 +12,19 @@ project(
 
 enable_language(CXX)
 
-add_executable(system_test
-        main.cpp
-        display.cpp
-)
+# add_executable(system_test
+#         main.cpp
+#         display.cpp
+# )
 
-target_compile_options(system_test PRIVATE
-        ${DEFAULT_TEST_COMPILE_OPTIONS}
-)
+# target_compile_options(system_test PRIVATE
+#         ${DEFAULT_TEST_COMPILE_OPTIONS}
+# )
 
-target_link_options(system_test PRIVATE
-        ${DEFAULT_TEST_LINK_OPTIONS}
-)
+# target_link_options(system_test PRIVATE
+#         ${DEFAULT_TEST_LINK_OPTIONS}
+# )
+
+add_subdirectory(demo2d)
+# add_subdirectory(demo3d)
+# add_subdirectory(demo_old)
diff --git a/src/demo2d/CMakeLists.txt → test/system_test/demo2d/CMakeLists.txt b/src/demo2d/CMakeLists.txt → test/system_test/demo2d/CMakeLists.txt
@@ -29,9 +29,12 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
         Boost::dynamic_linking
         CGAL
         Eigen
+        glut
         GLUT::GLUT
         glfw
         glm
         OpenGL::GL
         OpenGL::GLU 
 )
+
+message("GLUT_glut_LIBRARY: ${GLUT_glut_LIBRARY}")
diff --git a/src/demo2d/include/Constants.h → test/system_test/demo2d/include/Constants.h b/src/demo2d/include/Constants.h → test/system_test/demo2d/include/Constants.h
diff --git a/src/demo2d/include/Grid.h → test/system_test/demo2d/include/Grid.h b/src/demo2d/include/Grid.h → test/system_test/demo2d/include/Grid.h
diff --git a/src/demo2d/include/Particle.h → test/system_test/demo2d/include/Particle.h b/src/demo2d/include/Particle.h → test/system_test/demo2d/include/Particle.h
diff --git a/src/demo2d/include/SPHSolver.h → test/system_test/demo2d/include/SPHSolver.h b/src/demo2d/include/SPHSolver.h → test/system_test/demo2d/include/SPHSolver.h
diff --git a/src/demo2d/include/dtkCollisionPair.h → ...em_test/demo2d/include/dtkCollisionPair.h b/src/demo2d/include/dtkCollisionPair.h → ...em_test/demo2d/include/dtkCollisionPair.h
diff --git a/src/demo2d/include/dtkFemSimulation.h → ...em_test/demo2d/include/dtkFemSimulation.h b/src/demo2d/include/dtkFemSimulation.h → ...em_test/demo2d/include/dtkFemSimulation.h
@@ -6,7 +6,14 @@
  */
 
 
-#include <engine/physics/dtkJoint.h>
+#include <iostream>
+#include <vector>
+#include <memory>
+#include <unordered_map>
+
+#include <Eigen/Dense>
+
+#include <dtkJoint.h>
 
 #include "dtkScene.h"
 #include "dtkMesh.h"
@@ -15,12 +22,6 @@
 #include "Constants.h"
 #include "SPHSolver.h"
 
-#include <Eigen/Dense>
-#include <iostream>
-#include <vector>
-#include <memory>
-#include <unordered_map>
-
 using namespace std;
 using namespace Eigen;
 

diff --git a/src/demo2d/include/dtkMesh.h → test/system_test/demo2d/include/dtkMesh.h b/src/demo2d/include/dtkMesh.h → test/system_test/demo2d/include/dtkMesh.h
diff --git a/src/demo2d/include/dtkObject.h → test/system_test/demo2d/include/dtkObject.h b/src/demo2d/include/dtkObject.h → test/system_test/demo2d/include/dtkObject.h
diff --git a/src/demo2d/include/dtkScene.h → test/system_test/demo2d/include/dtkScene.h b/src/demo2d/include/dtkScene.h → test/system_test/demo2d/include/dtkScene.h
diff --git a/src/demo2d/src/Constants.cpp → test/system_test/demo2d/src/Constants.cpp b/src/demo2d/src/Constants.cpp → test/system_test/demo2d/src/Constants.cpp
diff --git a/src/demo2d/src/Grid.cpp → test/system_test/demo2d/src/Grid.cpp b/src/demo2d/src/Grid.cpp → test/system_test/demo2d/src/Grid.cpp
diff --git a/src/demo2d/src/Main.cpp → test/system_test/demo2d/src/Main.cpp b/src/demo2d/src/Main.cpp → test/system_test/demo2d/src/Main.cpp
diff --git a/src/demo2d/src/Particle.cpp → test/system_test/demo2d/src/Particle.cpp b/src/demo2d/src/Particle.cpp → test/system_test/demo2d/src/Particle.cpp
diff --git a/src/demo2d/src/SPHSolver.cpp → test/system_test/demo2d/src/SPHSolver.cpp b/src/demo2d/src/SPHSolver.cpp → test/system_test/demo2d/src/SPHSolver.cpp
diff --git a/src/demo2d/src/dtkCollisionPair.cpp → ...stem_test/demo2d/src/dtkCollisionPair.cpp b/src/demo2d/src/dtkCollisionPair.cpp → ...stem_test/demo2d/src/dtkCollisionPair.cpp
diff --git a/src/demo2d/src/dtkFemSimulation.cpp → ...stem_test/demo2d/src/dtkFemSimulation.cpp b/src/demo2d/src/dtkFemSimulation.cpp → ...stem_test/demo2d/src/dtkFemSimulation.cpp
diff --git a/src/demo2d/src/dtkMesh.cpp → test/system_test/demo2d/src/dtkMesh.cpp b/src/demo2d/src/dtkMesh.cpp → test/system_test/demo2d/src/dtkMesh.cpp
diff --git a/src/demo2d/src/dtkObject.cpp → test/system_test/demo2d/src/dtkObject.cpp b/src/demo2d/src/dtkObject.cpp → test/system_test/demo2d/src/dtkObject.cpp
diff --git a/src/demo2d/src/dtkScene.cpp → test/system_test/demo2d/src/dtkScene.cpp b/src/demo2d/src/dtkScene.cpp → test/system_test/demo2d/src/dtkScene.cpp
diff --git a/src/demo3d/CMakeLists.txt → test/system_test/demo3d/CMakeLists.txt b/src/demo3d/CMakeLists.txt → test/system_test/demo3d/CMakeLists.txt
diff --git a/src/demo3d/README.md → test/system_test/demo3d/README.md b/src/demo3d/README.md → test/system_test/demo3d/README.md
diff --git a/src/demo3d/dtkFemSimulation.cpp → test/system_test/demo3d/dtkFemSimulation.cpp b/src/demo3d/dtkFemSimulation.cpp → test/system_test/demo3d/dtkFemSimulation.cpp
diff --git a/src/demo3d/dtkFemSimulation.h → test/system_test/demo3d/dtkFemSimulation.h b/src/demo3d/dtkFemSimulation.h → test/system_test/demo3d/dtkFemSimulation.h
diff --git a/src/demo3d/dtkScene.cpp → test/system_test/demo3d/dtkScene.cpp b/src/demo3d/dtkScene.cpp → test/system_test/demo3d/dtkScene.cpp
diff --git a/src/demo3d/dtkScene.h → test/system_test/demo3d/dtkScene.h b/src/demo3d/dtkScene.h → test/system_test/demo3d/dtkScene.h
diff --git a/src/demo3d/main.cpp → test/system_test/demo3d/main.cpp b/src/demo3d/main.cpp → test/system_test/demo3d/main.cpp
diff --git a/src/demo_old/FEMsimulation/CMakeLists.txt → ...est/demo_old/FEMsimulation/CMakeLists.txt b/src/demo_old/FEMsimulation/CMakeLists.txt → ...est/demo_old/FEMsimulation/CMakeLists.txt
diff --git a/src/demo_old/FEMsimulation/README.md → ...tem_test/demo_old/FEMsimulation/README.md b/src/demo_old/FEMsimulation/README.md → ...tem_test/demo_old/FEMsimulation/README.md
diff --git a/...mo_old/FEMsimulation/dtkFemSimulation.cpp → ...mo_old/FEMsimulation/dtkFemSimulation.cpp b/...mo_old/FEMsimulation/dtkFemSimulation.cpp → ...mo_old/FEMsimulation/dtkFemSimulation.cpp
diff --git a/...demo_old/FEMsimulation/dtkFemSimulation.h → ...demo_old/FEMsimulation/dtkFemSimulation.h b/...demo_old/FEMsimulation/dtkFemSimulation.h → ...demo_old/FEMsimulation/dtkFemSimulation.h
diff --git a/src/demo_old/FEMsimulation/dtkScene.cpp → ..._test/demo_old/FEMsimulation/dtkScene.cpp b/src/demo_old/FEMsimulation/dtkScene.cpp → ..._test/demo_old/FEMsimulation/dtkScene.cpp
diff --git a/src/demo_old/FEMsimulation/dtkScene.h → ...em_test/demo_old/FEMsimulation/dtkScene.h b/src/demo_old/FEMsimulation/dtkScene.h → ...em_test/demo_old/FEMsimulation/dtkScene.h
diff --git a/src/demo_old/FEMsimulation/main.cpp → ...stem_test/demo_old/FEMsimulation/main.cpp b/src/demo_old/FEMsimulation/main.cpp → ...stem_test/demo_old/FEMsimulation/main.cpp
diff --git a/...mo_old/RigidBodySimulation/CMakeLists.txt → ...mo_old/RigidBodySimulation/CMakeLists.txt b/...mo_old/RigidBodySimulation/CMakeLists.txt → ...mo_old/RigidBodySimulation/CMakeLists.txt
diff --git a/src/demo_old/RigidBodySimulation/README.md → ...st/demo_old/RigidBodySimulation/README.md b/src/demo_old/RigidBodySimulation/README.md → ...st/demo_old/RigidBodySimulation/README.md
diff --git a/src/demo_old/RigidBodySimulation/cbody.cpp → ...st/demo_old/RigidBodySimulation/cbody.cpp b/src/demo_old/RigidBodySimulation/cbody.cpp → ...st/demo_old/RigidBodySimulation/cbody.cpp
diff --git a/src/demo_old/RigidBodySimulation/cbody.h → ...test/demo_old/RigidBodySimulation/cbody.h b/src/demo_old/RigidBodySimulation/cbody.h → ...test/demo_old/RigidBodySimulation/cbody.h
diff --git a/src/demo_old/RigidBodySimulation/cjoint.cpp → ...t/demo_old/RigidBodySimulation/cjoint.cpp b/src/demo_old/RigidBodySimulation/cjoint.cpp → ...t/demo_old/RigidBodySimulation/cjoint.cpp
diff --git a/src/demo_old/RigidBodySimulation/cjoint.h → ...est/demo_old/RigidBodySimulation/cjoint.h b/src/demo_old/RigidBodySimulation/cjoint.h → ...est/demo_old/RigidBodySimulation/cjoint.h
diff --git a/src/demo_old/RigidBodySimulation/cpair.cpp → ...st/demo_old/RigidBodySimulation/cpair.cpp b/src/demo_old/RigidBodySimulation/cpair.cpp → ...st/demo_old/RigidBodySimulation/cpair.cpp
diff --git a/src/demo_old/RigidBodySimulation/cpair.h → ...test/demo_old/RigidBodySimulation/cpair.h b/src/demo_old/RigidBodySimulation/cpair.h → ...test/demo_old/RigidBodySimulation/cpair.h
diff --git a/src/demo_old/RigidBodySimulation/ctypes.cpp → ...t/demo_old/RigidBodySimulation/ctypes.cpp b/src/demo_old/RigidBodySimulation/ctypes.cpp → ...t/demo_old/RigidBodySimulation/ctypes.cpp
diff --git a/src/demo_old/RigidBodySimulation/ctypes.h → ...est/demo_old/RigidBodySimulation/ctypes.h b/src/demo_old/RigidBodySimulation/ctypes.h → ...est/demo_old/RigidBodySimulation/ctypes.h
diff --git a/src/demo_old/RigidBodySimulation/cworld.cpp → ...t/demo_old/RigidBodySimulation/cworld.cpp b/src/demo_old/RigidBodySimulation/cworld.cpp → ...t/demo_old/RigidBodySimulation/cworld.cpp
diff --git a/src/demo_old/RigidBodySimulation/cworld.h → ...est/demo_old/RigidBodySimulation/cworld.h b/src/demo_old/RigidBodySimulation/cworld.h → ...est/demo_old/RigidBodySimulation/cworld.h
diff --git a/src/demo_old/RigidBodySimulation/main.cpp → ...est/demo_old/RigidBodySimulation/main.cpp b/src/demo_old/RigidBodySimulation/main.cpp → ...est/demo_old/RigidBodySimulation/main.cpp
diff --git a/src/demo_old/SPHSimulation/README.md → ...tem_test/demo_old/SPHSimulation/README.md b/src/demo_old/SPHSimulation/README.md → ...tem_test/demo_old/SPHSimulation/README.md
diff --git a/src/demo_old/SPHSimulation/dtkSPHsolver.cpp → ...t/demo_old/SPHSimulation/dtkSPHsolver.cpp b/src/demo_old/SPHSimulation/dtkSPHsolver.cpp → ...t/demo_old/SPHSimulation/dtkSPHsolver.cpp
diff --git a/src/demo_old/SPHSimulation/dtkSPHsolver.h → ...est/demo_old/SPHSimulation/dtkSPHsolver.h b/src/demo_old/SPHSimulation/dtkSPHsolver.h → ...est/demo_old/SPHSimulation/dtkSPHsolver.h
diff --git a/...emo_old/guideWireSimulation/.editorconfig → ...emo_old/guideWireSimulation/.editorconfig b/...emo_old/guideWireSimulation/.editorconfig → ...emo_old/guideWireSimulation/.editorconfig
diff --git a/...mo_old/guideWireSimulation/CMakeLists.txt → ...mo_old/guideWireSimulation/CMakeLists.txt b/...mo_old/guideWireSimulation/CMakeLists.txt → ...mo_old/guideWireSimulation/CMakeLists.txt
diff --git a/src/demo_old/guideWireSimulation/README.md → ...st/demo_old/guideWireSimulation/README.md b/src/demo_old/guideWireSimulation/README.md → ...st/demo_old/guideWireSimulation/README.md
diff --git a/.../guideWireSimulation/Resources/center.png → .../guideWireSimulation/Resources/center.png b/.../guideWireSimulation/Resources/center.png → .../guideWireSimulation/Resources/center.png
diff --git a/...ld/guideWireSimulation/Resources/igst.jpg → ...ld/guideWireSimulation/Resources/igst.jpg b/...ld/guideWireSimulation/Resources/igst.jpg → ...ld/guideWireSimulation/Resources/igst.jpg
diff --git a/...ireSimulation/Resources/load_vascular.png → ...ireSimulation/Resources/load_vascular.png b/...ireSimulation/Resources/load_vascular.png → ...ireSimulation/Resources/load_vascular.png
diff --git a/...d/guideWireSimulation/Resources/pause.png → ...d/guideWireSimulation/Resources/pause.png b/...d/guideWireSimulation/Resources/pause.png → ...d/guideWireSimulation/Resources/pause.png
diff --git a/...uideWireSimulation/Resources/question.jpg → ...uideWireSimulation/Resources/question.jpg b/...uideWireSimulation/Resources/question.jpg → ...uideWireSimulation/Resources/question.jpg
diff --git a/...ld/guideWireSimulation/Resources/quit.png → ...ld/guideWireSimulation/Resources/quit.png b/...ld/guideWireSimulation/Resources/quit.png → ...ld/guideWireSimulation/Resources/quit.png
diff --git a/...d/guideWireSimulation/Resources/start.png → ...d/guideWireSimulation/Resources/start.png b/...d/guideWireSimulation/Resources/start.png → ...d/guideWireSimulation/Resources/start.png
diff --git a/...guideWireSimulation/Resources/zoom-in.png → ...guideWireSimulation/Resources/zoom-in.png b/...guideWireSimulation/Resources/zoom-in.png → ...guideWireSimulation/Resources/zoom-in.png
diff --git a/...uideWireSimulation/Resources/zoom-out.png → ...uideWireSimulation/Resources/zoom-out.png b/...uideWireSimulation/Resources/zoom-out.png → ...uideWireSimulation/Resources/zoom-out.png
diff --git a/...eWireSimulation/bak/DevicePhantomOmni.cpp → ...eWireSimulation/bak/DevicePhantomOmni.cpp b/...eWireSimulation/bak/DevicePhantomOmni.cpp → ...eWireSimulation/bak/DevicePhantomOmni.cpp
diff --git a/...ideWireSimulation/bak/DevicePhantomOmni.h → ...ideWireSimulation/bak/DevicePhantomOmni.h b/...ideWireSimulation/bak/DevicePhantomOmni.h → ...ideWireSimulation/bak/DevicePhantomOmni.h
diff --git a/...ireSimulation/bak/guideWireSimulation.cpp → ...ireSimulation/bak/guideWireSimulation.cpp b/...ireSimulation/bak/guideWireSimulation.cpp → ...ireSimulation/bak/guideWireSimulation.cpp
diff --git a/...eWireSimulation/bak/guideWireSimulation.h → ...eWireSimulation/bak/guideWireSimulation.h b/...eWireSimulation/bak/guideWireSimulation.h → ...eWireSimulation/bak/guideWireSimulation.h
diff --git a/...guideWireSimulation/collisionResponse.cpp → ...guideWireSimulation/collisionResponse.cpp b/...guideWireSimulation/collisionResponse.cpp → ...guideWireSimulation/collisionResponse.cpp
diff --git a/...d/guideWireSimulation/collisionResponse.h → ...d/guideWireSimulation/collisionResponse.h b/...d/guideWireSimulation/collisionResponse.h → ...d/guideWireSimulation/collisionResponse.h
diff --git a/...o_old/guideWireSimulation/controlCore.cpp → ...o_old/guideWireSimulation/controlCore.cpp b/...o_old/guideWireSimulation/controlCore.cpp → ...o_old/guideWireSimulation/controlCore.cpp
diff --git a/...emo_old/guideWireSimulation/controlCore.h → ...emo_old/guideWireSimulation/controlCore.h b/...emo_old/guideWireSimulation/controlCore.h → ...emo_old/guideWireSimulation/controlCore.h
diff --git a/src/demo_old/guideWireSimulation/cutHead.cpp → .../demo_old/guideWireSimulation/cutHead.cpp b/src/demo_old/guideWireSimulation/cutHead.cpp → .../demo_old/guideWireSimulation/cutHead.cpp
diff --git a/src/demo_old/guideWireSimulation/cutHead.h → ...st/demo_old/guideWireSimulation/cutHead.h b/src/demo_old/guideWireSimulation/cutHead.h → ...st/demo_old/guideWireSimulation/cutHead.h
diff --git a/...old/guideWireSimulation/data/.svn/entries → ...old/guideWireSimulation/data/.svn/entries b/...old/guideWireSimulation/data/.svn/entries → ...old/guideWireSimulation/data/.svn/entries
diff --git a/...text-base/cholecyst_moderate.s4m.svn-base → ...text-base/cholecyst_moderate.s4m.svn-base b/...text-base/cholecyst_moderate.s4m.svn-base → ...text-base/cholecyst_moderate.s4m.svn-base
diff --git a/....svn/text-base/gallbladder01.s4m.svn-base → ....svn/text-base/gallbladder01.s4m.svn-base b/....svn/text-base/gallbladder01.s4m.svn-base → ....svn/text-base/gallbladder01.s4m.svn-base
diff --git a/...n/data/.svn/text-base/gwdata.txt.svn-base → ...n/data/.svn/text-base/gwdata.txt.svn-base b/...n/data/.svn/text-base/gwdata.txt.svn-base → ...n/data/.svn/text-base/gwdata.txt.svn-base
diff --git a/...vn/text-base/pipe_1_moderate.s4m.svn-base → ...vn/text-base/pipe_1_moderate.s4m.svn-base b/...vn/text-base/pipe_1_moderate.s4m.svn-base → ...vn/text-base/pipe_1_moderate.s4m.svn-base
diff --git a/...t-base/quaternionsCurvatures.txt.svn-base → ...t-base/quaternionsCurvatures.txt.svn-base b/...t-base/quaternionsCurvatures.txt.svn-base → ...t-base/quaternionsCurvatures.txt.svn-base
diff --git a/...ta/.svn/text-base/triangleID.txt.svn-base → ...ta/.svn/text-base/triangleID.txt.svn-base b/...ta/.svn/text-base/triangleID.txt.svn-base → ...ta/.svn/text-base/triangleID.txt.svn-base
diff --git a/...data/.svn/text-base/vascular.txt.svn-base → ...data/.svn/text-base/vascular.txt.svn-base b/...data/.svn/text-base/vascular.txt.svn-base → ...data/.svn/text-base/vascular.txt.svn-base
diff --git a/...d/guideWireSimulation/data/avoidPoint.txt → ...d/guideWireSimulation/data/avoidPoint.txt b/...d/guideWireSimulation/data/avoidPoint.txt → ...d/guideWireSimulation/data/avoidPoint.txt
diff --git a/.../guideWireSimulation/data/avoidPoint1.txt → .../guideWireSimulation/data/avoidPoint1.txt b/.../guideWireSimulation/data/avoidPoint1.txt → .../guideWireSimulation/data/avoidPoint1.txt
diff --git a/.../guideWireSimulation/data/avoidPoint2.txt → .../guideWireSimulation/data/avoidPoint2.txt b/.../guideWireSimulation/data/avoidPoint2.txt → .../guideWireSimulation/data/avoidPoint2.txt
diff --git a/...ireSimulation/data/cholecyst_moderate.s4m → ...ireSimulation/data/cholecyst_moderate.s4m b/...ireSimulation/data/cholecyst_moderate.s4m → ...ireSimulation/data/cholecyst_moderate.s4m
diff --git a/...uideWireSimulation/data/gallbladder01.s4m → ...uideWireSimulation/data/gallbladder01.s4m b/...uideWireSimulation/data/gallbladder01.s4m → ...uideWireSimulation/data/gallbladder01.s4m
diff --git a/...o_old/guideWireSimulation/data/gwdata.txt → ...o_old/guideWireSimulation/data/gwdata.txt b/...o_old/guideWireSimulation/data/gwdata.txt → ...o_old/guideWireSimulation/data/gwdata.txt
diff --git a/...deWireSimulation/data/pipe_1_moderate.s4m → ...deWireSimulation/data/pipe_1_moderate.s4m b/...deWireSimulation/data/pipe_1_moderate.s4m → ...deWireSimulation/data/pipe_1_moderate.s4m
diff --git a/...Simulation/data/quaternionsCurvatures.txt → ...Simulation/data/quaternionsCurvatures.txt b/...Simulation/data/quaternionsCurvatures.txt → ...Simulation/data/quaternionsCurvatures.txt
diff --git a/...d/guideWireSimulation/data/triangleID.txt → ...d/guideWireSimulation/data/triangleID.txt b/...d/guideWireSimulation/data/triangleID.txt → ...d/guideWireSimulation/data/triangleID.txt
diff --git a/...ideWireSimulation/data/triangleWirter.s3m → ...ideWireSimulation/data/triangleWirter.s3m b/...ideWireSimulation/data/triangleWirter.s3m → ...ideWireSimulation/data/triangleWirter.s3m
diff --git a/...ireSimulation/data/vein final version.s4m → ...ireSimulation/data/vein final version.s4m b/...ireSimulation/data/vein final version.s4m → ...ireSimulation/data/vein final version.s4m
diff --git a/...reSimulation/data/vein final version1.s3m → ...reSimulation/data/vein final version1.s3m b/...reSimulation/data/vein final version1.s3m → ...reSimulation/data/vein final version1.s3m
diff --git a/...reSimulation/data/vein final version1.s4m → ...reSimulation/data/vein final version1.s4m b/...reSimulation/data/vein final version1.s4m → ...reSimulation/data/vein final version1.s4m
diff --git a/...eWireSimulation/data/vein0806version7.s3m → ...eWireSimulation/data/vein0806version7.s3m b/...eWireSimulation/data/vein0806version7.s3m → ...eWireSimulation/data/vein0806version7.s3m
diff --git a/...eWireSimulation/data/vein0806version7.s4m → ...eWireSimulation/data/vein0806version7.s4m b/...eWireSimulation/data/vein0806version7.s4m → ...eWireSimulation/data/vein0806version7.s4m
diff --git a/...eWireSimulation/data/vein0806version8.s3m → ...eWireSimulation/data/vein0806version8.s3m b/...eWireSimulation/data/vein0806version8.s3m → ...eWireSimulation/data/vein0806version8.s3m
diff --git a/...eWireSimulation/data/vein0806version8.s4m → ...eWireSimulation/data/vein0806version8.s4m b/...eWireSimulation/data/vein0806version8.s4m → ...eWireSimulation/data/vein0806version8.s4m
diff --git a/...demo_old/guideWireSimulation/glDrawer.cpp → ...demo_old/guideWireSimulation/glDrawer.cpp b/...demo_old/guideWireSimulation/glDrawer.cpp → ...demo_old/guideWireSimulation/glDrawer.cpp
diff --git a/src/demo_old/guideWireSimulation/glDrawer.h → ...t/demo_old/guideWireSimulation/glDrawer.h b/src/demo_old/guideWireSimulation/glDrawer.h → ...t/demo_old/guideWireSimulation/glDrawer.h
diff --git a/...demo_old/guideWireSimulation/glThread.cpp → ...demo_old/guideWireSimulation/glThread.cpp b/...demo_old/guideWireSimulation/glThread.cpp → ...demo_old/guideWireSimulation/glThread.cpp
diff --git a/src/demo_old/guideWireSimulation/glThread.h → ...t/demo_old/guideWireSimulation/glThread.h b/src/demo_old/guideWireSimulation/glThread.h → ...t/demo_old/guideWireSimulation/glThread.h
diff --git a/...emo_old/guideWireSimulation/guideWire.cpp → ...emo_old/guideWireSimulation/guideWire.cpp b/...emo_old/guideWireSimulation/guideWire.cpp → ...emo_old/guideWireSimulation/guideWire.cpp
diff --git a/src/demo_old/guideWireSimulation/guideWire.h → .../demo_old/guideWireSimulation/guideWire.h b/src/demo_old/guideWireSimulation/guideWire.h → .../demo_old/guideWireSimulation/guideWire.h
diff --git a/...eSimulation/guideWireInternalResponse.cpp → ...eSimulation/guideWireInternalResponse.cpp b/...eSimulation/guideWireInternalResponse.cpp → ...eSimulation/guideWireInternalResponse.cpp
diff --git a/...ireSimulation/guideWireInternalResponse.h → ...ireSimulation/guideWireInternalResponse.h b/...ireSimulation/guideWireInternalResponse.h → ...ireSimulation/guideWireInternalResponse.h
diff --git a/...eWireSimulation/guideWireOpenGLRender.cpp → ...eWireSimulation/guideWireOpenGLRender.cpp b/...eWireSimulation/guideWireOpenGLRender.cpp → ...eWireSimulation/guideWireOpenGLRender.cpp
diff --git a/...ideWireSimulation/guideWireOpenGLRender.h → ...ideWireSimulation/guideWireOpenGLRender.h b/...ideWireSimulation/guideWireOpenGLRender.h → ...ideWireSimulation/guideWireOpenGLRender.h
diff --git a/...ideWireSimulation/guideWireSimulation.cpp → ...ideWireSimulation/guideWireSimulation.cpp b/...ideWireSimulation/guideWireSimulation.cpp → ...ideWireSimulation/guideWireSimulation.cpp
diff --git a/...guideWireSimulation/guideWireSimulation.h → ...guideWireSimulation/guideWireSimulation.h b/...guideWireSimulation/guideWireSimulation.h → ...guideWireSimulation/guideWireSimulation.h
diff --git a/...ideWireSimulation/guideWireSimulation.qrc → ...ideWireSimulation/guideWireSimulation.qrc b/...ideWireSimulation/guideWireSimulation.qrc → ...ideWireSimulation/guideWireSimulation.qrc
diff --git a/...uideWireSimulation/guideWireSimulation.rc → ...uideWireSimulation/guideWireSimulation.rc b/...uideWireSimulation/guideWireSimulation.rc → ...uideWireSimulation/guideWireSimulation.rc
diff --git a/...uideWireSimulation/guideWireSimulation.ui → ...uideWireSimulation/guideWireSimulation.ui b/...uideWireSimulation/guideWireSimulation.ui → ...uideWireSimulation/guideWireSimulation.ui
diff --git a/src/demo_old/guideWireSimulation/main.cpp → ...est/demo_old/guideWireSimulation/main.cpp b/src/demo_old/guideWireSimulation/main.cpp → ...est/demo_old/guideWireSimulation/main.cpp
diff --git a/src/demo_old/guideWireSimulation/resource.h → ...t/demo_old/guideWireSimulation/resource.h b/src/demo_old/guideWireSimulation/resource.h → ...t/demo_old/guideWireSimulation/resource.h
diff --git a/...ideWireSimulation/simulationParameters.ui → ...ideWireSimulation/simulationParameters.ui b/...ideWireSimulation/simulationParameters.ui → ...ideWireSimulation/simulationParameters.ui
diff --git a/...deWireSimulation/vascularOpenGLRender.cpp → ...deWireSimulation/vascularOpenGLRender.cpp b/...deWireSimulation/vascularOpenGLRender.cpp → ...deWireSimulation/vascularOpenGLRender.cpp
diff --git a/...uideWireSimulation/vascularOpenGLRender.h → ...uideWireSimulation/vascularOpenGLRender.h b/...uideWireSimulation/vascularOpenGLRender.h → ...uideWireSimulation/vascularOpenGLRender.h
diff --git a/src/demo_old/img/3dFEM.gif → test/system_test/demo_old/img/3dFEM.gif b/src/demo_old/img/3dFEM.gif → test/system_test/demo_old/img/3dFEM.gif
diff --git a/src/demo_old/img/DFSPH.gif → test/system_test/demo_old/img/DFSPH.gif b/src/demo_old/img/DFSPH.gif → test/system_test/demo_old/img/DFSPH.gif
diff --git a/src/demo_old/img/PCISPH.gif → test/system_test/demo_old/img/PCISPH.gif b/src/demo_old/img/PCISPH.gif → test/system_test/demo_old/img/PCISPH.gif
diff --git a/src/demo_old/img/WCSPH.gif → test/system_test/demo_old/img/WCSPH.gif b/src/demo_old/img/WCSPH.gif → test/system_test/demo_old/img/WCSPH.gif
diff --git a/src/demo_old/img/dtkFemSimulation.gif → ...em_test/demo_old/img/dtkFemSimulation.gif b/src/demo_old/img/dtkFemSimulation.gif → ...em_test/demo_old/img/dtkFemSimulation.gif
diff --git a/src/demo_old/img/dtkRigidBodySimulation.gif → ...t/demo_old/img/dtkRigidBodySimulation.gif b/src/demo_old/img/dtkRigidBodySimulation.gif → ...t/demo_old/img/dtkRigidBodySimulation.gif
diff --git a/src/demo_old/img/guideWire.jpg → test/system_test/demo_old/img/guideWire.jpg b/src/demo_old/img/guideWire.jpg → test/system_test/demo_old/img/guideWire.jpg