Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WEB-695 Batching Maintenance #2182

Merged
merged 30 commits into from
Apr 2, 2024
Merged

WEB-695 Batching Maintenance #2182

merged 30 commits into from
Apr 2, 2024

Conversation

AlexandruPopovici
Copy link
Contributor

@AlexandruPopovici AlexandruPopovici commented Mar 29, 2024 •
edited
Loading

Description & motivation

Much needed maintenance to our batching system which has been gathering clutter for a while.

  • Most importantly, replaced draw range integration implementation with something more robust. Additional details here
  • Removed a lot of code duplication by adding an abstract PrimitiveBatch implementation which is being extended by our MeshBatch and PointBatch
  • Added testing to the viewer library. Currently only just a few tests, but we will add more in time

Changes:

To-do before merge:

Screenshots:

Validation of changes:

Checklist:

  • My pull request follows the guidelines in the Contributing guide?
  • My pull request does not duplicate any other open Pull Requests for the same update/change?
  • My commits are related to the pull request and do not amend unrelated code or documentation.
  • My code follows a similar style to existing code.
  • I have added appropriate tests.
  • I have updated or added relevant documentation.

References

AlexandruPopovici and others added 22 commits March 22, 2024 11:30
@AlexandruPopovici
Starting to tackle WBX-397 by taking a different approach on computin…
08a16b2 
…g draw ranges
@AlexandruPopovici
WIP
0d8d956
@AlexandruPopovici
Range computation is more or less done. Material indices still need a…
6ccd468 
… more robust approach
@AlexandruPopovici
Range material indices figured out mostly by trating them as edges in…
4bb55ae 
… a graph. Also some profiling to max out pergf
@AlexandruPopovici
Added forward and backwards material index edges in order to be able …
3597be7 
…to directly look them up rather than searching for them in an array
@AlexandruPopovici
Extended the new draw range integration approach to instanced batches
e4b0d31
@AlexandruPopovici
Added vitest and wrote a first test for the DrawRange integration app…
5d41669 
…roach. Fixed some cicular dependencie which were messing up vitest runtime.
@AlexandruPopovici
A bunch of more tests
076f433
@AlexandruPopovici
Removed unused dep
95ebfe0
@AlexandruPopovici
Merged
c366a05
@iainsproat
ci(viewer): test the viewer in CircleCI
c466eb9
@iainsproat
Include test-viewer as a dependency of later jobs
2cabf8c
@AlexandruPopovici
Small updates
6411bff
@AlexandruPopovici
Removed old range integration from all three batches
043c2ed
@AlexandruPopovici
Working on making the range update integration work on an array at a …
c90a386 
…time
@AlexandruPopovici
Update range integration now works on entire arrays at a time. Almost…
894b83a 
… twice as fast this way. Updates tests
@AlexandruPopovici
DrawRanges now also flattens the computed draw ranges, so we got rid …
895cf5e 
…of the old ugly way of flattening the ranges. Update MeshBatch, PointBatch and InstancedMeshBatch
@AlexandruPopovici
More adjustment to point batch
9357a67
@AlexandruPopovici
Merge branch 'main' into alex/smarter-draw-ranges
32bb15f
@AlexandruPopovici
Implemented a common PrimitiveBatch which can be used for any typical…
f638bdd 
… primitive based rendering (triangles, lines, points) as abstract. Our Mesh and Point batch will use most of the common implementation. Updated MeshBatch to extend PrimitiveBatch
@AlexandruPopovici
Updated PointBatch to extend PrimitiveBatch
6406fa0
@AlexandruPopovici
Tried making the instaned mesh batch extend the primitive batch but t…
b083652 
…here was no point, they too different to make sense. Got rid of the pointless circular dependency between the instaned batch and mesh
@linear Linear
Copy link

linear bot commented Mar 29, 2024

WEB-695 Batching Attention

@fabis94 fabis94 marked this pull request as ready for review April 1, 2024 11:28
fabis94
fabis94 previously approved these changes Apr 1, 2024
View reviewed changes
packages/viewer/src/modules/extensions/FilteringExtension.ts Outdated Show resolved Hide resolved
iainsproat
iainsproat reviewed Apr 2, 2024
View reviewed changes
.circleci/config.yml Outdated Show resolved Hide resolved
iainsproat
iainsproat reviewed Apr 2, 2024
View reviewed changes
.circleci/config.yml Outdated Show resolved Hide resolved
@AlexandruPopovici AlexandruPopovici merged commit 9c481a2 into main Apr 2, 2024
33 of 36 checks passed
@AlexandruPopovici AlexandruPopovici deleted the alex/smarter-draw-ranges branch April 2, 2024 12:48
This was referenced Apr 2, 2024
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iainsproat iainsproat iainsproat left review comments

@fabis94 fabis94 fabis94 left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@AlexandruPopovici @iainsproat @fabis94