feat: add maxSubdivision to SubdivisionSurfaceMesh

Latios96 · Oct 22, 2024 · ae48cf4 · ae48cf4
1 parent 7be74b8
commit ae48cf4
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 3 deletions.
diff --git a/src/crayg/src/scene/primitives/subdivisionsurfacemesh/OpenSubdivRefiner.h b/src/crayg/src/scene/primitives/subdivisionsurfacemesh/OpenSubdivRefiner.h
@@ -9,7 +9,7 @@ namespace crayg {
 class OpenSubdivRefiner {
   public:
     explicit OpenSubdivRefiner(SubdivisionSurfaceMesh &subdivisionSurfaceMesh);
-    void refine(int maxLevel = 3);
+    void refine(int maxLevel);
 
   private:
     SubdivisionSurfaceMesh &subdivisionSurfaceMesh;

diff --git a/src/crayg/src/scene/primitives/subdivisionsurfacemesh/SubdivisionSurfaceMesh.cpp b/src/crayg/src/scene/primitives/subdivisionsurfacemesh/SubdivisionSurfaceMesh.cpp
@@ -50,7 +50,7 @@ size_t SubdivisionSurfaceMesh::primitiveCount() const {
 void SubdivisionSurfaceMesh::tessellate() {
     CRG_TRACE_SCOPE("SubdivisionSurfaceMesh");
     OpenSubdivRefiner openSubdivRefiner(*this);
-    openSubdivRefiner.refine();
+    openSubdivRefiner.refine(maxSubdivision);
 
     FanTriangulator fanTriangulator(*this);
     fanTriangulator.fanTriangulate(triangleMesh.faceVertexIndices);

diff --git a/src/crayg/src/scene/primitives/subdivisionsurfacemesh/SubdivisionSurfaceMesh.h b/src/crayg/src/scene/primitives/subdivisionsurfacemesh/SubdivisionSurfaceMesh.h
@@ -34,7 +34,7 @@ class SubdivisionSurfaceMesh : public SceneObject {
     enum class BoundaryInterpolation { EDGE_ONLY, EDGE_AND_CORNER };
 
     BoundaryInterpolation boundaryInterpolation = BoundaryInterpolation::EDGE_ONLY;
-
+    int maxSubdivision = 3;
     TriangleMesh triangleMesh;
 
   private:

diff --git a/src/crayg/src/sceneIO/read/usd/primitives/UsdSubdivisionSurfaceMeshReader.cpp b/src/crayg/src/sceneIO/read/usd/primitives/UsdSubdivisionSurfaceMeshReader.cpp
@@ -20,6 +20,7 @@ std::shared_ptr<SubdivisionSurfaceMesh> UsdSubdivisionSurfaceMeshReader::read()
     translatePoints(subdivisionSurfaceMesh);
     translateIndices(subdivisionSurfaceMesh);
     translateBoundaryInterpolation(subdivisionSurfaceMesh);
+    translateMaxSubdivisions(subdivisionSurfaceMesh);
     translateUvs(subdivisionSurfaceMesh);
 
     return subdivisionSurfaceMesh;
@@ -105,4 +106,10 @@ void UsdSubdivisionSurfaceMeshReader::translateUvs(
     }
 }
 
+void UsdSubdivisionSurfaceMeshReader::translateMaxSubdivisions(
+    std::shared_ptr<SubdivisionSurfaceMesh> &subdivisionSurfaceMesh) {
+    subdivisionSurfaceMesh->maxSubdivision =
+        UsdUtils::getStaticAttributeValueAs<int>(usdPrim.GetPrim(), "crayg:maxSubdivision", 3);
+}
+
 } // crayg
diff --git a/src/crayg/src/sceneIO/read/usd/primitives/UsdSubdivisionSurfaceMeshReader.h b/src/crayg/src/sceneIO/read/usd/primitives/UsdSubdivisionSurfaceMeshReader.h
@@ -22,6 +22,7 @@ class UsdSubdivisionSurfaceMeshReader : public BaseUsdImageableReader<pxr::UsdGe
 
   private:
     void translateBoundaryInterpolation(std::shared_ptr<SubdivisionSurfaceMesh> &subdivisionSurfaceMesh);
+    void translateMaxSubdivisions(std::shared_ptr<SubdivisionSurfaceMesh> &subdivisionSurfaceMesh);
 };
 
 } // crayg
diff --git a/src/crayg/src/sceneIO/write/usd/primitives/UsdSubdivisionSurfaceMeshWriter.cpp b/src/crayg/src/sceneIO/write/usd/primitives/UsdSubdivisionSurfaceMeshWriter.cpp
@@ -1,5 +1,6 @@
 #include "UsdSubdivisionSurfaceMeshWriter.h"
 #include "UsdTriangleMeshWriter.h"
+#include "sceneIO/usd/UsdUtils.h"
 #include <pxr/usd/usdGeom/primvar.h>
 #include <pxr/usd/usdGeom/primvarsAPI.h>
 
@@ -35,6 +36,7 @@ pxr::UsdGeomMesh UsdSubdivisionSurfaceMeshWriter::write(pxr::UsdStagePtr stage,
     writeFaceVertexCounts(usdGeomMesh);
     writeSubdivisionScheme(usdGeomMesh);
     writeUvs(usdGeomMesh);
+    writeMaxSubdivision(usdGeomMesh);
 
     return usdGeomMesh;
 }
@@ -87,4 +89,8 @@ void UsdSubdivisionSurfaceMeshWriter::writeUvs(pxr::UsdGeomMesh usdGeomMesh) con
     primvarsApi.CreateIndexedPrimvar(pxr::TfToken("uv"), pxr::SdfValueTypeNames->TexCoord2fArray, uvs, uvIndices,
                                      pxr::UsdGeomTokens->faceVarying);
 }
