Code

Add "merge" blend mode#6936

Code

Merged

MichaelBuessemeyer merged 25 commits intomasterscalableminds/webknossos:masterfrom cover-blend-modescalableminds/webknossos:cover-blend-modeCopy head branch name to clipboardMay 25, 2023

+125-18

Commits

Commits on Mar 15, 2023

• WIP add new blend mode

  MichaelBuessemeyer

  committed
  71e511e

Commits on Mar 21, 2023

• WIP add cover blend mode

  MichaelBuessemeyer

  committed
  3490baf

• Merge branch 'master' of github.com:scalableminds/webknossos into cover-blend-mode

  MichaelBuessemeyer

  committed
  9710973

Commits on Apr 14, 2023

• Merge branch 'master' of github.com:scalableminds/webknossos into cover-blend-mode

  MichaelBuessemeyer

  committed
  3f871db

• fix uint24 rendering in merge mode

  Show description for ce1fff2
  MichaelBuessemeyer

  committed
  ce1fff2

• remove unused imports

  MichaelBuessemeyer

  committed
  c22b91c

Commits on Apr 20, 2023

• rename to render mode to blend mode

  MichaelBuessemeyer

  committed
  4821ce5

• improve in line comments

  MichaelBuessemeyer

  committed
  11020f5

• Merge branch 'master' of github.com:scalableminds/webknossos into cover-blend-mode

  MichaelBuessemeyer

  committed
  1f5b217

• decide whether a color is valid by alpha < 0.

  Show description for 0dbf947
  MichaelBuessemeyer

  committed
  0dbf947

Commits on Apr 27, 2023

• Merge branch 'master' of github.com:scalableminds/webknossos into cover-blend-mode

  MichaelBuessemeyer

  committed
  6b4da6a

• multiple fixes in cover blend mode

  Show description for 820bd9d
  MichaelBuessemeyer

  committed
  820bd9d

• fix reading blendmode from backend on inital load

  MichaelBuessemeyer

  committed
  2ca4a81

• Merge branch 'master' into cover-blend-mode

  MichaelBuessemeyer

  authored
  f9cdd4d

Commits on Apr 28, 2023

• refactoring & make changes ready for review

  MichaelBuessemeyer

  committed
  ebadcb8

• Merge branch 'cover-blend-mode' of github.com:scalableminds/webknossos into cover-blend-mode

  MichaelBuessemeyer

  committed
  134acf8

• add changelog entry

  MichaelBuessemeyer

  committed
  30b268f

• Merge branch 'master' of github.com:scalableminds/webknossos into cover-blend-mode

  MichaelBuessemeyer

  committed
  f9fe4b9

• add blend mode setting to docs

  MichaelBuessemeyer

  committed
  777c923

Commits on May 4, 2023

• Merge branch 'master' of github.com:scalableminds/webknossos into cover-blend-mode

  MichaelBuessemeyer

  committed
  fd9a454

• Apply suggestions from code review

  Show description for a23718e
  

  MichaelBuessemeyer

  and

  philippotto

  authored
  a23718e

• Merge branch 'cover-blend-mode' of github.com:scalableminds/webknossos into cover-blend-mode

  MichaelBuessemeyer

  committed
  9ff0aa4

• refactor shader code for blending

  Show description for 56e971a
  MichaelBuessemeyer

  committed
  56e971a

• Merge branch 'master' of github.com:scalableminds/webknossos into cover-blend-mode

  MichaelBuessemeyer

  committed
  96cb1b2

Commits on May 25, 2023

• Merge branch 'master' into cover-blend-mode

  MichaelBuessemeyer

  authored
  c4df6c2