Pbd solver

CMakeLists.txt

@@ -1,10 +1,17 @@
 cmake_minimum_required(VERSION 3.10.0)
 
+if(POLICY CMP0072)
+  cmake_policy(SET CMP0072 NEW)
+endif()
+
 project(fast-mass-spring)
 
+set(OpenGL_GL_PREFERENCE GLVND)
+
 set(Sources
     ClothApp/app.cpp
     ClothApp/MassSpringSolver.cpp
+  ClothApp/PBDSolver.cpp
     ClothApp/Mesh.cpp
     ClothApp/Renderer.cpp
     ClothApp/Shader.cpp
@@ -27,6 +34,7 @@ FetchContent_Declare(
 FetchContent_Declare(
   eigen
   GIT_REPOSITORY  https://gitlab.com/libeigen/eigen.git
+  GIT_TAG         3.4.0
 )
 
 FetchContent_Declare(
@@ -43,9 +51,11 @@ endif()
 FetchContent_GetProperties(eigen)
 if(NOT eigen_POPULATED)
   FetchContent_Populate(eigen)
-  add_subdirectory(${eigen_SOURCE_DIR} ${eigen_BINARY_DIR})
 endif()
 
+add_library(eigen INTERFACE)
+target_include_directories(eigen INTERFACE ${eigen_SOURCE_DIR})
+
 
 FetchContent_GetProperties(glm)
 if(NOT glm_POPULATED)
@@ -58,9 +68,15 @@ if(WIN32)
   add_definitions(-D_USE_MATH_DEFINES)
 endif()
 
-# copy shaders to binary directory
-file(INSTALL ClothApp/shaders/ DESTINATION shaders/)
-
 # create executable
 add_executable(fast-mass-spring ${Sources})
 target_link_libraries(fast-mass-spring ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} ${GLEW_LIBRARIES} OpenMeshCore eigen glm)
+
+# copy shaders to binary directory on every build.
+add_custom_target(copy_shaders ALL
+  COMMAND ${CMAKE_COMMAND} -E copy_directory
+          ${CMAKE_CURRENT_SOURCE_DIR}/ClothApp/shaders
+          ${CMAKE_CURRENT_BINARY_DIR}/shaders
+)
+
+add_dependencies(fast-mass-spring copy_shaders)

ClothApp/MassSpringSolver.cpp

@@ -1,5 +1,6 @@
 #include "MassSpringSolver.h"
 #include <iostream>
+#include <cassert>
 
 // S Y S T E M //////////////////////////////////////////////////////////////////////////////////////
 mass_spring_system::mass_spring_system(

ClothApp/MassSpringSolver.h

@@ -112,6 +112,13 @@ class MassSpringBuilder {
 // Constraint Graph
 class CgNodeVisitor; // Constraint graph node visitor
 
+class FixedPointController {
+public:
+	virtual ~FixedPointController() = default;
+	virtual void fixPoint(unsigned int i) = 0;
+	virtual void releasePoint(unsigned int i) = 0;
+};
+
 // Constraint graph node
 class CgNode {
 protected:
@@ -158,7 +165,7 @@ class CgRootNode : public CgSpringNode {
 	virtual bool accept(CgNodeVisitor& visitor);
 };
 
-class CgPointFixNode : public CgPointNode {
+class CgPointFixNode : public CgPointNode, public FixedPointController {
 protected:
 	typedef Eigen::Vector3f Vector3f;
 	std::unordered_map<unsigned int, Vector3f> fix_map;

ClothApp/Mesh.cpp

@@ -1,10 +1,10 @@
 #include "Mesh.h"
 
 // M E S H /////////////////////////////////////////////////////////////////////////////////////
-float* Mesh::vbuff() { return VERTEX_DATA(this); }
-float* Mesh::nbuff() { return NORMAL_DATA(this); }
-float* Mesh::tbuff() { return TEXTURE_DATA(this); }
-unsigned int* Mesh::ibuff() { return &_ibuff[0]; }
+float* Mesh::vbuff() { return VERTEX_DATA(this); }		// vertex buffer
+float* Mesh::nbuff() { return NORMAL_DATA(this); }		// normal buffer
+float* Mesh::tbuff() { return TEXTURE_DATA(this); }		// texture coordinate buffer
+unsigned int* Mesh::ibuff() { return &_ibuff[0]; }		// index buffer
 void Mesh::useIBuff(std::vector<unsigned int>& _ibuff) { this->_ibuff = _ibuff; }
 
 unsigned int Mesh::vbuffLen() { return (unsigned int)n_vertices() * 3; }
@@ -35,7 +35,7 @@ void MeshBuilder::uniformGrid(float w, int n) {
 
 	for (int i = 0; i < n; i++) {
 		for (int j = 0; j < n; j++) {
-			handle_table[j + i * n] = result->add_vertex(o + d*j*ux + d*i*uy); // add vertex
+			handle_table[j + i * n] = result->add_vertex(o + d*j*ux + d*i*uy); // add vertex, vertexId(i, j) = i * n + j
 			result->set_texcoord2D(handle_table[j + i * n], OpenMesh::Vec2f(ud*j, ud*i)); // add texture coordinates
 
 			//add connectivity