- added glfw

- removed freeglut and glew
- added flat shading
- bugfixes

Author: janbender

CMakeLists.txt

@@ -1,4 +1,7 @@
-cmake_minimum_required(VERSION 2.8)
+################################################################################
+# general CMake and project setup
+################################################################################
+cmake_minimum_required(VERSION 3.1)
 
 project(PositionBasedDynamics)
 
@@ -76,11 +79,8 @@ add_subdirectory(PositionBasedDynamics)
 add_subdirectory(Simulation)
 add_subdirectory(Utils)
 if (NOT PBD_NO_DEMOS)
-	if (WIN32)
-		add_subdirectory(extern/freeglut)
-	endif()
+	add_subdirectory(extern/glfw)
 	add_subdirectory(extern/AntTweakBar)
-	add_subdirectory(extern/glew)
 	add_subdirectory(extern/md5)
 	add_subdirectory(Demos)
 endif()

Changelog.txt

@@ -1,3 +1,7 @@
+	- added glfw 
+	- removed freeglut and glew
+	- added flat shading
+
 1.8.0
 	- added OBJ export
 	- added substepping

Common/Common.h

@@ -33,6 +33,7 @@ using Vector6r = Eigen::Matrix<Real, 6, 1, Eigen::DontAlign>;
 using Matrix2r = Eigen::Matrix<Real, 2, 2, Eigen::DontAlign>;
 using Matrix3r = Eigen::Matrix<Real, 3, 3, Eigen::DontAlign>;
 using Matrix4r = Eigen::Matrix<Real, 4, 4, Eigen::DontAlign>;
+using Vector2i = Eigen::Matrix<int, 2, 1, Eigen::DontAlign>;
 using AlignedBox2r = Eigen::AlignedBox<Real, 2>;
 using AlignedBox3r = Eigen::AlignedBox<Real, 3>;
 using AngleAxisr = Eigen::AngleAxis<Real>;

Demos/BarDemo/CMakeLists.txt

@@ -1,17 +1,16 @@
-set(SIMULATION_LINK_LIBRARIES AntTweakBar glew PositionBasedDynamics Simulation Utils)
-set(SIMULATION_DEPENDENCIES AntTweakBar glew PositionBasedDynamics Simulation Utils)
+set(SIMULATION_LINK_LIBRARIES AntTweakBar glfw PositionBasedDynamics Simulation Utils)
+set(SIMULATION_DEPENDENCIES AntTweakBar glfw PositionBasedDynamics Simulation Utils)
 
 if(WIN32)
-  set(SIMULATION_LINK_LIBRARIES freeglut opengl32.lib glu32.lib ${SIMULATION_LINK_LIBRARIES})
-  set(SIMULATION_DEPENDENCIES freeglut ${SIMULATION_DEPENDENCIES})
+  set(SIMULATION_LINK_LIBRARIES opengl32.lib glu32.lib ${SIMULATION_LINK_LIBRARIES})
+  #set(SIMULATION_DEPENDENCIES ${SIMULATION_DEPENDENCIES})
 else()
   set(OpenGL_GL_PREFERENCE GLVND)
-  find_package(GLUT REQUIRED)
   find_package(OpenGL REQUIRED)
-
+  include_directories( ${OPENGL_INCLUDE_DIRS})
+	
   set(SIMULATION_LINK_LIBRARIES
     ${SIMULATION_LINK_LIBRARIES}
-    ${GLUT_LIBRARIES}
     ${OPENGL_LIBRARIES}
   )
 endif()
@@ -42,8 +41,6 @@ add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC -DFREEGLUT_LIB_PRAGMAS=0)
 
 find_package( Eigen3 REQUIRED )
 include_directories( ${EIGEN3_INCLUDE_DIR} )
-include_directories(${PROJECT_PATH}/extern/freeglut/include)
-include_directories(${PROJECT_PATH}/extern/glew/include)
 
 set_target_properties(BarDemo PROPERTIES FOLDER "Demos")
 set_target_properties(BarDemo PROPERTIES DEBUG_POSTFIX ${PBD_BINARY_DEBUG_POSTFIX})

Demos/BarDemo/main.cpp

