- added PLY exporter

- improved the DFSPH implementation significantly
- added documentation for DFSPH
- improved GUI
- updated imgui
- removed AntTweakBar
- bugfixes
- implemented an AVX version of XSPH

Author: janbender

CMakeLists.txt

@@ -21,8 +21,6 @@ endif()
 
 set(TOPLEVEL_INCLUDE_DIR ${PROJECT_SOURCE_DIR})
 
-option(USE_IMGUI "Use imgui instead of AntTweakBar"	ON)
-
 ################################################################################
 # foreign external libraries
 ################################################################################
@@ -32,11 +30,8 @@ add_subdirectory(extern/md5)
 add_subdirectory(extern/tinyexpr)
 if (NOT SPH_LIBS_ONLY)
 	add_subdirectory(extern/glfw)
-	if (USE_IMGUI)
-		add_subdirectory(extern/imgui)
-	else()
-		add_subdirectory(extern/AntTweakBar)
-	endif()
+	add_subdirectory(extern/imgui)
+	add_subdirectory(extern/nfd)
 	if (USE_PYTHON_BINDINGS)
 		add_subdirectory(extern/pybind)
 	endif ()

Changelog.txt

@@ -1,3 +1,13 @@
+2.12.0
+	- added PLY exporter
+	- improved the DFSPH implementation significantly
+	- added documentation for DFSPH
+	- improved GUI
+	- updated imgui
+	- removed AntTweakBar
+	- bugfixes
+	- implemented an avx version of XSPH
+
 2.11.6
 	- updated Catch2
 	- fixes for new gcc version

GUI/OpenGL/MiniGL.cpp

@@ -53,6 +53,7 @@ unsigned char MiniGL::texData[IMAGE_ROWS][IMAGE_COLS][3];
 unsigned int MiniGL::m_texId = 0;
 void(*MiniGL::selectionfunc)(const Vector2i&, const Vector2i&, void*) = NULL;
 void *MiniGL::selectionfuncClientData = NULL;
+bool MiniGL::selectionMode = false;
 void(*MiniGL::mousefunc)(int, int, void*) = NULL;
 int MiniGL::mouseFuncButton;
 Vector2i MiniGL::m_selectionStart;
@@ -790,7 +791,10 @@ void MiniGL::mousePress(GLFWwindow* window, int button, int action, int mods)
 		if (button == GLFW_MOUSE_BUTTON_1)
 		{
 			if (action == GLFW_PRESS)
+			{
 				m_selectionStart = Vector2i(mouse_pos_x_old, mouse_pos_y_old);
+				selectionMode = true;
+			}
 			else
 			{
 				if (m_selectionStart[0] != -1)
@@ -799,6 +803,7 @@ void MiniGL::mousePress(GLFWwindow* window, int button, int action, int mods)
 					selectionfunc(m_selectionStart, pos, selectionfuncClientData);
 				}
 				m_selectionStart = Vector2i(-1, -1);
+				selectionMode = false;
 			}
 		}
 	}
@@ -948,6 +953,29 @@ void MiniGL::error_callback(int error, const char* description)
 	LOG_ERR << description;
 }
 
+void MiniGL::drawSelectionRect()
+{
+	glDisable(GL_LIGHTING);
+	glPushMatrix();
+	glLoadIdentity();
+	glMatrixMode(GL_PROJECTION);
+	glPushMatrix();
+	glLoadIdentity();
+	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(mouse_pos_x_old, mouse_pos_y_old);
+	glVertex2f(mouse_pos_x_old, m_selectionStart[1]);
+	glEnd();
+	glPopMatrix();
+	glMatrixMode(GL_MODELVIEW);
+
+	glPopMatrix();
+	glEnable(GL_LIGHTING);
+}
+
 void MiniGL::mainLoop()
 {
 	while (!glfwWindowShouldClose(m_glfw_window))
@@ -963,6 +991,9 @@ void MiniGL::mainLoop()
 		if (scenefunc != nullptr)
 			scenefunc();
 
+		if (selectionMode)
+			drawSelectionRect();
+
 		glfwSwapBuffers(m_glfw_window);
 		//glFlush();
 	}
@@ -988,6 +1019,26 @@ void MiniGL::swapBuffers()
 	//glFlush();
 }
 
+void MiniGL::getWindowPos(int &x, int &y)
+{
+	glfwGetWindowPos(m_glfw_window, &x, &y);
+}
+
+void MiniGL::getWindowSize(int& w, int& h)
+{
+	glfwGetWindowSize(m_glfw_window, &w, &h);
+}
+
+void MiniGL::setWindowPos(int x, int y)
+{
+	glfwSetWindowPos(m_glfw_window, x, y);
+}
+
+void MiniGL::setWindowSize(int w, int h)
+{
+	glfwSetWindowSize(m_glfw_window, w, h);
+}
+
 void MiniGL::breakPointMainLoop()
 {
 	if (m_breakPointActive)

GUI/OpenGL/MiniGL.h

@@ -107,6 +107,7 @@ namespace SPH
 		static unsigned int m_texId;
 		static void(*selectionfunc) (const Vector2i&, const Vector2i&, void*);
 		static void* selectionfuncClientData;
+		static bool selectionMode;
 		static void(*mousefunc)(int, int, void*);
 		static int mouseFuncButton;		
 		static Vector2i m_selectionStart;
@@ -131,6 +132,7 @@ namespace SPH
 	public:
 		static void getOpenGLVersion(int &major_version, int &minor_version);
 		static void coordinateSystem ();
+		static void drawSelectionRect();
 		static void drawVector(const Vector3r &a, const Vector3r &b, const float w, float *color);
 		/** Renders a closed cylinder between two points.
 		*/
@@ -205,6 +207,10 @@ namespace SPH
 		static void swapBuffers();
 
 		static GLFWwindow* getWindow() { return m_glfw_window; }
+		static void getWindowPos(int& x, int& y);
+		static void getWindowSize(int& w, int& h);
+		static void setWindowPos(int x, int y);
+		static void setWindowSize(int w, int h);
 	};
 }