+
+void UsdSubdivisionSurfaceMeshWriter::writeMaxSubdivision(pxr::UsdGeomMesh usdGeomMesh) const {
+    UsdUtils::createAndSetAttribute(usdGeomMesh.GetPrim(), "crayg:maxSubdivision", craygObject.maxSubdivision);
+}
 } // crayg
diff --git a/src/crayg/src/sceneIO/write/usd/primitives/UsdSubdivisionSurfaceMeshWriter.h b/src/crayg/src/sceneIO/write/usd/primitives/UsdSubdivisionSurfaceMeshWriter.h
@@ -20,6 +20,7 @@ class UsdSubdivisionSurfaceMeshWriter : public BaseUsdSceneObjectWriter<pxr::Usd
     void writeFaceVertexCounts(pxr::UsdGeomMesh usdGeomMesh) const;
     void writeSubdivisionScheme(pxr::UsdGeomMesh usdGeomMesh) const;
     void writeUvs(pxr::UsdGeomMesh usdGeomMesh) const;
+    void writeMaxSubdivision(pxr::UsdGeomMesh usdGeomMesh) const;
 };
 
 } // crayg
diff --git a/src/crayg/tests/TestUsdSubdivisionSurfaceMeshReader.cpp b/src/crayg/tests/TestUsdSubdivisionSurfaceMeshReader.cpp
@@ -63,6 +63,25 @@ TEST_CASE("UsdSubdivisionSurfaceMeshReader::read") {
         REQUIRE(subdivisionSurfaceMesh->boundaryInterpolation ==
                 SubdivisionSurfaceMesh::BoundaryInterpolation::EDGE_ONLY);
     }
+
+    SECTION("should read crayg:maxSubdivision") {
+        auto usdGeomMesh = UsdGeomMeshFixtures::createQuadPlane(stage, pxr::UsdGeomTokens->catmullClark);
+        UsdUtils::createAndSetAttribute(usdGeomMesh.GetPrim(), "crayg:maxSubdivision", 4);
+
+        UsdSubdivisionSurfaceMeshReader usdMeshReader(usdGeomMesh, usdMaterialTranslationCache);
+        auto subdivisionSurfaceMesh = usdMeshReader.read();
+
+        REQUIRE(subdivisionSurfaceMesh->maxSubdivision == 4);
+    }
+
+    SECTION("should default crayg:maxSubdivision to 3") {
+        auto usdGeomMesh = UsdGeomMeshFixtures::createQuadPlane(stage, pxr::UsdGeomTokens->catmullClark);
+
+        UsdSubdivisionSurfaceMeshReader usdMeshReader(usdGeomMesh, usdMaterialTranslationCache);
+        auto subdivisionSurfaceMesh = usdMeshReader.read();
+
+        REQUIRE(subdivisionSurfaceMesh->maxSubdivision == 3);
+    }
 }
 
 }
diff --git a/src/crayg/tests/TestUsdSubdivisionSurfaceMeshWriter.cpp b/src/crayg/tests/TestUsdSubdivisionSurfaceMeshWriter.cpp
@@ -19,6 +19,7 @@ TEST_CASE("UsdSubdivisionSurfaceMeshWriter::write") {
     SubdivisionSurfaceMeshFixtures::createUnitPlane(subdivisionSurfaceMesh);
 
     SECTION("should write untesselated subd surface") {
+        subdivisionSurfaceMesh.maxSubdivision = 4;
         UsdSubdivisionSurfaceMeshWriter usdSubdivisionSurfaceMeshWriter(subdivisionSurfaceMesh, usdMaterialWriteCache);
 
         usdSubdivisionSurfaceMeshWriter.write(stage, usdPathFactory);
@@ -36,16 +37,20 @@ TEST_CASE("UsdSubdivisionSurfaceMeshWriter::write") {
         pxr::VtIntArray uvIndices;
         uvsPrimVar->Get(&uvs);
         uvsPrimVar->GetIndices(&uvIndices);
+        const int maxSubdivision =
+            UsdUtils::getStaticAttributeValueAs<int>(usdGeomMesh.GetPrim(), "crayg:maxSubdivision", 0);
         REQUIRE(translation == pxr::GfVec3f(1, 2, -3));
         REQUIRE(points == pxr::VtVec3fArray({{-0.5, 0, 0.5}, {0.5, 0, 0.5}, {0.5, 0, -0.5}, {-0.5, 0, -0.5}}));
         REQUIRE(triangleIndices == pxr::VtIntArray({0, 1, 2, 3}));
         REQUIRE(faceVertexCounts == pxr::VtIntArray({4}));
         REQUIRE(uvs == pxr::VtVec2fArray({{0, 1}, {1, 1}, {0, 0}, {1, 0}}));
         REQUIRE(uvIndices == pxr::VtIntArray({0, 1, 2, 3}));
         REQUIRE_FALSE(usdGeomMesh.GetNormalsAttr().HasAuthoredValue());
+        REQUIRE(maxSubdivision == 4);
     }
 
     SECTION("should write tesselated subd surface") {
+        subdivisionSurfaceMesh.maxSubdivision = 3;
         subdivisionSurfaceMesh.tessellate();
         UsdSubdivisionSurfaceMeshWriter usdSubdivisionSurfaceMeshWriter(subdivisionSurfaceMesh, usdMaterialWriteCache);