- all scene file parameters are now GenericParameters

- updated Python examples
- added ParameterParser tool which can generate a scene file json schema or an example scene file with all parameters
- added json schema for scene files
- fixed OBJ meshes
- updated glfw
- updated pybind11

Author: janbender

CMake/DataCopyTargets.cmake

@@ -24,9 +24,9 @@ add_dependencies(CopyPBDShaders Ext_PBD)
 set_target_properties(CopyPBDShaders PROPERTIES FOLDER "Data copy")
 
 add_custom_target(CopyImguiFonts
-	${CMAKE_COMMAND} -E copy
-	${PROJECT_SOURCE_DIR}/extern/imgui/misc/fonts/Roboto-Medium.ttf
-	${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/resources/fonts/Roboto-Medium.ttf
+	${CMAKE_COMMAND} -E copy_directory
+	${PROJECT_SOURCE_DIR}/extern/imgui/misc/fonts
+	${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/resources/fonts
 	COMMENT "Copying fonts"
 )
-set_target_properties(CopyImguiFonts PROPERTIES FOLDER "Data copy")
+set_target_properties(CopyImguiFonts PROPERTIES FOLDER "Data copy")

CMake/SetUpExternalProjects.cmake

@@ -33,7 +33,7 @@ ExternalProject_Add(
 	Ext_GenericParameters
 	PREFIX "${CMAKE_BINARY_DIR}/extern/GenericParameters"
 	GIT_REPOSITORY https://github.com/InteractiveComputerGraphics/GenericParameters.git
-	GIT_TAG "89ae733fb8b8b9df25d0e44a0e49e51136901e8c"
+	GIT_TAG "42d52ad551fafba600ee99e59fb0f9c7b557e2ed"
 	INSTALL_DIR ${ExternalInstallDir}/GenericParameters
 	CMAKE_ARGS -DCMAKE_BUILD_TYPE=${EXT_CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=${ExternalInstallDir}/GenericParameters -DGENERICPARAMETERS_NO_TESTS:BOOL=1 -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
 )
@@ -47,7 +47,7 @@ ExternalProject_Add(
 	Ext_PBD
 	PREFIX "${CMAKE_BINARY_DIR}/extern/PositionBasedDynamics"
 	GIT_REPOSITORY https://github.com/InteractiveComputerGraphics/PositionBasedDynamics.git
-	GIT_TAG "544cc0cba4db8cabe2217cd48b87fb095848ea92"
+	GIT_TAG "06e18ba4c1fab9401a494f5479e026641467f22e"
 	INSTALL_DIR ${ExternalInstallDir}/PositionBasedDynamics
 	DEPENDS Ext_GenericParameters Ext_Discregrid
 	CMAKE_ARGS -DCMAKE_BUILD_TYPE=${EXT_CMAKE_BUILD_TYPE}

Changelog.txt

@@ -1,3 +1,12 @@
+2.12.1
+	- all scene file parameters are now GenericParameters
+	- updated Python examples
+	- added ParameterParser tool which can generate a scene file json schema or an example scene file with all parameters
+	- added json schema for scene files 
+	- fixed OBJ meshes
+	- updated glfw
+	- updated pybind11 
+
 2.12.0
 	- added PLY exporter
 	- improved the DFSPH implementation significantly

GUI/OpenGL/MiniGL.cpp

@@ -70,6 +70,8 @@ std::vector<MiniGL::MousePressFct> MiniGL::m_mousePressFct;
 std::vector<MiniGL::MouseMoveFct> MiniGL::m_mouseMoveFct;
 std::vector<MiniGL::MouseWheelFct> MiniGL::m_mouseWheelFct;
 GLFWwindow* MiniGL::m_glfw_window = nullptr;
+bool MiniGL::m_vsync = false;
+double MiniGL::m_lastTime;
 
 void MiniGL::bindTexture()
 {
@@ -468,14 +470,15 @@ void MiniGL::setClientSceneFunc (SceneFct func)
 	scenefunc = func;
 }
 
-void MiniGL::init(int argc, char **argv, const int width, const int height, const char *name)
+void MiniGL::init(const int width, const int height, const char *name, const bool vsync, const bool maximized)
 {
 	fovy = 60;
 	znear = 0.5f;
 	zfar = 1000;
 
 	m_width = width;
 	m_height = height;
+	m_vsync = vsync;
 
 	scenefunc = nullptr;
 
@@ -488,7 +491,13 @@ void MiniGL::init(int argc, char **argv, const int width, const int height, cons
 	//glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
 	//glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
 
-	//glfwWindowHint(GLFW_DOUBLEBUFFER, GL_FALSE);
+	if (maximized)
+		glfwWindowHint(GLFW_MAXIMIZED, GLFW_TRUE);
+
+	if (m_vsync)
+		glfwWindowHint(GLFW_DOUBLEBUFFER, GL_TRUE);
+	else 
+		glfwWindowHint(GLFW_DOUBLEBUFFER, GL_FALSE);
 	m_glfw_window = glfwCreateWindow(width, height, name, NULL, NULL);
 	if (!m_glfw_window)
 	{
@@ -525,6 +534,8 @@ void MiniGL::init(int argc, char **argv, const int width, const int height, cons
 	glfwSetScrollCallback(m_glfw_window, mouseWheel);
 
 	glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
+
+	m_lastTime = glfwGetTime();
 }
 
 void MiniGL::initTexture()
@@ -604,12 +615,12 @@ void MiniGL::setClientDestroyFunc(DestroyFct func)
 	destroyfunc = func;
 }
 
-void MiniGL::addKeyFunc (unsigned char k, std::function<void()> const& func)
+void MiniGL::addKeyFunc(int key, int modifiers, std::function<void()> const& func)
 {
 	if (func == nullptr)
 		return;
 	else
-		keyfunc.push_back({ func, k });
+		keyfunc.push_back({ func, key, modifiers });
 }
 
 void MiniGL::keyboard(GLFWwindow* window, int key, int scancode, int action, int mods)
@@ -621,6 +632,13 @@ void MiniGL::keyboard(GLFWwindow* window, int key, int scancode, int action, int
 			return;
 	}
 
+	// execute user key functions
+	for (int i = 0; i < keyfunc.size(); i++)
+	{
+		if ((key == keyfunc[i].key) && (mods == keyfunc[i].modifiers) && (action == GLFW_PRESS))
+			keyfunc[i].fct();
+	}
+
 	if (key == GLFW_KEY_ESCAPE)
 	{
 		m_breakPointLoop = false;
@@ -657,19 +675,14 @@ void MiniGL::char_callback(GLFWwindow* window, unsigned int codepoint)
 			return;
 	}
 
-	for (int i = 0; i < keyfunc.size(); i++)
-	{
-		if (codepoint == keyfunc[i].key)
-			keyfunc[i].fct();
-		else if (codepoint == GLFW_KEY_1)
-			rotateX(-turnspeed);
-		else if (codepoint == GLFW_KEY_2)
-			rotateX(turnspeed);
-		else if (codepoint == GLFW_KEY_3)
-			rotateY(-turnspeed);
-		else if (codepoint == GLFW_KEY_4)
-			rotateY(turnspeed);
-	}
+	if (codepoint == GLFW_KEY_1)
+		rotateX(-turnspeed);
+	else if (codepoint == GLFW_KEY_2)
+		rotateX(turnspeed);
+	else if (codepoint == GLFW_KEY_3)
+		rotateY(-turnspeed);
+	else if (codepoint == GLFW_KEY_4)
+		rotateY(turnspeed);
 }
 
 void MiniGL::setProjectionMatrix (int width, int height) 
@@ -964,8 +977,8 @@ void MiniGL::drawSelectionRect()
 	glOrtho(0.0f, m_width, m_height, 0.0f, -1.0f, 1.0f);
 	glBegin(GL_LINE_LOOP);
 	glColor3f(1, 0, 0); //Set the colour to red 
-	glVertex2f(m_selectionStart[0], m_selectionStart[1]);
-	glVertex2f(m_selectionStart[0], mouse_pos_y_old);
+	glVertex2f(static_cast<GLfloat>(m_selectionStart[0]), static_cast<GLfloat>(m_selectionStart[1]));
+	glVertex2f(static_cast<GLfloat>(m_selectionStart[0]), static_cast<GLfloat>(mouse_pos_y_old));
 	glVertex2f(mouse_pos_x_old, mouse_pos_y_old);
 	glVertex2f(mouse_pos_x_old, m_selectionStart[1]);
 	glEnd();
@@ -980,22 +993,30 @@ void MiniGL::mainLoop()
 {
 	while (!glfwWindowShouldClose(m_glfw_window))
 	{
-		glfwPollEvents();
-
 		if (idlefunc != nullptr)
 			idlefunc();
 
-		glPolygonMode(GL_FRONT_AND_BACK, drawMode);
-		viewport();
+		double currentTime = glfwGetTime();
+		if (currentTime - m_lastTime >= 1.0 / 60.0)  // render at maximum at 60 fps
+		{
+			glfwPollEvents();
+
+			glPolygonMode(GL_FRONT_AND_BACK, drawMode);
+			viewport();
+
+			if (scenefunc != nullptr)
+				scenefunc();
 
-		if (scenefunc != nullptr)
-			scenefunc();
+			if (selectionMode)
+				drawSelectionRect();
 
-		if (selectionMode)
-			drawSelectionRect();
+			if (m_vsync)
+				glfwSwapBuffers(m_glfw_window);
+			else
+				glFlush();
 
-		glfwSwapBuffers(m_glfw_window);
-		//glFlush();
+			m_lastTime = currentTime;
+		}
 	}
 
 	if (destroyfunc != nullptr)
@@ -1015,8 +1036,10 @@ void MiniGL::leaveMainLoop()
 
 void MiniGL::swapBuffers()
 {
-	glfwSwapBuffers(m_glfw_window);
-	//glFlush();
+	if (m_vsync)
+		glfwSwapBuffers(m_glfw_window);
+	else
+		glFlush();
 }
 
 void MiniGL::getWindowPos(int &x, int &y)
@@ -1039,6 +1062,19 @@ void MiniGL::setWindowSize(int w, int h)
 	glfwSetWindowSize(m_glfw_window, w, h);
 }
 
+bool MiniGL::getWindowMaximized()
+{
+	return glfwGetWindowAttrib(m_glfw_window, GLFW_MAXIMIZED);
+}
+
+void MiniGL::setWindowMaximized(const bool b)
+{
+	if (b)
+		glfwRestoreWindow(m_glfw_window);
+	else 
+		glfwRestoreWindow(m_glfw_window);
+}
+
 void MiniGL::breakPointMainLoop()
 {
 	if (m_breakPointActive)
@@ -1052,8 +1088,10 @@ void MiniGL::breakPointMainLoop()
 			if (scenefunc != nullptr)
 				scenefunc();
 
-			glfwSwapBuffers(m_glfw_window);
-			//glFlush();
+			if (m_vsync)
+				glfwSwapBuffers(m_glfw_window);
+			else
+				glFlush();
 			glfwPollEvents();
 		}
 	}

GUI/OpenGL/MiniGL.h

@@ -63,7 +63,8 @@ namespace SPH
 		struct KeyFunction
 		{
 			std::function<void()> fct;
-			unsigned char key;
+			int key;
+			int modifiers;
 		};
 
 		typedef std::function<void()> SceneFct;
@@ -119,6 +120,8 @@ namespace SPH
 		static bool m_breakPointLoop;
 		static GLUquadricObj* m_sphereQuadric;
 		static GLFWwindow* m_glfw_window;
+		static bool m_vsync;
+		static double m_lastTime;
 
 		static void reshape (GLFWwindow* glfw_window, int w, int h);
 		static void keyboard(GLFWwindow* window, int key, int scancode, int action, int mods);		
@@ -153,9 +156,9 @@ namespace SPH
 		static void setClientSceneFunc (SceneFct func);
 		static void setClientIdleFunc (IdleFct func);
 		static void setClientDestroyFunc(DestroyFct func);
-		static void addKeyFunc(unsigned char k, std::function<void()> const& func);
+		static void addKeyFunc(int key, int modifiers, std::function<void()> const& func);
 		static std::vector<KeyFunction> &getKeyFunc() { return keyfunc; }
-		static void init(int argc, char **argv, const int width, const int height, const char *name);
+		static void init(const int width, const int height, const char* name, const bool vsync, const bool maximized = false);
 		static void destroy ();
 		static void viewport ();
 		static void initLights ();
@@ -176,6 +179,7 @@ namespace SPH
 		static void hsvToRgb(float h, float s, float v, float *rgb);
 		static void rgbToHsv(float r, float g, float b, float *hsv);
 		static int getModifierKey() { return modifier_key; }
+		static bool getVSync() { return m_vsync; }
 
 		static void addReshapeFunc(ReshapeFct func) { m_reshapeFct.push_back(func); }
 		static std::vector<ReshapeFct> &getReshapeFunc() { return m_reshapeFct; }
@@ -211,6 +215,8 @@ namespace SPH
 		static void getWindowSize(int& w, int& h);
 		static void setWindowPos(int x, int y);
 		static void setWindowSize(int w, int h);
+		static bool getWindowMaximized();
+		static void setWindowMaximized(const bool b);
 	};
 }
 

GUI/imgui/imguiParameters.cpp

@@ -243,15 +243,6 @@ void imguiParameters::createSubgroupParameters(const std::vector<std::pair<std::
 
 void imguiParameters::createParameterGUI()
 {
-	//struct Comparator {
-	//	bool operator()(std::pair<std::string, std::vector<std::pair<std::string, std::vector<imguiParameters::imguiParameter*>>>>& p1,
-	//		std::pair<std::string, std::vector<std::pair<std::string, std::vector<imguiParameters::imguiParameter*>>>>& p2)
-	//	{
-	//		return p1.first.compare(p2.first) < 0;
-	//	}
-	//};
-	//std::sort(m_imguiParams.begin(), m_imguiParams.end(), Comparator());
-
 	// always show "General"
 	for (auto group_index = 0; group_index < m_imguiParams.size(); group_index++)
 	{
@@ -302,6 +293,10 @@ void imguiParameters::createParameterObjectGUI(ParameterObject* paramObj)
 	for (unsigned int i = 0; i < numParams; i++)
 	{
 		ParameterBase* paramBase = paramObj->getParameter(i);
+
+		if (!paramBase->getVisible())
+			continue;
+
 		std::string group = paramBase->getGroup();
 		std::string subgroup = "";
 

README.md

@@ -55,7 +55,7 @@ For Windows and Linux targets there exists prebuilt python wheel files which can
 ```
 pip install pysplishsplash
 ```
-These are available for Python Versions: 2.7, 3.5, 3.6, 3.7, 3.8.
+These are available for Python Versions. See also here: [pySPlisHSPlasH](https://pypi.org/project/pySPlisHSPlasH/).
 If you do not meet these conditions please refer to the build instructions and to the python binding 
 [Getting started guide](https://github.com/InteractiveComputerGraphics/SPlisHSPlasH/blob/master/doc/py_getting_started.md).
 

SPlisHSPlasH/CMakeLists.txt

@@ -149,11 +149,13 @@ set(UTILS_HEADER_FILES
 	Utilities/MathFunctions.h
 	Utilities/GaussQuadrature.h
 	Utilities/MatrixFreeSolver.h
+	Utilities/MeshImport.h
 	Utilities/SurfaceSampling.h
 	Utilities/PoissonDiskSampling.h
 	Utilities/RegularTriangleSampling.h
 	Utilities/RegularSampling2D.h
 	Utilities/SceneLoader.h
+	Utilities/SceneParameterObjects.h
 	Utilities/SceneWriter.h
 	Utilities/VolumeSampling.h
 	Utilities/SDFFunctions.h
@@ -166,10 +168,12 @@ set(UTILS_SOURCE_FILES
 	Utilities/DebugTools.cpp
 	Utilities/MathFunctions.cpp
 	Utilities/GaussQuadrature.cpp
+	Utilities/MeshImport.cpp
 	Utilities/PoissonDiskSampling.cpp
 	Utilities/RegularTriangleSampling.cpp
 	Utilities/RegularSampling2D.cpp
 	Utilities/SceneLoader.cpp
+	Utilities/SceneParameterObjects.cpp
 	Utilities/SceneWriter.cpp
 	Utilities/VolumeSampling.cpp
 	Utilities/SDFFunctions.cpp