add missing SurfaceMesh register w/ permutation functions for

compatibility
nmwsharp · Dec 28, 2023 · f8e3509 · f8e3509
1 parent 71a1e64
commit f8e3509
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/include/polyscope/surface_mesh.h b/include/polyscope/surface_mesh.h
@@ -423,6 +423,12 @@ template <class V, class F>
 SurfaceMesh* registerSurfaceMesh(std::string name, const V& vertexPositions, const F& faceIndices);
 template <class V, class F>
 SurfaceMesh* registerSurfaceMesh2D(std::string name, const V& vertexPositions, const F& faceIndices);
+
+// register functions that also set perms
+// these are kept mainly for backward compatability, prefer setting perms after registering
+template <class V, class F, class P>
+SurfaceMesh* registerSurfaceMesh(std::string name, const V& vertexPositions, const F& faceIndices,
+                                 const std::array<std::pair<P, size_t>, 3>& perms);
 template <class V, class F, class P>
 SurfaceMesh* registerSurfaceMesh(std::string name, const V& vertexPositions, const F& faceIndices,
                                  const std::array<std::pair<P, size_t>, 5>& perms);

diff --git a/include/polyscope/surface_mesh.ipp b/include/polyscope/surface_mesh.ipp
@@ -40,6 +40,26 @@ SurfaceMesh* registerSurfaceMesh2D(std::string name, const V& vertexPositions, c
   return registerSurfaceMesh(name, positions3D, faceIndices);
 }
 
+template <class V, class F, class P>
+SurfaceMesh* registerSurfaceMesh(std::string name, const V& vertexPositions, const F& faceIndices,
+                                 const std::array<std::pair<P, size_t>, 3>& perms) {
+  SurfaceMesh* mesh = registerSurfaceMesh(name, vertexPositions, faceIndices);
+  if (mesh) {
+    mesh->setAllPermutations(perms);
+  }
+  return mesh;
+}
+
+template <class V, class F, class P>
+SurfaceMesh* registerSurfaceMesh(std::string name, const V& vertexPositions, const F& faceIndices,
+                                 const std::array<std::pair<P, size_t>, 5>& perms) {
+  SurfaceMesh* mesh = registerSurfaceMesh(name, vertexPositions, faceIndices);
+  if (mesh) {
+    mesh->setAllPermutations(perms);
+  }
+  return mesh;
+}
+
 template <class V>
 void SurfaceMesh::updateVertexPositions(const V& newPositions) {
   validateSize(newPositions, vertexDataSize, "newPositions");