From f1ea8cb18d3b3197e616d09f2ad14a518c758b9b Mon Sep 17 00:00:00 2001 From: rdeioris Date: Thu, 24 Oct 2024 17:49:03 +0200 Subject: [PATCH] added time support for face indices --- src/usdGeom.cc | 10 ++++------ src/usdGeom.hh | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/usdGeom.cc b/src/usdGeom.cc index e59d30e8..7a220771 100644 --- 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 GeomMesh::get_faceVertexCounts() const { +const std::vector GeomMesh::get_faceVertexCounts(double time) const { std::vector dst; if (!faceVertexCounts.authored() || faceVertexCounts.is_blocked()) { @@ -825,15 +825,14 @@ const std::vector GeomMesh::get_faceVertexCounts() const { if (auto pv = faceVertexCounts.get_value()) { std::vector 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 GeomMesh::get_faceVertexIndices() const { +const std::vector GeomMesh::get_faceVertexIndices(double time) const { std::vector dst; if (!faceVertexIndices.authored() || faceVertexIndices.is_blocked()) { @@ -847,8 +846,7 @@ const std::vector GeomMesh::get_faceVertexIndices() const { if (auto pv = faceVertexIndices.get_value()) { std::vector 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 index 3903e6ec..52c5cb11 100644 --- a/src/usdGeom.hh +++ b/src/usdGeom.hh @@ -797,14 +797,14 @@ struct GeomMesh : GPrim { /// /// @return face vertex counts vector(copied) /// - const std::vector get_faceVertexCounts() const; + const std::vector get_faceVertexCounts(double time = value::TimeCode::Default()) const; /// /// @brief Returns `faceVertexIndices`. /// /// @return face vertex indices vector(copied) /// - const std::vector get_faceVertexIndices() const; + const std::vector get_faceVertexIndices(double time = value::TimeCode::Default()) const; // // SubD attribs.