move stateful selection functions out of pick namespace

Author: nmwsharp

include/polyscope/pick.h

@@ -39,16 +39,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 queryPickAtBufferInds(glm::ivec2 bufferInds);    // takes indices into render buffer
 
-namespace pick {
-
-// Old, deprecated picking API. Use the above functions instead.
-// Get the structure which was clicked on (nullptr if none), and the pick ID in local indices for that structure (such
-// that 0 is the first index as returned from requestPickBufferRange())
-std::pair<Structure*, uint64_t> pickAtScreenCoords(glm::vec2 screenCoords); // takes screen coordinates
-std::pair<Structure*, uint64_t> pickAtBufferCoords(int xPos, int yPos);     // takes indices into the buffer
-std::pair<Structure*, uint64_t> evaluatePickQuery(int xPos, int yPos); // old, badly named. takes buffer coordinates.
 
 // == Stateful picking: track and update a current selection
 
@@ -60,6 +52,15 @@ bool haveSelection();
 void resetSelectionIfStructure(Structure* s); // If something from this structure is selected, clear the selection
                                               // (useful if a structure is being deleted)
 
+namespace pick {
+
+// Old, deprecated picking API. Use the above functions instead.
+// Get the structure which was clicked on (nullptr if none), and the pick ID in local indices for that structure (such
+// that 0 is the first index as returned from requestPickBufferRange())
+std::pair<Structure*, uint64_t> pickAtScreenCoords(glm::vec2 screenCoords); // takes screen coordinates
+std::pair<Structure*, uint64_t> pickAtBufferCoords(int xPos, int yPos);     // takes indices into the buffer
+std::pair<Structure*, uint64_t> evaluatePickQuery(int xPos, int yPos); // old, badly named. takes buffer coordinates.
+
 
 // == Helpers
 

src/pick.cpp

@@ -46,6 +46,32 @@ PickResult queryPickAtBufferInds(glm::ivec2 bufferInds) {
   return result;
 }
 
+// == Manage stateful picking
+
+void resetSelection() {
+  state::globalContext.haveSelectionVal = false;
+  state::globalContext.currSelectionPickResult = PickResult();
+}
+
+bool haveSelection() { return state::globalContext.haveSelectionVal; }
+
+void resetSelectionIfStructure(Structure* s) {
+  if (state::globalContext.haveSelectionVal && state::globalContext.currSelectionPickResult.structure == s) {
+    resetSelection();
+  }
+}
+
+PickResult getSelection() { return state::globalContext.currSelectionPickResult; }
+
+void setSelection(PickResult newPick) {
+  if (!newPick.isHit) {
+    resetSelection();
+  } else {
+    state::globalContext.haveSelectionVal = true;
+    state::globalContext.currSelectionPickResult = newPick;
+  }
+}
+
 
 namespace pick {
 
@@ -86,32 +112,6 @@ uint64_t requestPickBufferRange(Structure* requestingStructure, uint64_t count)
   return ret;
 }
 
-// == Manage stateful picking
-
-void resetSelection() {
-  haveSelectionVal = false;
-  currSelectionPickResult = PickResult();
-}
-
-bool haveSelection() { return haveSelectionVal; }
-
-void resetSelectionIfStructure(Structure* s) {
-  if (haveSelectionVal && currSelectionPickResult.structure == s) {
-    resetSelection();
-  }
-}
-
-PickResult getSelection() { return currSelectionPickResult; }
-
-void setSelection(PickResult newPick) {
-  if (!newPick.isHit) {
-    resetSelection();
-  } else {
-    haveSelectionVal = true;
-    currSelectionPickResult = newPick;
-  }
-}
-
 // == Helpers
 
 std::pair<Structure*, uint64_t> globalIndexToLocal(uint64_t globalInd) {

src/polyscope.cpp

@@ -406,7 +406,7 @@ void processInputEvents() {
         if (dragDistSinceLastRelease < dragIgnoreThreshold) {
           ImVec2 p = ImGui::GetMousePos();
           PickResult pickResult = queryPickAtScreenCoords(glm::vec2{p.x, p.y});
-          pick::setSelection(pickResult);
+          setSelection(pickResult);
         }
 
         // Reset the drag distance after any release
@@ -415,7 +415,7 @@ void processInputEvents() {
       // Clear pick
       if (ImGui::IsMouseReleased(1)) {
         if (dragDistSinceLastRelease < dragIgnoreThreshold) {
-          pick::resetSelection();
+          resetSelection();
         }
         dragDistSinceLastRelease = 0.0;
       }
@@ -755,20 +755,19 @@ void buildStructureGui() {
 }
 
 void buildPickGui() {
-  if (pick::haveSelection()) {
+  if (haveSelection()) {
 
     ImGui::SetNextWindowPos(ImVec2(view::windowWidth - (rightWindowsWidth + imguiStackMargin),
                                    2 * imguiStackMargin + lastWindowHeightUser));
     ImGui::SetNextWindowSize(ImVec2(rightWindowsWidth, 0.));
 
     ImGui::Begin("Selection", nullptr);
-    PickResult selection = pick::getSelection();
+    PickResult selection = getSelection();
 
 
     ImGui::Text("screen coordinates: (%.2f,%.2f)  depth: %g", selection.screenCoords.x, selection.screenCoords.y,
                 selection.depth);
-    ImGui::Text("world position: <%g, %g, %g>", selection.position.x, selection.position.y,
-                selection.position.z);
+    ImGui::Text("world position: <%g, %g, %g>", selection.position.x, selection.position.y, selection.position.z);
     ImGui::NewLine();
 
     ImGui::TextUnformatted((selection.structureType + ": " + selection.structureName).c_str());
@@ -1122,7 +1121,7 @@ void removeStructure(std::string type, std::string name, bool errorIfAbsent) {
   for (auto& g : state::groups) {
     g.second->removeChildStructure(*s);
   }
-  pick::resetSelectionIfStructure(s);
+  resetSelectionIfStructure(s);
   sMap.erase(s->name);
   updateStructureExtents();
   return;
@@ -1183,7 +1182,7 @@ void removeAllStructures() {
   }
 
   requestRedraw();
-  pick::resetSelection();
+  resetSelection();
 }