- added coupling demo

- added ball joint which links a rigid body and a particle

Author: janbender

Changelog.txt

@@ -1,3 +1,5 @@
+	- added coupling demo
+	- added ball joint which links a rigid body and a particle
 	- added universal joint
 	- improved hinge joint
 	- added documentation for position based fluids

Demos/BarDemo/TimeStepTetModel.cpp

@@ -62,7 +62,7 @@ void TimeStepTetModel::clearAccelerations(TetModel &model)
 	}
 }
 
-void TimeStepTetModel::reset(TetModel &model)
+void TimeStepTetModel::reset()
 {
 
 }

Demos/BarDemo/TimeStepTetModel.h

@@ -20,7 +20,7 @@ namespace PBD
 		virtual ~TimeStepTetModel(void);
 
 		void step(TetModel &model);
-		void reset(TetModel &model);	
+		void reset();	
 
 		unsigned int getVelocityUpdateMethod() const { return m_velocityUpdateMethod; }
 		void setVelocityUpdateMethod(unsigned int val) { m_velocityUpdateMethod = val; }

Demos/BarDemo/main.cpp

@@ -94,7 +94,7 @@ void cleanup()
 void reset()
 {
 	model.reset();
-	simulation.reset(model);
+	simulation.reset();
 	TimeManager::getCurrent()->setTime(0.0);
 }
 

Demos/CMakeLists.txt

@@ -1,3 +1,3 @@
 include(Visualization/CMakeLists.txt)
 
-subdirs(BarDemo ClothDemo FluidDemo RigidBodyDemos)
+subdirs(BarDemo ClothDemo FluidDemo RigidBodyDemos CouplingDemos)

Demos/ClothDemo/TimeStepTriangleModel.cpp

@@ -63,7 +63,7 @@ void TimeStepTriangleModel::clearAccelerations(TriangleModel &model)
 	}
 }
 
-void TimeStepTriangleModel::reset(TriangleModel &model)
+void TimeStepTriangleModel::reset()
 {
 
 }

Demos/ClothDemo/TimeStepTriangleModel.h

@@ -21,7 +21,7 @@ namespace PBD
 		virtual ~TimeStepTriangleModel(void);
 
 		void step(TriangleModel &model);
-		void reset(TriangleModel &model);	
+		void reset();	
 
 		unsigned int getVelocityUpdateMethod() const { return m_velocityUpdateMethod; }
 		void setVelocityUpdateMethod(unsigned int val) { m_velocityUpdateMethod = val; }

Demos/ClothDemo/main.cpp

@@ -117,7 +117,7 @@ void cleanup()
 void reset()
 {
 	model.reset();
-	simulation.reset(model);
+	simulation.reset();
 	TimeManager::getCurrent()->setTime(0.0);
 }
 

Demos/CouplingDemos/CMakeLists.txt

@@ -0,0 +1,47 @@
+set(SIMULATION_LINK_LIBRARIES AntTweakBar glew PositionBasedDynamics)
+set(SIMULATION_DEPENDENCIES AntTweakBar glew PositionBasedDynamics)
+
+if(WIN32)
+  set(SIMULATION_LINK_LIBRARIES freeglut opengl32.lib glu32.lib ${SIMULATION_LINK_LIBRARIES})
+  set(SIMULATION_DEPENDENCIES freeglut ${SIMULATION_DEPENDENCIES})
+else()
+  find_package(GLUT REQUIRED)
+  find_package(OpenGL REQUIRED)
+
+  set(SIMULATION_LINK_LIBRARIES
+    ${SIMULATION_LINK_LIBRARIES}
+    ${GLUT_LIBRARIES}
+    ${OPENGL_LIBRARIES}
+  )
+endif()
+
+add_executable(RigidBodyClothCouplingDemo
+	  RigidBodyClothCouplingDemo.cpp
+	  
+	  TimeStepRigidBodyParticleModel.cpp
+	  TimeStepRigidBodyParticleModel.h
+	  RigidBodyParticleModel.cpp
+	  RigidBodyParticleModel.h	  
+	    
+	  ${VIS_FILES}          
+	  ${PROJECT_PATH}/Demos/Utils/Config.h			
+	  ${PROJECT_PATH}/Demos/Utils/TimeManager.cpp	
+	  ${PROJECT_PATH}/Demos/Utils/TimeManager.h		
+	  ${PROJECT_PATH}/Demos/Utils/RigidBody.h		  
+	  
+	  CMakeLists.txt
+)
+
+set_target_properties(RigidBodyClothCouplingDemo PROPERTIES FOLDER "Demos")
+add_dependencies(RigidBodyClothCouplingDemo ${SIMULATION_DEPENDENCIES})
+target_link_libraries(RigidBodyClothCouplingDemo ${SIMULATION_LINK_LIBRARIES})
+
+
+add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC)
+find_package( Eigen3 REQUIRED )
+include_directories( ${EIGEN3_INCLUDE_DIR} )
+include_directories(${PROJECT_PATH}/extern/freeglut/include)
+include_directories(${PROJECT_PATH}/extern/glew/include)
+
+
+VIS_SOURCE_GROUPS()