Code

Add UI Materials#9506

Code

Merged

alice-i-cecile merged 63 commits intobevyengine:mainbevyengine/bevy:mainfrom MarkusTheOrt:ui_materialMarkusTheOrt/bevy:ui_materialCopy head branch name to clipboardNov 3, 2023

+1,090-6

Commits

Commits on Aug 17, 2023

• Adds UIMaterial Struct

  MarkusTheOrt

  committed
  2d37454

Commits on Aug 18, 2023

• Adds MaterialNodeBundle

  Show description for fb90baa
  MarkusTheOrt

  committed
  fb90baa

• export material::* from bevy_ui

  MarkusTheOrt

  committed
  7a98e22

• reverts UI shader

  MarkusTheOrt

  committed
  ccba0a2

Commits on Aug 20, 2023

• UiMaterial now working as intended

  MarkusTheOrt

  committed
  4298848

• fixes compilation warnings

  MarkusTheOrt

  committed
  cbbbd88

• fix cargo clippy warnings

  MarkusTheOrt

  committed
  7ed8914

Commits on Aug 21, 2023

• adds example ui_material

  MarkusTheOrt

  committed
  e65163e

• ran cargo fmt

  MarkusTheOrt

  committed
  d5e12d4

• Split ui_material pipeline into multiple files

  MarkusTheOrt

  committed
  bb19f42

• removes usage of UiPipeline inside UiMaterialPipeline

  MarkusTheOrt

  committed
  3b8022a

Commits on Aug 22, 2023

• Use UiMaterialVertex without mode field.

  Show description for ced9292
  MarkusTheOrt

  committed
  ced9292

• Apply suggestions from code review

  Show description for 62709a0
  

  MarkusTheOrt

  and

  ickshonpe

  authored
  62709a0

• removes export for UiVertex

  MarkusTheOrt

  committed
  62a51e0

• changed example ui_material back to single MaterialNodeBundle

  MarkusTheOrt

  committed
  d4327cc

Commits on Aug 23, 2023

• add UiVertexOutput shader export

  MarkusTheOrt

  committed
  7706744

Commits on Aug 24, 2023

• move UiVertexOutput into its own file (ui_vertex_output.wgsl)

  MarkusTheOrt

  committed
  493d3cc

Commits on Aug 27, 2023

• adds UiMaterialNode marker component

  MarkusTheOrt

  committed
  f637d7a

• Merge branch 'bevyengine:main' into ui_material

  MarkusTheOrt

  authored
  033dee0

• ran cargo fmt

  MarkusTheOrt

  committed
  86ae1b8

• Fix crash where a empty UiBatch spawns

  MarkusTheOrt

  committed
  66a4cd9

Commits on Sep 10, 2023

• Merge branch 'main' of github.com:MarkusTheOrt/bevy into ui_material

  MarkusTheOrt

  committed
  ac911ba

• Fix compiler errors, disables lots of functionality

  MarkusTheOrt

  committed
  d800744

• change extract_uinodes query to Has<UiMaterialNode>

  MarkusTheOrt

  committed
  4c65b29

• adds back material rendering capabilities

  MarkusTheOrt

  committed
  794b722

• ran cargo fmt

  MarkusTheOrt

  committed
  4a150cd

• fix compiler warnings

  MarkusTheOrt

  committed
  c9fcabe

• ran cargo fmt

  MarkusTheOrt

  committed
  193197a

• improve docs surrounding UiMaterial

  MarkusTheOrt

  committed
  d2fbd1d

• fix typo in doc comment

  MarkusTheOrt

  committed
  930ec95

Commits on Sep 11, 2023

• remove is_material from ExtracedUiNode

  MarkusTheOrt

  committed
  fef7fac

• update example ui_material

  MarkusTheOrt

  committed
  7eeb644

• add InheritedVisibility to MaterialNodeBundle

  MarkusTheOrt

  committed
  6294a17

• remove UiMaterialNode marker component

  MarkusTheOrt

  committed
  1226bf1

• adds description to ui_material example

  MarkusTheOrt

  committed
  301b193

Commits on Sep 12, 2023

• Fix typo in material_pipeline.rs

  MarkusTheOrt

  committed
  e77172b

Commits on Sep 14, 2023

• renamed some files to be more descriptive

  MarkusTheOrt

  committed
  239faf9

• removes vertexcolor from ui_material_pipeline

  Show description for 1239117
  MarkusTheOrt

  committed
  1239117

• updated example ui_material

  MarkusTheOrt

  committed
  bc2c029

• removes unused imports

  MarkusTheOrt

  committed
  84ef0ac

• ci fixes

  MarkusTheOrt

  committed
  62b99d6

• fixed wrong comment formatting

  MarkusTheOrt

  committed
  1e0727a

Commits on Sep 19, 2023

• Merge branch 'main' of github.com:MarkusTheOrt/bevy into ui_material

  MarkusTheOrt

  committed
  781fb57

Commits on Oct 6, 2023

• Apply suggestions from code review

  Show description for 7988610
  

  MarkusTheOrt

  and

  mockersf

  authored
  7988610

Commits on Oct 16, 2023

• Merge branch 'main' of github.com:MarkusTheOrt/bevy into ui_material

  MarkusTheOrt

  committed
  b51c143

• Update from main

  MarkusTheOrt

  committed
  57419c0

• add missing example in README

  MarkusTheOrt

  committed
  4a9bf5f

• code review changes

  MarkusTheOrt

  committed
  08cf2f3

• fix line ending in ui.wgsl

  MarkusTheOrt

  committed
  a978a1e

Commits on Oct 21, 2023

• add border sizes to vertex data

  MarkusTheOrt

  committed
  a3c613e

• Merge branch 'main' of github.com:MarkusTheOrt/bevy into ui_material

  MarkusTheOrt

  committed
  fb49734

• fix compile error

  MarkusTheOrt

  committed
  83d703a

• add docs for UiVertexOutput

  MarkusTheOrt

  committed
  b0c6ec9

• fix error in docs

  MarkusTheOrt

  committed
  12b6a33

• remove doc comment from UiMatreialBatch as suggested

  MarkusTheOrt

  committed
  3ea88ca

• apply suggestions from code review

  MarkusTheOrt

  committed
  65ae48a

• Merge branch 'main' of github.com:MarkusTheOrt/bevy into ui_material

  MarkusTheOrt

  committed
  b412839

• fix compile errors, fix wgsl imports

  MarkusTheOrt

  committed
  349af3c

• adopt new bind group API

  MarkusTheOrt

  committed
  d5909ba

Commits on Oct 23, 2023

• remove old import from example shader

  MarkusTheOrt

  committed
  c61a2aa

Commits on Oct 28, 2023

• Merge branch 'main' of github.com:MarkusTheOrt/bevy into ui_material

  MarkusTheOrt

  committed
  afe56e5

• apply suggestions from code review

  MarkusTheOrt

  committed
  f8267d1

Commits on Nov 3, 2023

• Merge branch 'main' of github.com:MarkusTheOrt/bevy into ui_material

  MarkusTheOrt

  committed
  2425a10