Merge branch 'dev' into alpha

larc · Nov 27, 2023 · cec473c · cec473c
2 parents 79dd1e6 + 6ec3ac2
commit cec473c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/include/gproshan/app_viewer.h b/include/gproshan/app_viewer.h
@@ -49,7 +49,7 @@ class app_viewer : public viewer
 		double time;
 
 	public:
-		app_viewer() = default;
+		app_viewer(const char * title = "gproshan", const int & width = 1600, const int & height = 900);
 		virtual ~app_viewer();
 
 		int main(int nargs, const char ** args);

diff --git a/include/gproshan/viewer/viewer.h b/include/gproshan/viewer/viewer.h
@@ -104,7 +104,7 @@ class viewer
 		char status_message[1024] = {};
 
 	public:
-		viewer(const int & width = 1600, const int & height = 900);
+		viewer(const char * title = "gproshan", const int & width = 1600, const int & height = 900);
 		virtual ~viewer();
 
 		che_viewer & selected_mesh();
@@ -120,7 +120,7 @@ class viewer
 		virtual bool run();
 
 		void info_gl();
-		void init_gl();
+		void init_gl(const char * title);
 		void init_imgui();
 		void init_menus();
 		void init_glsl();

diff --git a/src/gproshan/app_viewer.cpp b/src/gproshan/app_viewer.cpp
@@ -14,6 +14,8 @@ using namespace gproshan::mdict;
 namespace gproshan {
 
 
+app_viewer::app_viewer(const char * title, const int & width, const int & height): viewer(title, width, height) {}
+
 app_viewer::~app_viewer()
 {
 	for(auto & m: meshes)

diff --git a/src/gproshan/util.cpp b/src/gproshan/util.cpp
@@ -24,7 +24,7 @@ size_t partitions::size(const index_t & i) const
 
 partitions::part partitions::operator () (const index_t & i) const
 {
-	assert(i > 0 && i < size(splits));
+	assert(i > 0 && i < std::size(splits));
 	return {splits[i], splits[i + 1], sorted};
 }
 

diff --git a/src/gproshan/viewer/viewer.cpp b/src/gproshan/viewer/viewer.cpp
@@ -62,12 +62,12 @@ const size_t viewer::max_meshes = size(m_window_split) - 1;
 
 che_sphere viewer::sphere_data{0.01};
 
-viewer::viewer(const int & width, const int & height)
+viewer::viewer(const char * title, const int & width, const int & height)
 {
 	window_width = width;
 	window_height = height;
 
-	init_gl();
+	init_gl(title);
 	init_glsl();
 	init_imgui();
 	init_menus();
@@ -398,7 +398,7 @@ void error_callback(int error, const char* description)
 	fprintf(stderr, "Error %d: %s\n", error, description);
 }
 
-void viewer::init_gl()
+void viewer::init_gl(const char * title)
 {
 	glfwSetErrorCallback(error_callback);
 
@@ -413,7 +413,7 @@ void viewer::init_gl()
 
 	gproshan_log_var(window_width);
 	gproshan_log_var(window_height);
-	window = glfwCreateWindow(window_width, window_height, "gproshan", NULL, NULL);
+	window = glfwCreateWindow(window_width, window_height, title, NULL, NULL);
 
 	glfwSetWindowUserPointer(window, this);