USD PointInstancer import support #113107

Merged
Michael Kowalski merged 29 commits from expenses/blender:usd-read-pointinstancer-2 into main 2024-02-01 15:37:54 +01:00

29 Commits

Author SHA1 Message Date
Michael Kowalski 6b8a77e7a1 USD: pruned_pims argument now a reference
buildbot/vexp-code-patch-lint Build done. Details
buildbot/vexp-code-patch-linux-x86_64 Build done. Details
buildbot/vexp-code-patch-darwin-x86_64 Build done. Details
buildbot/vexp-code-patch-windows-amd64 Build done. Details
buildbot/vexp-code-patch-darwin-arm64 Build done. Details
buildbot/vexp-code-patch-coordinator Build done. Details
2024-01-31 16:54:32 -05:00
Michael Kowalski 49e2a19376 Merge branch 'main' into usd-read-pointinstancer-2
buildbot/vexp-code-patch-lint Build done. Details
buildbot/vexp-code-patch-windows-amd64 Build done. Details
buildbot/vexp-code-patch-linux-x86_64 Build done. Details
buildbot/vexp-code-patch-darwin-x86_64 Build done. Details
buildbot/vexp-code-patch-darwin-arm64 Build done. Details
buildbot/vexp-code-patch-coordinator Build done. Details
2024-01-31 10:34:27 -05:00
Michael Kowalski 36dd5ce5b3 USD: improve protoype collection names
buildbot/vexp-code-patch-lint Build done. Details
buildbot/vexp-code-patch-darwin-x86_64 Build done. Details
buildbot/vexp-code-patch-linux-x86_64 Build done. Details
buildbot/vexp-code-patch-windows-amd64 Build done. Details
buildbot/vexp-code-patch-darwin-arm64 Build done. Details
buildbot/vexp-code-patch-coordinator Build done. Details
Now adding the prototype index to the point instancer
prototype collection names.  The index will help identify
the collections and will also ensure that the collection
names maintain the correct alphabetical order, so that
the original prototype index remains valid.  (The Collection
Info geometry node orders collections alphabetically for
instancing, so we can't use an arbitrary collection name.)
2024-01-30 18:21:08 -05:00
Michael Kowalski 11b2e2bc6b USD: make pruned_prims argument a pointer
Changed USDStageReader::collect_readers pruned_prims argument
from a reference to a pointer.
2024-01-30 11:23:21 -05:00
Michael Kowalski 1009a19810 USD: addressed review comments 2024-01-29 15:20:49 -05:00
Michael Kowalski 662173e365 Merge branch 'main' into usd-read-pointinstancer-2 2024-01-29 12:54:30 -05:00
Michael Kowalski 3dd14a43a3 USD: fix point instancer node treee mem leak.
buildbot/vexp-code-patch-lint Build done. Details
buildbot/vexp-code-patch-darwin-x86_64 Build done. Details
buildbot/vexp-code-patch-darwin-arm64 Build done. Details
buildbot/vexp-code-patch-linux-x86_64 Build done. Details
buildbot/vexp-code-patch-windows-amd64 Build done. Details
buildbot/vexp-code-patch-coordinator Build done. Details
2024-01-23 21:14:19 -05:00
Michael Kowalski 95b015984e USD: bug fixes
buildbot/vexp-code-patch-lint Build done. Details
buildbot/vexp-code-patch-darwin-x86_64 Build done. Details
buildbot/vexp-code-patch-darwin-arm64 Build done. Details
buildbot/vexp-code-patch-linux-x86_64 Build done. Details
buildbot/vexp-code-patch-windows-amd64 Build done. Details
buildbot/vexp-code-patch-coordinator Build done. Details
Now calling SpanAttributeWriter::finish().

Fixed issue with extra user count on proto collection.
2024-01-23 18:19:26 -05:00
Michael Kowalski 057007822d Merge remote-tracking branch 'origin' into usd-read-pointinstancer-2 2024-01-23 13:35:39 -05:00
Michael Kowalski 5fb8357fc6 USD: replaced static cast per review comment 2024-01-23 13:28:05 -05:00
Michael Kowalski 3fadb7495e USD import: support point instancer masking
Now reading the point instancer boolean mask values into
a "mask" point attribute which is set as the Selection
input of the Instance on Points node.
2024-01-23 13:13:38 -05:00
Michael Kowalski 0bed400311 USD: addressed review comments 2024-01-22 11:08:44 -05:00
Ashley 39d134824f
Merge branch 'makowalski-usd-read-pointinstancer-2' into usd-read-pointinstancer-2
buildbot/vexp-code-patch-lint Build done. Details
buildbot/vexp-code-patch-darwin-arm64 Build done. Details
buildbot/vexp-code-patch-darwin-x86_64 Build done. Details
buildbot/vexp-code-patch-linux-x86_64 Build done. Details
buildbot/vexp-code-patch-windows-amd64 Build done. Details
buildbot/vexp-code-patch-coordinator Build done. Details
2024-01-19 17:21:08 +13:00
Ashley 292fec8db0
Merge remote-tracking branch 'origin/main' into usd-read-pointinstancer-2 2024-01-19 17:18:51 +13:00
Ashley 7432c8abd7
Merge remote-tracking branch 'origin/main' into HEAD 2024-01-19 17:18:34 +13:00
Ashley 40927f4fbe
Merge remote-tracking branch 'origin/main' into usd-read-pointinstancer-2 2024-01-17 20:57:53 +13:00
Michael Kowalski be7098ebea USD: point instancer import updates
Added usd_reader_pointinstancer.h to CMakeLists.

Creating readers for point instancer prototypes.

Creating collections containing point instancer prototype objects.

Finished setup of the point cloud geometry nodes modifier node tree,
as follows: Creating Named Attribute nodes for reading the
"orientations", "scales" and "proto_indices" point attributes;
setting the required flags on the Collection Info and Instance On
Points nodes; setting the prototype collection object on the
Collection Info node.

Added a USDPrimReader::is_in_instancer_proto_ boolean flag which
identifies readers of prims that are in point instancer prototypes.
The flag simplifies management of collections and is used to
determine whether global transforms should be applied to root objects.

Fixed formatting.
2024-01-15 20:45:20 -05:00
Michael Kowalski f28291943b Merge branch 'main' into usd-read-pointinstancer-2 2024-01-15 19:04:02 -05:00
Ashley 3a146dd677
Update headers 2023-12-02 22:21:25 +13:00
Ashley 4c5491dd69
Merge remote-tracking branch 'origin/main' into usd-read-pointinstancer-2 2023-12-02 18:12:59 +13:00
Ashley 0c471d5f2e
Merge remote-tracking branch 'origin/main' into usd-read-pointinstancer-2 2023-11-12 13:47:14 +13:00
Ashley 3690f31ccc
Merge remote-tracking branch 'origin/main' into usd-read-pointinstancer-2 2023-10-30 11:37:20 +13:00
Ashley 929fc75931
Merge remote-tracking branch 'origin/main' into usd-read-pointinstancer-2 2023-10-29 19:12:06 +13:00
Ashley 89b7e85ab9
Merge remote-tracking branch 'origin/main' into usd-read-pointinstancer-2 2023-10-22 13:46:45 +13:00
Ashley c735c3fbc6
Use default values for scales and orientations 2023-10-20 15:59:09 +13:00
Ashley 61d4fcf33e
Merge commit '9a967d26fdbcb2a2c8f05539544959417fb52a5f' into merging 2023-10-20 13:43:59 +13:00
Ashley 3804c68640
Merge commit 'bd6db0aceae616186eef593fc79c6f0faadbe346' into merging 2023-10-20 13:43:43 +13:00
Ashley 57de56256e
Sample at the first position time sample if provided, use size checks for scales/orientations/proto indices 2023-10-20 13:05:54 +13:00
Ashley 7813379c5a
Rebase ontop of origin/main 2023-10-01 20:10:15 +13:00