Merge pull request #198 from rdeioris/TimeSampledIndices

Added time support for face indices
lighttransport · Oct 24, 2024 · 8e7af44 · 8e7af44
2 parents c9a7815 + f1ea8cb
commit 8e7af44
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/usdGeom.cc b/src/usdGeom.cc
@@ -811,7 +811,7 @@ Interpolation GeomMesh::get_normalsInterpolation() const {
   return Interpolation::Vertex;  // default 'vertex'
 }
 
-const std::vector<int32_t> GeomMesh::get_faceVertexCounts() const {
+const std::vector<int32_t> GeomMesh::get_faceVertexCounts(double time) const {
   std::vector<int32_t> dst;
 
   if (!faceVertexCounts.authored() || faceVertexCounts.is_blocked()) {
@@ -825,15 +825,14 @@ const std::vector<int32_t> GeomMesh::get_faceVertexCounts() const {
 
   if (auto pv = faceVertexCounts.get_value()) {
     std::vector<int32_t> val;
-    // TOOD: timesamples
-    if (pv.value().get_scalar(&val)) {
+    if (pv.value().get(time, &val, value::TimeSampleInterpolationType::Held)) {
       dst = std::move(val);
     }
   }
   return dst;
 }
 
-const std::vector<int32_t> GeomMesh::get_faceVertexIndices() const {
+const std::vector<int32_t> GeomMesh::get_faceVertexIndices(double time) const {
   std::vector<int32_t> dst;
 
   if (!faceVertexIndices.authored() || faceVertexIndices.is_blocked()) {
@@ -847,8 +846,7 @@ const std::vector<int32_t> GeomMesh::get_faceVertexIndices() const {
 
   if (auto pv = faceVertexIndices.get_value()) {
     std::vector<int32_t> val;
-    // TOOD: timesamples
-    if (pv.value().get_scalar(&val)) {
+    if (pv.value().get(time, &val, value::TimeSampleInterpolationType::Held)) {
       dst = std::move(val);
     }
   }

diff --git a/src/usdGeom.hh b/src/usdGeom.hh
@@ -797,14 +797,14 @@ struct GeomMesh : GPrim {
   ///
   /// @return face vertex counts vector(copied)
   ///
-  const std::vector<int32_t> get_faceVertexCounts() const;
+  const std::vector<int32_t> get_faceVertexCounts(double time = value::TimeCode::Default()) const;
 
   ///
   /// @brief Returns `faceVertexIndices`.
   ///
   /// @return face vertex indices vector(copied)
   ///
-  const std::vector<int32_t> get_faceVertexIndices() const;
+  const std::vector<int32_t> get_faceVertexIndices(double time = value::TimeCode::Default()) const;
 
   //
   // SubD attribs.