@@ -1,7 +1,6 @@
 #include "Common/Common.h"
 #include "Demos/Visualization/MiniGL.h"
 #include "Demos/Visualization/Selection.h"
-#include "GL/glut.h"
 #include "Simulation/TimeManager.h"
 #include <Eigen/Dense>
 #include "Simulation/SimulationModel.h"
@@ -65,11 +64,9 @@ int main( int argc, char **argv )
 
 	initParameters();
 
-	Simulation::getCurrent()->setSimulationMethodChangedCallback([&]() { reset(); initParameters(); base->getSceneLoader()->readParameterObject(Simulation::getCurrent()->getTimeStep()); });
-
 	// OpenGL
-	MiniGL::setClientIdleFunc (50, timeStep);		
-	MiniGL::setKeyFunc(0, 'r', reset);
+	MiniGL::setClientIdleFunc (timeStep);		
+	MiniGL::addKeyFunc('r', reset);
 	MiniGL::setClientSceneFunc(render);			
 	MiniGL::setViewport (40.0f, 0.1f, 500.0f, Vector3r (5.0, 10.0, 30.0), Vector3r (5.0, 0.0, 0.0));
 
@@ -81,7 +78,7 @@ int main( int argc, char **argv )
 	TwAddVarCB(MiniGL::getTweakBar(), "NormalizeStretch", TW_TYPE_BOOL32, setNormalizeStretch, getNormalizeStretch, model, " label='Normalize stretch' group='Strain based dynamics' ");
 	TwAddVarCB(MiniGL::getTweakBar(), "NormalizeShear", TW_TYPE_BOOL32, setNormalizeShear, getNormalizeShear, model, " label='Normalize shear' group='Strain based dynamics' ");
 
-	glutMainLoop ();	
+	MiniGL::mainLoop();
 
 	Utilities::Timing::printAverageTimes();
 	Utilities::Timing::printTimeSums();
@@ -334,23 +331,23 @@ void TW_CALL getPoissonRatio(void *value, void *clientData)
 void TW_CALL setNormalizeStretch(const void *value, void *clientData)
 {
 	const bool val = *(const bool *)(value);
-	((SimulationModel*)clientData)->setValue<Real>(SimulationModel::SOLID_NORMALIZE_STRETCH, val);
+	((SimulationModel*)clientData)->setValue<bool>(SimulationModel::SOLID_NORMALIZE_STRETCH, val);
 }
 
 void TW_CALL getNormalizeStretch(void *value, void *clientData)
 {
-	*(bool *)(value) = ((SimulationModel*)clientData)->getValue<Real>(SimulationModel::SOLID_NORMALIZE_STRETCH);
+	*(bool *)(value) = ((SimulationModel*)clientData)->getValue<bool>(SimulationModel::SOLID_NORMALIZE_STRETCH);
 }
 
 void TW_CALL setNormalizeShear(const void *value, void *clientData)
 {
 	const bool val = *(const bool *)(value);
-	((SimulationModel*)clientData)->setValue<Real>(SimulationModel::SOLID_NORMALIZE_SHEAR, val);
+	((SimulationModel*)clientData)->setValue<bool>(SimulationModel::SOLID_NORMALIZE_SHEAR, val);
 }
 
 void TW_CALL getNormalizeShear(void *value, void *clientData)
 {
-	*(bool *)(value) = ((SimulationModel*)clientData)->getValue<Real>(SimulationModel::SOLID_NORMALIZE_SHEAR);
+	*(bool *)(value) = ((SimulationModel*)clientData)->getValue<bool>(SimulationModel::SOLID_NORMALIZE_SHEAR);
 }
 
 void TW_CALL setSimulationMethod(const void *value, void *clientData)

Demos/ClothDemo/CMakeLists.txt

@@ -1,17 +1,16 @@
-set(SIMULATION_LINK_LIBRARIES AntTweakBar glew PositionBasedDynamics Simulation Utils)
-set(SIMULATION_DEPENDENCIES AntTweakBar glew PositionBasedDynamics Simulation Utils)
+set(SIMULATION_LINK_LIBRARIES AntTweakBar glfw PositionBasedDynamics Simulation Utils)
+set(SIMULATION_DEPENDENCIES AntTweakBar glfw PositionBasedDynamics Simulation Utils)
 
 if(WIN32)
