Skip to content

Fix shader#219

Merged
Nilirad merged 1 commit intobevy-mainfrom
fix-shader
Jul 8, 2023
Merged

Fix shader#219
Nilirad merged 1 commit intobevy-mainfrom
fix-shader

Conversation

@Nilirad
Copy link
Copy Markdown
Collaborator

@Nilirad Nilirad commented Jul 8, 2023

bevyengine/bevy#5703 changed how WGSL shaders are imported in Bevy. This PR fixes shape_material.wgsl to correctly import Bevy shader structs.

@Nilirad Nilirad merged commit 3d4641c into bevy-main Jul 8, 2023
@Nilirad Nilirad deleted the fix-shader branch July 8, 2023 13:10
Nilirad added a commit that referenced this pull request Jul 10, 2023
* Update code after changes of systems api in bevy (#208)

Breaking changes were introduced in
bevyengine/bevy#8079

* Use GitHub Actions config from master branch (#217)

* Use GitHub Actions config from master branch

* Fix formatting

* Fix deprecation warnings on add_plugin

* Fix CI (#218)

* Fix shader (#219)

* Depend on Bevy 0.11

* Bump version to v0.9.0

* Use cargo add instruction in README

* Update README

* Update CHANGELOG

---------

Co-authored-by: Michał Iwańczuk <miwanczuk7@gmail.com>
Nilirad added a commit that referenced this pull request Feb 19, 2024
* Use GitHub Actions config from master branch

* Fix formatting

* Fix deprecation warnings on add_plugin

Fix CI (#218)

Fix shader (#219)

Suggest to use `cargo add` in README.md (#222)

Use `SpatialBundle` (#221)

Use `configure_sets` API (#223)

Use `MaterialMesh2dBundle` with `ColorMaterial` (#224)

* Use `MaterialMesh2dBundle` with `ColorMaterial`

* clippy

* Fix green channel filtering bug

* Clippy again

Fix clippy (#229)

* Add `RenderAssetPersistencePolicy` to `Mesh::new` call

* Use built-in `Name` component in `svg` example

Fix CI (#234)

* Use `RenderAssetUsages`

* Specify which `RegularPolygon` to use

Fix CI (#237)

Update Cargo.toml

Update `README.md`

Update CHANGELOG.md
Nilirad added a commit that referenced this pull request Feb 19, 2024
* Use GitHub Actions config from master branch

* Fix formatting

* Fix deprecation warnings on add_plugin

Fix CI (#218)

Fix shader (#219)

Suggest to use `cargo add` in README.md (#222)

Use `SpatialBundle` (#221)

Use `configure_sets` API (#223)

Use `MaterialMesh2dBundle` with `ColorMaterial` (#224)

* Use `MaterialMesh2dBundle` with `ColorMaterial`

* clippy

* Fix green channel filtering bug

* Clippy again

Fix clippy (#229)

* Add `RenderAssetPersistencePolicy` to `Mesh::new` call

* Use built-in `Name` component in `svg` example

Fix CI (#234)

* Use `RenderAssetUsages`

* Specify which `RegularPolygon` to use

Fix CI (#237)

Update Cargo.toml

Update `README.md`

Update CHANGELOG.md
Nilirad added a commit that referenced this pull request Feb 19, 2024
* Squash commit (updates for Bevy 0.13)

* Use GitHub Actions config from master branch

* Fix formatting

* Fix deprecation warnings on add_plugin

Fix CI (#218)

Fix shader (#219)

Suggest to use `cargo add` in README.md (#222)

Use `SpatialBundle` (#221)

Use `configure_sets` API (#223)

Use `MaterialMesh2dBundle` with `ColorMaterial` (#224)

* Use `MaterialMesh2dBundle` with `ColorMaterial`

* clippy

* Fix green channel filtering bug

* Clippy again

Fix clippy (#229)

* Add `RenderAssetPersistencePolicy` to `Mesh::new` call

* Use built-in `Name` component in `svg` example

Fix CI (#234)

* Use `RenderAssetUsages`

* Specify which `RegularPolygon` to use

Fix CI (#237)

Update Cargo.toml

Update `README.md`

Update CHANGELOG.md

* Clippy!!!
Nilirad added a commit that referenced this pull request Jul 5, 2024
Nilirad added a commit that referenced this pull request Jul 5, 2024
* Resolve merge conflicts

* Use GitHub Actions config from master branch (#217)

* Use GitHub Actions config from master branch

* Fix formatting

* Fix deprecation warnings on add_plugin

* Fix CI (#218)

* Fix shader (#219)

* Use `SpatialBundle` (#221)

* Use `MaterialMesh2dBundle` with `ColorMaterial` (#224)

* Use `MaterialMesh2dBundle` with `ColorMaterial`

* clippy

* Fix green channel filtering bug

* Clippy again

* Fix CI (#237)

* Rename `Color` to `LegacyColor` (#240)

* Rename usages of `Color` to `LegacyColor`

* Fix tests

* Revert "Rename `Color` to `LegacyColor` (#240)" (#243)

This reverts commit 6918ca1.

* Migrate to `bevy_color` (#242)

* Migrate to `bevy_color`

The example `dynamic_shape` does not work.

* Update palette color usage

* Fix tests

* Fix CI (#244)

* Fix CI

* Update to bevy 0.14 (#247)

* update to bevy 0.14.0-rc.3

* Depend on `main` branch of Bevy

---------

Co-authored-by: Nilirad <gisquerin@gmail.com>

* Fix CI (#248)

* Update Cargo.toml

* Update documents

---------

Co-authored-by: Alix Bott <bott.alix@gmail.com>
Co-authored-by: a <52638772+aMyTimed@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant