Page MenuHome
Differential D14699

Curves: Further split of curves draw code from particles
ClosedPublic
Actions

Authored by Hans Goudey (HooglyBoogly) on Apr 20 2022, 5:51 AM.

Details

Reviewers
Clément Foucault (fclem)
Commits
rB5b87862ddca2: Curves: Further split of curves draw code from particles
Summary

This commit completely separates much of the DRW curves code from
the particle hair drawing. In the short term this increases duplication,
but the idea is to simplify development by making it easier to do larger
changes to the new code, and the new system will replace the particle
hair at some point.

After this, I believe only the shaders themselves are shared, so that
would be a next step.

Diff Detail

Repository
rB Blender

Event Timeline

Hans Goudey (HooglyBoogly) requested review of this revision.Apr 20 2022, 5:51 AM
Hans Goudey (HooglyBoogly) created this revision.
Clément Foucault (fclem) requested changes to this revision.Apr 21 2022, 3:49 PM

Looks fine, except for the obvious code duplication. However if you feel this is worth/needed to avoid breaking hair drawing, then it is fine.

The only change I would make is to wrap the old DRW_hair_update() inside DRW_curves_update(). This way only one callback is necessary. The other is a legacy detail.

This revision now requires changes to proceed.Apr 21 2022, 3:49 PM
Hans Goudey (HooglyBoogly) updated this revision to Diff 50674.Apr 21 2022, 8:40 PM

Remove duplication of DRW_hair_update()

Regarding the duplicate code, I do see it as the lesser evil in this case, since I think writing proper drawing code for the new curves object will be harder if it's nested in a bunch of if statements. The old code should be easier to remove this way when the time comes too.

Clément Foucault (fclem) added inline comments.Apr 22 2022, 11:12 AM
source/blender/draw/intern/draw_manager.c
2026

Can we also merge DRW_hair_init();?

Hans Goudey (HooglyBoogly) updated this revision to Diff 50704.Apr 22 2022, 5:22 PM
  • Merge DRW_hair_init and DRW_hair_free to avoid more duplication
Clément Foucault (fclem) accepted this revision.Apr 22 2022, 5:31 PM
This revision is now accepted and ready to land.Apr 22 2022, 5:31 PM
Closed by commit rB5b87862ddca2: Curves: Further split of curves draw code from particles (authored by Hans Goudey (HooglyBoogly)). · Explain WhyApr 22 2022, 5:45 PM
This revision was automatically updated to reflect the committed changes.
Hans Goudey (HooglyBoogly) added a commit: rB5b87862ddca2: Curves: Further split of curves draw code from particles.

Revision Contents
Changeset List

PathSize
source/
blender/
draw/
2 lines
engines/
eevee/
2 lines
4 lines
4 lines
workbench/
4 lines
intern/
67 lines
2 lines
19 lines
324 lines
77 lines
97 lines
10 lines
20 lines
5 lines
24 lines

Diff 50707

View Options

source/blender/draw/CMakeLists.txt

Loading...
View Options

source/blender/draw/engines/eevee/eevee_lightcache.c

Loading...
View Options

source/blender/draw/engines/eevee/eevee_motion_blur.c

Loading...
View Options

source/blender/draw/engines/eevee/eevee_render.c

Loading...
View Options

source/blender/draw/engines/workbench/workbench_render.c

Loading...
View Options

source/blender/draw/intern/draw_cache_impl_curves.cc

Loading...
View Options

source/blender/draw/intern/draw_cache_impl_particles.c

Loading...
View Options

source/blender/draw/intern/draw_common.h

Loading...
View Options

source/blender/draw/intern/draw_curves.cc

Loading...
View Options

source/blender/draw/intern/draw_curves_private.h

Loading...
View Options

source/blender/draw/intern/draw_hair.c

Loading...
View Options

source/blender/draw/intern/draw_hair_private.h

Loading...
View Options

source/blender/draw/intern/draw_manager.c

Loading...
View Options

source/blender/draw/intern/draw_shader.h

Loading...
View Options

source/blender/draw/intern/draw_shader.c

Loading...