-  set(SIMULATION_LINK_LIBRARIES freeglut opengl32.lib glu32.lib ${SIMULATION_LINK_LIBRARIES})
-  set(SIMULATION_DEPENDENCIES freeglut ${SIMULATION_DEPENDENCIES})
+  set(SIMULATION_LINK_LIBRARIES opengl32.lib glu32.lib ${SIMULATION_LINK_LIBRARIES})
+  #set(SIMULATION_DEPENDENCIES ${SIMULATION_DEPENDENCIES})
 else()
   set(OpenGL_GL_PREFERENCE GLVND)
-  find_package(GLUT REQUIRED)
   find_package(OpenGL REQUIRED)
+  include_directories( ${OPENGL_INCLUDE_DIRS})
 
   set(SIMULATION_LINK_LIBRARIES
     ${SIMULATION_LINK_LIBRARIES}
-    ${GLUT_LIBRARIES}
     ${OPENGL_LIBRARIES}
   )
 endif()

Demos/ClothDemo/main.cpp

@@ -1,7 +1,6 @@
 #include "Common/Common.h"
 #include "Demos/Visualization/MiniGL.h"
 #include "Demos/Visualization/Selection.h"
-#include "GL/glut.h"
 #include "Simulation/TimeManager.h"
 #include <Eigen/Dense>
 #include "Simulation/SimulationModel.h"
@@ -60,11 +59,9 @@ int main( int argc, char **argv )
 
 	initParameters();
 
-	Simulation::getCurrent()->setSimulationMethodChangedCallback([&]() { reset(); initParameters(); base->getSceneLoader()->readParameterObject(Simulation::getCurrent()->getTimeStep()); });
-
 	// OpenGL
-	MiniGL::setClientIdleFunc (50, timeStep);		
-	MiniGL::setKeyFunc(0, 'r', reset);
+	MiniGL::setClientIdleFunc (timeStep);		
+	MiniGL::addKeyFunc('r', reset);
 	MiniGL::setClientSceneFunc(render);			
 	MiniGL::setViewport (40.0f, 0.1f, 500.0f, Vector3r (5.0, 10.0, 30.0), Vector3r (5.0, 0.0, 0.0));
 
@@ -73,7 +70,7 @@ int main( int argc, char **argv )
 	TwType enumType3 = TwDefineEnum("BendingMethodType", NULL, 0);
 	TwAddVarCB(MiniGL::getTweakBar(), "BendingMethod", enumType3, setBendingMethod, getBendingMethod, &bendingMethod, " label='Bending method' enum='0 {None}, 1 {Dihedral angle}, 2 {Isometric bending}' group=Bending");
 
-	glutMainLoop ();	
+	MiniGL::mainLoop();	
 
 	base->cleanup();
 

Demos/Common/DemoBase.cpp

@@ -4,7 +4,6 @@
 #include "Utils/FileSystem.h"
 #include "Simulation/TimeManager.h"
 #include "Demos/Visualization/Selection.h"
-#include "GL/glut.h"
 #include "Simulation/Simulation.h"
 #include "NumericParameter.h"
 #include "Utils/Logger.h"
@@ -174,7 +173,7 @@ void DemoBase::init(int argc, char **argv, const char *demoName)
 	LOG_DEBUG << "Host name:   " << SystemInfo::getHostName();
 
 	// OpenGL
-	MiniGL::init(argc, argv, 1024, 768, 0, 0, demoName);
+	MiniGL::init(argc, argv, 1280, 1024, demoName);
 	MiniGL::initLights();
 	MiniGL::initTexture();
 	MiniGL::getOpenGLVersion(m_context_major_version, m_context_minor_version);
@@ -183,6 +182,13 @@ void DemoBase::init(int argc, char **argv, const char *demoName)
 
 	if (MiniGL::checkOpenGLVersion(3, 3))
 		initShaders();
