Skip to content

Move MaterialProperties from bevy_pbr to bevy_material #21543

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
Draft
Zeophlite wants to merge 25 commits into
base: main
Choose a base branch
from
Draft

Move MaterialProperties from bevy_pbr to bevy_material #21543

Zeophlite wants to merge 25 commits into from
+3,641 −2,763

Conversation

@Zeophlite
Copy link
Contributor

@Zeophlite Zeophlite commented Oct 14, 2025 •
edited
Loading

Objective

Solution

  • Move stuff, mainly look at these 3 crates:
    • from bevy_pbr to bevy_material
    • from bevy_render to bevy_material
    • from bevy_pbr to bevy_render

Testing

  • Builds

@Zeophlite Zeophlite mentioned this pull request Oct 14, 2025
Closed
@Zeophlite Zeophlite force-pushed the mat-prop4 branch 2 times, most recently from 82707d2 to 5f6c9ab Compare October 14, 2025 19:14
@github-actions
Copy link
Contributor

github-actions bot commented Oct 14, 2025

You added a new feature but didn't update the readme. Please run cargo run -p build-templated-pages -- update features to update it, and commit the file change.

@alice-i-cecile alice-i-cecile added A-Rendering Drawing game state to the screen M-Release-Note Work that should be called out in the blog due to impact labels Oct 15, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Oct 15, 2025

It looks like your PR has been selected for a highlight in the next release blog post, but you didn't provide a release note.

Please review the instructions for writing release notes, then expand or revise the content in the release notes directory to showcase your changes.

@alice-i-cecile alice-i-cecile added S-Blocked This cannot move forward until something else changes X-Controversial There is active debate or serious implications around merging this PR D-Modest A "normal" level of difficulty; suitable for simple features or challenging fixes labels Oct 15, 2025
@alice-i-cecile alice-i-cecile added this to the 0.18 milestone Oct 15, 2025
@Zeophlite Zeophlite requested a review from atlv24 October 16, 2025 07:12
@Zeophlite Zeophlite removed the S-Blocked This cannot move forward until something else changes label Oct 17, 2025
atlv24
atlv24 reviewed Oct 17, 2025
View reviewed changes
@Zeophlite Zeophlite force-pushed the mat-prop4 branch 2 times, most recently from db3dad3 to 23ef4e8 Compare October 17, 2025 07:16
@Zeophlite
Copy link
Contributor Author

Zeophlite commented Oct 17, 2025 •
edited
Loading

I suggest reviewing commit by commit - commits are now in the following order:

  • Boilerplate for bevy_material and bevy_material_macros
  • Conversions required later on (e.g. From<World> changes, etc.)
  • Moves (generally one file at a time)

Have a look at the migration guide for a summary of all moves

@Zeophlite Zeophlite marked this pull request as ready for review October 17, 2025 07:23
@Zeophlite Zeophlite added the S-Needs-Review Needs reviewer attention (from anyone!) to move forward label Oct 17, 2025
@Zeophlite Zeophlite force-pushed the mat-prop4 branch 2 times, most recently from 883b81d to 92f5f95 Compare November 30, 2025 16:28
@Zeophlite

This comment was marked as outdated.

Sign in to view
@Zeophlite
Opaque move
dd90580
@Zeophlite
Move ShaderLabel, DrawFunctionLabel, wgpu exports from render_resourc…
f747d6f 
…e, bind_group_layout_entries
@Zeophlite
Move DrawFunctionId
1bbbe47
@Zeophlite
Move SpecializedMeshPipelineError
471ca19
@Zeophlite
Move MESH_PIPELINE_VIEW_LAYOUT_SAFE_MAX_TEXTURES, MeshPipelineKey
7a38b16
@Zeophlite
Move MATERIAL_BIND_GROUP_INDEX, ErasedMaterialPipelineKey, ErasedMate…
a73219d 
…rialKey, ErasedMaterialKeyVTable, RenderPhaseType
@Zeophlite
Move MeshPipelineViewLayout, MeshPipelineViewLayoutKey, MeshPipelineV…
12358ac 
…iewLayouts
@Zeophlite
Move MeshLayouts
0da6d52
@Zeophlite
Deprecate get_image_texture for MeshPipeline and Mesh2dPipeline, chan…
09e03ea 
…ge dummy to Image in MeshPipeline
@Zeophlite
Move most of lightmap to bevy_render
06c1350
@Zeophlite
Move MaterialBindingId, MaterialBindGroupIndex, MaterialBindGroupSlot…
7bb3f00 
… to bevy_render
@Zeophlite
Move MeshTransforms, MeshUniform, MeshInputUniform, MeshFlags, Render…
14f15be 
…MeshInstanceFlags, RenderMeshInstanceCpu, RenderMeshInstanceGpu, PreviousGlobalTransform, RenderMeshInstanceShared, remove_mesh_input_uniform to bevy_render
@Zeophlite
Move MAX_JOINTS, MAX_TOTAL_JOINTS, JOINTS_PER_ALLOCATION_UNIT, JOINT_…
efa29b6 
…EXTRACTION_THRESHOLD_FACTOR, SkinByteOffset, SkinUniforms, SkinUniformInfo to bevy_render
@Zeophlite
Move util consts
0490cbd
@Zeophlite
Move RenderMeshInstances, RenderMeshInstancesCpu, RenderMeshInstances…
cdd7be1 
…Gpu, RenderMeshQueueData to bevy_render
@Zeophlite
Move MaterialProperties and MaterialPipeline to bevy_material
06ff5cc
@Zeophlite
More on migration guide / release notes
20de02d
@Zeophlite
Move UvChannel to bevy_material
3c10cfb 
UvChannel migration
@Zeophlite
doc fix
3cb765c
@Zeophlite
Copy link
Contributor Author

Zeophlite commented Dec 6, 2025

Alternative followup - Zeophlite#6

This was referenced Dec 6, 2025
Open
Open
@alice-i-cecile alice-i-cecile modified the milestones: 0.18, 0.19 Dec 10, 2025
This was referenced Jan 8, 2026
Draft
Merged
github-merge-queue bot pushed a commit that referenced this pull request Jan 8, 2026
@atlv24 @Zeophlite
SkinUniforms to RenderStartup (#22427)
48b1016 
# Objective

- Merge a good change from #21543

## Solution

- cherry pick the 1448bb5 commit

## Testing

- many_foxes and 3d_scene run

Co-authored-by: Daniel Skates <zeophlite@gmail.com>
@Zeophlite
Copy link
Contributor Author

Zeophlite commented Jan 9, 2026

Superceded by #22426 , will keep this in draft, then close after that merges

@Zeophlite Zeophlite marked this pull request as draft January 9, 2026 00:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tychedelia tychedelia Awaiting requested review from tychedelia

@atlv24 atlv24 Awaiting requested review from atlv24

Assignees

No one assigned

Labels

A-Rendering Drawing game state to the screen D-Modest A "normal" level of difficulty; suitable for simple features or challenging fixes M-Release-Note Work that should be called out in the blog due to impact S-Needs-Review Needs reviewer attention (from anyone!) to move forward X-Controversial There is active debate or serious implications around merging this PR

Projects

Rendering
Status: No status

Milestone

0.19

Development

Successfully merging this pull request may close these issues.

3 participants

@Zeophlite @atlv24 @alice-i-cecile