rename pick functions

Author: nmwsharp

examples/demo-app/demo_app.cpp

@@ -807,7 +807,7 @@ void callback() {
       std::tie(xInd, yInd) = polyscope::view::screenCoordsToBufferInds(screenCoords);
 
       glm::vec3 worldRay = polyscope::view::screenCoordsToWorldRay(screenCoords);
-      polyscope::PickResult pickResult = polyscope::queryPickAtScreenCoords(screenCoords);
+      polyscope::PickResult pickResult = polyscope::pickAtScreenCoords(screenCoords);
 
       std::cout << "Polyscope scene test click " << std::endl;
       std::cout << "    io.MousePos.x: " << io.MousePos.x << " io.MousePos.y: " << io.MousePos.y << std::endl;

include/polyscope/pick.h

@@ -38,8 +38,8 @@ struct PickResult {
 
 // Query functions to evaluate a pick.
 // Internally, these do a render pass to populate relevant information, then query the resulting buffers.
-PickResult queryPickAtScreenCoords(glm::vec2 screenCoords); // takes screen coordinates
-PickResult queryPickAtBufferInds(glm::ivec2 bufferInds);    // takes indices into render buffer
+PickResult pickAtScreenCoords(glm::vec2 screenCoords); // takes screen coordinates
+PickResult pickAtBufferInds(glm::ivec2 bufferInds);    // takes indices into render buffer
 
 
 // == Stateful picking: track and update a current selection

src/pick.cpp

@@ -10,12 +10,13 @@
 
 namespace polyscope {
 
-PickResult queryPickAtScreenCoords(glm::vec2 screenCoords) {
+PickResult pickAtScreenCoords(glm::vec2 screenCoords) {
   int xInd, yInd;
   glm::ivec2 bufferInds = view::screenCoordsToBufferIndsVec(screenCoords);
-  return queryPickAtBufferInds(bufferInds);
+  return pickAtBufferInds(bufferInds);
 }
-PickResult queryPickAtBufferInds(glm::ivec2 bufferInds) {
+
+PickResult pickAtBufferInds(glm::ivec2 bufferInds) {
   PickResult result;
 
   // Query the pick buffer

src/polyscope.cpp

@@ -405,7 +405,7 @@ void processInputEvents() {
         // Don't pick at the end of a long drag
         if (dragDistSinceLastRelease < dragIgnoreThreshold) {
           ImVec2 p = ImGui::GetMousePos();
-          PickResult pickResult = queryPickAtScreenCoords(glm::vec2{p.x, p.y});
+          PickResult pickResult = pickAtScreenCoords(glm::vec2{p.x, p.y});
           setSelection(pickResult);
         }
 

test/src/camera_view_test.cpp

@@ -75,7 +75,7 @@ TEST_F(PolyscopeTest, CameraViewPick) {
 
   // This probably doesn't actually click on anything, but it does populate the pick buffers and makes sure that nothing
   // crashes
-  polyscope::pick::pickAtScreenCoords(glm::vec2{0.3, 0.8});
+  polyscope::pickAtScreenCoords(glm::vec2{0.3, 0.8});
 
   polyscope::show(3);
 

test/src/curve_network_test.cpp

@@ -33,7 +33,7 @@ TEST_F(PolyscopeTest, CurveNetworkPick) {
   auto psCurve = registerCurveNetwork();
 
   // Don't bother trying to actually click on anything, but make sure this doesn't crash
-  polyscope::pick::evaluatePickQuery(77, 88);
+  polyscope::pickAtBufferInds(glm::ivec2(77, 88));
 
   polyscope::removeAllStructures();
 }

test/src/point_cloud_test.cpp

@@ -66,10 +66,10 @@ TEST_F(PolyscopeTest, PointCloudPick) {
   auto psPoints = registerPointCloud();
 
   // Don't bother trying to actually click on anything, but make sure this doesn't crash
-  polyscope::pick::evaluatePickQuery(77, 88);
+  polyscope::pickAtBufferInds(glm::ivec2(77, 88));
 
   psPoints->setPointRenderMode(polyscope::PointRenderMode::Quad);
-  polyscope::pick::evaluatePickQuery(77, 88);
+  polyscope::pickAtBufferInds(glm::ivec2(77, 88));
 
   polyscope::removeAllStructures();
 }

test/src/surface_mesh_test.cpp

@@ -112,11 +112,11 @@ TEST_F(PolyscopeTest, SurfaceMeshPick) {
   auto psMesh = registerTriangleMesh();
 
   // Don't bother trying to actually click on anything, but make sure this doesn't crash
-  polyscope::pick::evaluatePickQuery(77, 88);
+  polyscope::pickAtBufferInds(glm::ivec2(77, 88));
 
   // Do it again with edges enabled
   psMesh->setEdgeWidth(1.0);
-  polyscope::pick::evaluatePickQuery(77, 88);
+  polyscope::pickAtBufferInds(glm::ivec2(77, 88));
 
   polyscope::removeAllStructures();
 }
@@ -605,7 +605,7 @@ TEST_F(PolyscopeTest, SimpleTriangleMeshPick) {
   auto psMesh = registerSimpleTriangleMesh();
 
   // Don't bother trying to actually click on anything, but make sure this doesn't crash
-  polyscope::pick::evaluatePickQuery(77, 88);
+  polyscope::pickAtBufferInds(glm::ivec2(77, 88));
 
   polyscope::removeAllStructures();
 }