+
+	MiniGL::addReshapeFunc([](int width, int height) { TwWindowSize(width, height); });
+	MiniGL::addKeyboardFunc([](int key, int scancode, int action, int mods) -> bool { return TwEventKeyGLFW(key, action); });
+	MiniGL::addCharFunc([](int key, int action) -> bool { return TwEventCharGLFW(key, action); });
+	MiniGL::addMousePressFunc([](int button, int action, int mods) -> bool { return TwEventMouseButtonGLFW(button, action); });
+	MiniGL::addMouseMoveFunc([](int x, int y) -> bool { return TwEventMousePosGLFW(x, y); });
+	MiniGL::addMouseWheelFunc([](int pos, double xoffset, double yoffset) -> bool { return TwEventMouseWheelGLFW(pos); });
 }
 
 void DemoBase::readScene()
@@ -224,6 +230,21 @@ void DemoBase::initShaders()
 	m_shaderTex.addUniform("shininess");
 	m_shaderTex.addUniform("specular_factor");
 	m_shaderTex.end();
+
+	vertFile = m_dataPath + "/shaders/vs_flat.glsl";
+	std::string geomFile = m_dataPath + "/shaders/gs_flat.glsl";
+	fragFile = m_dataPath + "/shaders/fs_flat.glsl";
+	m_shaderFlat.compileShaderFile(GL_VERTEX_SHADER, vertFile);
+	m_shaderFlat.compileShaderFile(GL_GEOMETRY_SHADER, geomFile);
+	m_shaderFlat.compileShaderFile(GL_FRAGMENT_SHADER, fragFile);
+	m_shaderFlat.createAndLinkProgram();
+	m_shaderFlat.begin();
+	m_shaderFlat.addUniform("modelview_matrix");
+	m_shaderFlat.addUniform("projection_matrix");
+	m_shaderFlat.addUniform("surface_color");
+	m_shaderFlat.addUniform("shininess");
+	m_shaderFlat.addUniform("specular_factor");
+	m_shaderFlat.end();
 }
 
 
@@ -267,6 +288,26 @@ void DemoBase::shaderEnd()
 	m_shader.end();
 }
 
