Details

Reviewers

Maniphest Tasks

T95443: Refactor curve nodes to use new data structure

Commits

rB6bcda04d1f1c: Geometry Nodes: Port sample curves node to new data-block

Summary

Use the newer more generic sampling and interpolation functions
developed recently (ab444a80a280) instead of the CurveEval type.
Functions are split up a bit more internally, to allow a separate mode
for supplying the curve index directly in the future (T92474).

In one basic test, the performance seems mostly unchanged from 3.1.

Test file:

Sample Curves Node Test.blend1000 KBDownload

Diff Detail

Repository: rB Blender

Event Timeline

Hans Goudey (HooglyBoogly) requested review of this revision.Apr 11 2022, 9:00 PM

Hans Goudey (HooglyBoogly) created this revision.

Hans Goudey (HooglyBoogly) mentioned this in T95443: Refactor curve nodes to use new data structure.

Jacques Lucke (JacquesLucke) requested changes to this revision.Apr 12 2022, 5:13 PM

Jacques Lucke (JacquesLucke) added inline comments.

source/blender/blenkernel/intern/curves_geometry.cc
714 ↗	(On Diff #50344)	Is this the same as the existing function? Should probably be deduplicated.
source/blender/blenlib/BLI_length_parameterize.hh
148	Can `linear_interpolate_sorted` be implemented in terms of this function?
155	`dst_mask`?
source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc
266	why `as_const`?
269	How does sorting here not break the function? It seems like there might be a mismatch between the input and outputs due to the sorting.

This revision now requires changes to proceed.Apr 12 2022, 5:13 PM

AgentA1cr added a subscriber: AgentA1cr.May 16 2022, 9:07 PM

Merge master

A bit more progress, still doesn't work

Hans Goudey (HooglyBoogly) updated this revision to Diff 53205.Jul 4 2022, 3:42 AM

Hans Goudey (HooglyBoogly) edited the summary of this revision. (Show Details)

Hans Goudey (HooglyBoogly) added a task: T95443: Refactor curve nodes to use new data structure.Jul 11 2022, 5:37 AM

Hans Goudey (HooglyBoogly) planned changes to this revision.Jul 20 2022, 1:52 AM

Cleanup, updates, working implementation

Jacques Lucke (JacquesLucke) accepted this revision.Jul 22 2022, 4:21 PM

Jacques Lucke (JacquesLucke) added inline comments.

source/blender/functions/FN_field.hh
173	unrelated change
source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc
205–209	`const`

This revision is now accepted and ready to land.Jul 22 2022, 4:21 PM

Iliya Katueshenock (Moder) awarded a token.Jul 22 2022, 4:29 PM

Closed by commit rB6bcda04d1f1c: Geometry Nodes: Port sample curves node to new data-block (authored by Hans Goudey (HooglyBoogly)). · Explain WhyJul 22 2022, 5:05 PM

This revision was automatically updated to reflect the committed changes.

Hans Goudey (HooglyBoogly) added a commit: rB6bcda04d1f1c: Geometry Nodes: Port sample curves node to new data-block.

Hans Goudey (HooglyBoogly) added inline comments.Jul 22 2022, 5:07 PM

source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc
205–209	I couldn't make them const because they're declared and assigned to on separate lines, to avoid retrieving the data when it isn't needed. I suppose I could have for the positions, but making them look the same seemed nicer

Geometry Nodes: Port sample curves node to new data-block
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 53937

source/blender/blenlib/BLI_length_parameterize.hh

source/blender/functions/FN_field.hh

source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc

Geometry Nodes: Port sample curves node to new data-blockClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 53937

source/blender/blenlib/BLI_length_parameterize.hh

source/blender/functions/FN_field.hh

source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc

Geometry Nodes: Port sample curves node to new data-block
ClosedPublic
Actions

Revision Contents
Changeset List