make naming more consistent for coords/bufferinds

Author: nmwsharp

include/polyscope/view.h

@@ -137,9 +137,9 @@ bool getWindowResizable();
 
 // Get world geometry corresponding to a screen pixel (e.g. from a mouse click)
 glm::vec3 screenCoordsToWorldRay(glm::vec2 screenCoords);
-glm::vec3 bufferCoordsToWorldRay(int xPos, int yPos);
+glm::vec3 bufferIndsToWorldRay(glm::ivec2 bufferInds);
 glm::vec3 screenCoordsToWorldPosition(glm::vec2 screenCoords); // queries the depth buffer to get full position
-glm::vec3 bufferCoordsToWorldPosition(int xPos, int yPos); 
+glm::vec3 bufferIndsToWorldPosition(glm::ivec2 bufferInds);
 
 // Get and set camera from json string
 std::string getViewAsJson();
@@ -151,7 +151,9 @@ void setCameraFromJson(std::string jsonData, bool flyTo);
 std::string to_string(ProjectionMode mode);
 std::string to_string(NavigateStyle style);
 std::tuple<int, int> screenCoordsToBufferInds(glm::vec2 screenCoords);
+glm::ivec2 screenCoordsToBufferIndsVec(glm::vec2 screenCoords);
 glm::vec2 bufferIndsToScreenCoords(int xPos, int yPos);
+glm::vec2 bufferIndsToScreenCoords(glm::ivec2 bufferInds);
 
 // == Internal helpers. Should probably not be called in user code.
 
@@ -177,6 +179,10 @@ void processClipPlaneShift(double amount);
 void processZoom(double amount);
 void processKeyboardNavigation(ImGuiIO& io);
 
+// deprecated, bad names, see variants above
+glm::vec3 bufferCoordsToWorldRay(glm::vec2 bufferCoords);
+glm::vec3 bufferCoordsToWorldPosition(int xPos, int yPos);
+
 
 } // namespace view
 } // namespace polyscope

src/view.cpp

@@ -102,11 +102,21 @@ std::tuple<int, int> screenCoordsToBufferInds(glm::vec2 screenCoords) {
   return std::tuple<int, int>(xPos, yPos);
 }
 
+glm::ivec2 screenCoordsToBufferIndsVec(glm::vec2 screenCoords) {
+  glm::ivec2 out;
+  std::tie(out.x, out.y) = screenCoordsToBufferInds(screenCoords);
+  return out;
+}
+
 glm::vec2 bufferIndsToScreenCoords(int xPos, int yPos) {
   return glm::vec2{xPos * static_cast<float>(view::windowWidth) / view::bufferWidth,
                    yPos * static_cast<float>(view::windowHeight) / view::bufferHeight};
 }
 
+glm::vec2 bufferIndsToScreenCoords(glm::ivec2 bufferInds) {
+  return bufferIndsToScreenCoords(bufferInds.x, bufferInds.y);
+}
+
 void processRotate(glm::vec2 startP, glm::vec2 endP) {
 
   if (startP == endP) {
@@ -513,6 +523,8 @@ glm::vec3 screenCoordsToWorldRay(glm::vec2 screenCoords) {
   return worldRayDir;
 }
 
+glm::vec3 bufferIndsToWorldRay(glm::vec2 bufferInds) { return bufferCoordsToWorldRay(bufferInds); }
+
 glm::vec3 bufferCoordsToWorldRay(glm::vec2 bufferCoords) {
 
   glm::mat4 view = getCameraViewMatrix();
@@ -532,6 +544,10 @@ glm::vec3 screenCoordsToWorldPosition(glm::vec2 screenCoords) {
   return bufferCoordsToWorldPosition(xInd, yInd);
 }
 
+glm::vec3 bufferIndsToWorldPosition(glm::ivec2 bufferInds) {
+  return bufferCoordsToWorldPosition(bufferInds.x, bufferInds.y);
+}
+
 glm::vec3 bufferCoordsToWorldPosition(int xInd, int yInd) {
 
   glm::vec2 screenCoords = bufferIndsToScreenCoords(xInd, yInd);