+void DemoBase::shaderFlatBegin(const float* col)
+{
+	m_shaderFlat.begin();
+	glUniform1f(m_shaderFlat.getUniform("shininess"), 5.0f);
+	glUniform1f(m_shaderFlat.getUniform("specular_factor"), 0.2f);
+
+	GLfloat matrix[16];
+	glGetFloatv(GL_MODELVIEW_MATRIX, matrix);
+	glUniformMatrix4fv(m_shaderFlat.getUniform("modelview_matrix"), 1, GL_FALSE, matrix);
+	GLfloat pmatrix[16];
+	glGetFloatv(GL_PROJECTION_MATRIX, pmatrix);
+	glUniformMatrix4fv(m_shaderFlat.getUniform("projection_matrix"), 1, GL_FALSE, pmatrix);
+	glUniform3fv(m_shaderFlat.getUniform("surface_color"), 1, col);
+}
+
+void DemoBase::shaderFlatEnd()
+{
+	m_shaderFlat.end();
+}
+
 void DemoBase::readParameters()
 {
 	m_sceneLoader->readParameterObject(this);
@@ -278,7 +319,7 @@ void DemoBase::readParameters()
 void DemoBase::render()
 {
 	float gridColor[4] = { 0.2f, 0.2f, 0.2f, 1.0f };
-	MiniGL::drawGrid(gridColor);
+	MiniGL::drawGrid_xz(gridColor);
 
 	MiniGL::coordinateSystem();
 
@@ -290,7 +331,7 @@ void DemoBase::render()
 	SimulationModel::ParticleRigidBodyContactConstraintVector &particleRigidBodyContacts = model->getParticleRigidBodyContactConstraints();
 
 	float selectionColor[4] = { 0.8f, 0.0f, 0.0f, 1 };
-	float surfaceColor[4] = { 0.3f, 0.5f, 0.8f, 1 };
+	float surfaceColor[4] = { 0.1f, 0.4f, 0.7f, 1 };
 	float staticColor[4] = { 0.5f, 0.5f, 0.5f, 1 };
 
 	if (m_renderContacts)
@@ -302,8 +343,6 @@ void DemoBase::render()
 	}
 
 
-	shaderBegin(staticColor);
-
 	for (size_t i = 0; i < rb.size(); i++)
 	{
 		bool selected = false;
@@ -315,6 +354,12 @@ void DemoBase::render()
 
 		const VertexData &vd = rb[i]->getGeometry().getVertexData();
 		const IndexedFaceMesh &mesh = rb[i]->getGeometry().getMesh();
+
+		if (mesh.getFlatShading())
+			shaderFlatBegin(staticColor);
+		else
+			shaderBegin(staticColor);
+
 		if (!selected)
 		{
 			if (rb[i]->getMass() == 0.0)
@@ -333,9 +378,14 @@ void DemoBase::render()
 			glUniform3fv(m_shader.getUniform("surface_color"), 1, selectionColor);
 			Visualization::drawMesh(vd, mesh, 0, selectionColor);
 		}
+
+		if (mesh.getFlatShading())
+			shaderFlatEnd();
+		else
+			shaderEnd();
 	}
 
-	shaderEnd();
+	
 
 	renderTriangleModels();
 	renderTetModels();
@@ -538,7 +588,7 @@ void DemoBase::renderTetModels()
 {
 	SimulationModel *model = Simulation::getCurrent()->getModel();
 	const ParticleData &pd = model->getParticles();
-	float surfaceColor[4] = { 0.1f, 0.3f, 0.5f, 1 };
+	float surfaceColor[4] = { 0.1f, 0.4f, 0.7f, 1 };
 
 	shaderBegin(surfaceColor);
 
@@ -800,7 +850,7 @@ void DemoBase::mouseMove(int x, int y, void *clientData)
 	base->m_oldMousePos = mousePos;
 }
 
-void DemoBase::selection(const Eigen::Vector2i &start, const Eigen::Vector2i &end, void *clientData)
+void DemoBase::selection(const Vector2i &start, const Vector2i &end, void *clientData)
 {
 	SimulationModel *model = Simulation::getCurrent()->getModel();
 	DemoBase *base = (DemoBase*)clientData;
@@ -824,7 +874,7 @@ void DemoBase::selection(const Eigen::Vector2i &start, const Eigen::Vector2i &en
 	if (rb.size() > 0)
 		Selection::selectRect(start, end, &x[0], &x[rb.size() - 1], base->m_selectedBodies);
 	if ((base->m_selectedBodies.size() > 0) || (base->m_selectedParticles.size() > 0))
-		MiniGL::setMouseMoveFunc(GLUT_MIDDLE_BUTTON, mouseMove);
+		MiniGL::setMouseMoveFunc(2, mouseMove);
 	else
 		MiniGL::setMouseMoveFunc(-1, NULL);
 

Demos/Common/DemoBase.h

@@ -24,6 +24,7 @@ namespace PBD
 		GLint m_context_major_version;
 		GLint m_context_minor_version;
 		Shader m_shader;
+		Shader m_shaderFlat;
 		Shader m_shaderTex;
 		bool m_doPause;
 		Real m_pauseAt;
@@ -46,7 +47,7 @@ namespace PBD
 
 		void initShaders();
 
-		static void selection(const Eigen::Vector2i &start, const Eigen::Vector2i &end, void *clientData);
+		static void selection(const Vector2i &start, const Vector2i &end, void *clientData);
 		static void mouseMove(int x, int y, void *clientData);
 
 		void renderTriangleModels();
@@ -105,10 +106,13 @@ namespace PBD
 		GLint getContextMinorVersion() const { return m_context_minor_version; }
 		Shader& getShader() { return m_shader; }
 		Shader& getShaderTex() { return m_shaderTex; }
+		Shader& getShaderFlat() { return m_shaderFlat; }
 		void shaderTexBegin(const float *col);
 		void shaderTexEnd();
 		void shaderBegin(const float *col);
 		void shaderEnd();
+		void shaderFlatBegin(const float* col);
+		void shaderFlatEnd();
 
 		std::vector<unsigned int>& getSelectedParticles() { return m_selectedParticles; }
 		std::vector<unsigned int>& getSelectedRigidBodies() { return m_selectedBodies; }