Skip to content

Commit

Permalink
Merge branch 'dev' into alpha
Browse files Browse the repository at this point in the history
  • Loading branch information
larc committed Nov 19, 2023
2 parents 5dbdfd9 + 6ba2ffa commit 288c63b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 0 additions & 2 deletions include/gproshan/app_viewer.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ class app_viewer : public viewer
protected:
virtual void init();

che * load_mesh(const std::string & file_path);

// Point Cloud
static bool process_knn(viewer * p_view);
static bool process_compute_normals(viewer * p_view);
Expand Down
9 changes: 4 additions & 5 deletions src/gproshan/viewer/viewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -608,13 +608,12 @@ void viewer::keyboard_callback(GLFWwindow * window, int key, int, int action, in
if(action == GLFW_RELEASE) return;

viewer * view = (viewer *) glfwGetWindowUserPointer(window);
if(view->processes.find(key) == view->processes.end())
return;

process_t & pro = view->processes[key];
if(pro.function)
{
pro.selected = view->hide_imgui ? pro.function(view) && pro.selected : !pro.selected;
view->update_status_message("%s", pro.selected ? pro.name : "");
}
pro.selected = view->hide_imgui ? pro.function(view) && pro.selected : !pro.selected;
view->update_status_message("%s", pro.selected ? pro.name : "");
}

void viewer::mouse_callback(GLFWwindow * window, int button, int action, int mods)
Expand Down

0 comments on commit 288c63b

Please sign in to comment.