USD: UsdGeomPoints import support #120060

Merged
Michael Kowalski merged 23 commits from makowalski/blender:usd-points-import into main 2024-05-17 14:59:55 +02:00

The work on this pull request was contributed by devin-bayly and addresses issue #106398.

This commit provides an implemention of a USDPointsReader class to import UsdGeomPoints primitives as Blender Point Clouds.

The work on this pull request was contributed by [devin-bayly](https://projects.blender.org/devin-bayly) and addresses issue #106398. This commit provides an implemention of a `USDPointsReader` class to import `UsdGeomPoints` primitives as Blender Point Clouds.
Michael Kowalski added 13 commits 2024-03-29 13:57:18 +01:00
Added 'Point Cloud' USD import option.

Added new USDPointsReader class with stub functions.
The reader creates a point cloud object and allocates
the points, but it does not set point poistions or
attributes.  The reader will also allocate a cache modifier
for time varying points.

Updated the stage reader to instantiate the USDPointsReader
during stage traversal whe converting the UsdGeomPoints
schema.
this also shows me setting arbitrary color information on the points
Michael Kowalski added the
Interest
Pipeline, Assets & IO
Interest
USD
labels 2024-03-29 13:58:15 +01:00
Michael Kowalski added this to the USD project 2024-03-29 13:58:22 +01:00
Author
Member

This implementation looks good. I would recommend extending it as follows:

  • Handle more point attribute types.
  • Extend USDPointsReader::is_animated() to handle animating attributes in addition to points.

I am available to help with these tasks.

This implementation looks good. I would recommend extending it as follows: - Handle more point attribute types. - Extend `USDPointsReader::is_animated()` to handle animating attributes in addition to points. I am available to help with these tasks.
Michael Kowalski requested review from Jesse Yurkovich 2024-03-29 14:13:43 +01:00
Michael Kowalski added 2 commits 2024-04-02 18:03:04 +02:00
Jesse Yurkovich requested changes 2024-04-03 09:35:46 +02:00
Dismissed
Jesse Yurkovich left a comment
Member

We should also add some simple test coverage for import along with these changes. The pointsTestColors.usda file from #106398 would work well (just 2-3 frames would suffice). I can help with that as well.

We should also add some simple test coverage for import along with these changes. The `pointsTestColors.usda` file from #106398 would work well (just 2-3 frames would suffice). I can help with that as well.
@ -0,0 +104,4 @@
bke::SpanAttributeWriter<float3> positions_writer =
point_cloud->attributes_for_write().lookup_or_add_for_write_span<float3>(
"position", bke::AttrDomain::Point);
MutableSpan<float3> point_positions = positions_writer.span;

The few lines above can be collapsed into just the following: MutableSpan<float3> point_positions = point_cloud->positions_for_write();

The few lines above can be collapsed into just the following: `MutableSpan<float3> point_positions = point_cloud->positions_for_write();`
deadpin marked this conversation as resolved
@ -0,0 +106,4 @@
"position", bke::AttrDomain::Point);
MutableSpan<float3> point_positions = positions_writer.span;
for (size_t i = 0; i < positions.size(); i++) {

We can use a more efficient form here for positions. Replace the entirety of the loop with:

  static_assert(sizeof(pxr::GfVec3f) == sizeof(float3));
  point_positions.copy_from(Span(positions.data(), positions.size()).cast<float3>());

We've done similar in usd_reader_curve.cc

We can use a more efficient form here for positions. Replace the entirety of the loop with: ``` static_assert(sizeof(pxr::GfVec3f) == sizeof(float3)); point_positions.copy_from(Span(positions.data(), positions.size()).cast<float3>()); ``` We've done similar in `usd_reader_curve.cc`
deadpin marked this conversation as resolved
@ -0,0 +118,4 @@
* custom spans for the attributes. */
std::vector<pxr::UsdGeomPrimvar> primvars = primvarsLoaded.GetPrimvarsWithValues();
for (auto pv : primvars) {

Use const auto &pv as auto does not use const or references on its own.

Use `const auto &pv` as auto does not use const or references on its own.
deadpin marked this conversation as resolved
@ -0,0 +143,4 @@
for (int i = 0; i < colors.size(); ++i) {
const pxr::GfVec3f &usd_color = colors[i];
primvar_writer.span[i] = ColorGeometry4f(usd_color[0], usd_color[1], usd_color[2], 1.0f);
};

Remove trailing ; on for loop bracket

Remove trailing `;` on for loop bracket
deadpin marked this conversation as resolved
@ -0,0 +161,4 @@
continue;
}
for (int i = 0; i < values.size(); ++i) {

Like the above, this can use the more efficient form: primvar_writer.span.copy_from(Span(values.data(), values.size()));

Like the above, this can use the more efficient form: `primvar_writer.span.copy_from(Span(values.data(), values.size()));`
deadpin marked this conversation as resolved

@makowalski If you don't mind, I'll be updating this PR to address my feedback above and to add in code to read velocity and width data.

@makowalski If you don't mind, I'll be updating this PR to address my feedback above and to add in code to read velocity and width data.
Author
Member

@makowalski If you don't mind, I'll be updating this PR to address my feedback above and to add in code to read velocity and width data.

Sure, that would be fine. My apologies for the delay addressing these points, but I was waiting till some of the common attribute IO functions were committed and available. But if you would like to move forward with that task, it would b much appreciated. Thanks!

> @makowalski If you don't mind, I'll be updating this PR to address my feedback above and to add in code to read velocity and width data. Sure, that would be fine. My apologies for the delay addressing these points, but I was waiting till some of the common attribute IO functions were committed and available. But if you would like to move forward with that task, it would b much appreciated. Thanks!
Jesse Yurkovich added 3 commits 2024-04-30 08:03:14 +02:00

Yeah, I've been waffling back and forth on how best to separate out the reader attribute processing... I started with the writer side over at !121145. Give it a look when you get the time to see if that's the direction we want to move towards.

For now my changes just flesh out the main portions of the class but don't load any additional attributes besides the velocity/width data + the existing Color and Float attributes that were there already. So it's a tiny step closer but probably not enough to commit just yet without the other attribute types.

Yeah, I've been waffling back and forth on how best to separate out the reader attribute processing... I started with the writer side over at !121145. Give it a look when you get the time to see if that's the direction we want to move towards. For now my changes just flesh out the main portions of the class but don't load any additional attributes besides the velocity/width data + the existing Color and Float attributes that were there already. So it's a tiny step closer but probably not enough to commit just yet without the other attribute types.
Jesse Yurkovich added 3 commits 2024-05-15 07:41:38 +02:00
Author
Member

@deadpin I tested your most recent updates for reading attributes, and the code works great! Thank you!

I think we need a small update to USDPointsReader::is_animated() to get the cache modifier to be created in cases where the points are static and only attributes are animating. I'm attaching a points_animating_attributes.usda test case for this, which won't currently animate. This tests a couple of animating primvars (though it doesn't test animating widths or animating non-primvar velocities).

I have a simple fix for this, which I'm attaching as a diff. Please let me know if you'd like me to commit this. (Since we're both working on the code, I wanted to check before pushing anything so that we don't accidentally step on each other's work.)

@deadpin I tested your most recent updates for reading attributes, and the code works great! Thank you! I think we need a small update to `USDPointsReader::is_animated()` to get the cache modifier to be created in cases where the points are static and only attributes are animating. I'm attaching a `points_animating_attributes.usda` test case for this, which won't currently animate. This tests a couple of animating primvars (though it doesn't test animating widths or animating non-primvar velocities). I have a simple fix for this, which I'm attaching as a diff. Please let me know if you'd like me to commit this. (Since we're both working on the code, I wanted to check before pushing anything so that we don't accidentally step on each other's work.)

You're all clear to commit. I have no further changes lined up for this PR. I'll give the entire thing another quick test tonight and, if nothing comes up, it should be ready for actual commit to main I think.

You're all clear to commit. I have no further changes lined up for this PR. I'll give the entire thing another quick test tonight and, if nothing comes up, it should be ready for actual commit to main I think.
Michael Kowalski added 1 commit 2024-05-17 04:08:57 +02:00
USD points import: identify animating primvars
Some checks failed
buildbot/vexp-code-patch-lint Build done.
buildbot/vexp-code-patch-linux-x86_64 Build done.
buildbot/vexp-code-patch-darwin-x86_64 Build done.
buildbot/vexp-code-patch-windows-amd64 Build done.
buildbot/vexp-code-patch-darwin-arm64 Build done.
buildbot/vexp-code-patch-coordinator Build done.
4820262837
Updated USDPointsReader::is_animated() to include check for time
varying attributes.
Michael Kowalski changed title from WIP: USD: UsdGeomPoints import support to USD: UsdGeomPoints import support 2024-05-17 04:09:22 +02:00
Author
Member

I committed my latest changes and removed the WIP tag, as I believe this is now ready for a final review.

I committed my latest changes and removed the WIP tag, as I believe this is now ready for a final review.
Jesse Yurkovich approved these changes 2024-05-17 09:18:28 +02:00
Jesse Yurkovich left a comment
Member

Seems to work well with all the various test files here.

Seems to work well with all the various test files here.
Author
Member

@blender-bot build

@blender-bot build
Michael Kowalski added 1 commit 2024-05-17 14:38:33 +02:00
Michael Kowalski merged commit e4ef0f6ff4 into main 2024-05-17 14:59:55 +02:00
Michael Kowalski deleted branch usd-points-import 2024-05-17 14:59:58 +02:00
Sign in to join this conversation.
No reviewers
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset System
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Asset Browser Project
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
No Milestone
No project
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#120060
No description provided.