Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ default = [
"bevy_camera",
"bevy_light",
"bevy_shader",
"bevy_material",
"bevy_sprite",
"bevy_sprite_picking_backend",
"bevy_sprite_render",
Expand Down Expand Up @@ -279,6 +280,9 @@ bevy_light = ["bevy_internal/bevy_light"]
# Provides shaders usable through asset handles.
bevy_shader = ["bevy_internal/bevy_shader"]

# Provides materials.
bevy_material = ["bevy_internal/bevy_material"]

# Adds support for rendering gizmos
bevy_gizmos = ["bevy_internal/bevy_gizmos"]

Expand Down
1 change: 1 addition & 0 deletions crates/bevy_core_pipeline/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ bevy_derive = { path = "../bevy_derive", version = "0.18.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.18.0-dev" }
bevy_image = { path = "../bevy_image", version = "0.18.0-dev" }
bevy_camera = { path = "../bevy_camera", version = "0.18.0-dev" }
bevy_material = { path = "../bevy_material", version = "0.18.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.18.0-dev" }
bevy_shader = { path = "../bevy_shader", version = "0.18.0-dev" }
bevy_render = { path = "../bevy_render", version = "0.18.0-dev" }
Expand Down
3 changes: 2 additions & 1 deletion crates/bevy_core_pipeline/src/core_2d/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ use core::ops::Range;
use bevy_asset::UntypedAssetId;
use bevy_camera::{Camera, Camera2d};
use bevy_image::ToExtents;
use bevy_material::render_phase::DrawFunctionId;
use bevy_platform::collections::{HashMap, HashSet};
use bevy_render::{
batching::gpu_preprocessing::GpuPreprocessingMode,
Expand All @@ -58,7 +59,7 @@ use bevy_render::{
extract_component::ExtractComponentPlugin,
render_graph::{EmptyNode, RenderGraphExt, ViewNodeRunner},
render_phase::{
sort_phase_system, BinnedPhaseItem, CachedRenderPipelinePhaseItem, DrawFunctionId,
sort_phase_system, BinnedPhaseItem, CachedRenderPipelinePhaseItem,
DrawFunctions, PhaseItem, PhaseItemExtraIndex, SortedPhaseItem, ViewBinnedRenderPhases,
ViewSortedRenderPhases,
},
Expand Down
13 changes: 3 additions & 10 deletions crates/bevy_core_pipeline/src/core_3d/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@ pub mod graph {
}
}

// PERF: vulkan docs recommend using 24 bit depth for better performance
pub const CORE_3D_DEPTH_FORMAT: TextureFormat = TextureFormat::Depth32Float;

/// True if multisampled depth textures are supported on this platform.
///
/// In theory, Naga supports depth textures on WebGL 2. In practice, it doesn't,
Expand All @@ -73,13 +70,9 @@ pub const DEPTH_TEXTURE_SAMPLING_SUPPORTED: bool = true;
use core::ops::Range;

use bevy_camera::{Camera, Camera3d, Camera3dDepthLoadOp};
use bevy_material::render_phase::DrawFunctionId;
use bevy_render::{
batching::gpu_preprocessing::{GpuPreprocessingMode, GpuPreprocessingSupport},
camera::CameraRenderGraph,
experimental::occlusion_culling::OcclusionCulling,
mesh::allocator::SlabId,
render_phase::PhaseItemBatchSetKey,
view::{prepare_view_targets, NoIndirectDrawing, RetainedViewEntity},
batching::gpu_preprocessing::{GpuPreprocessingMode, GpuPreprocessingSupport}, camera::CameraRenderGraph, experimental::occlusion_culling::OcclusionCulling, mesh::allocator::SlabId, render_phase::PhaseItemBatchSetKey, render_resource::CORE_3D_DEPTH_FORMAT, view::{prepare_view_targets, NoIndirectDrawing, RetainedViewEntity}
};
pub use main_opaque_pass_3d_node::*;
pub use main_transparent_pass_3d_node::*;
Expand All @@ -97,7 +90,7 @@ use bevy_render::{
prelude::Msaa,
render_graph::{EmptyNode, RenderGraphExt, ViewNodeRunner},
render_phase::{
sort_phase_system, BinnedPhaseItem, CachedRenderPipelinePhaseItem, DrawFunctionId,
sort_phase_system, BinnedPhaseItem, CachedRenderPipelinePhaseItem,
DrawFunctions, PhaseItem, PhaseItemExtraIndex, SortedPhaseItem, ViewBinnedRenderPhases,
ViewSortedRenderPhases,
},
Expand Down
3 changes: 2 additions & 1 deletion crates/bevy_core_pipeline/src/deferred/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ use core::ops::Range;

use crate::prepass::{OpaqueNoLightmap3dBatchSetKey, OpaqueNoLightmap3dBinKey};
use bevy_ecs::prelude::*;
use bevy_material::render_phase::DrawFunctionId;
use bevy_render::sync_world::MainEntity;
use bevy_render::{
render_phase::{
BinnedPhaseItem, CachedRenderPipelinePhaseItem, DrawFunctionId, PhaseItem,
BinnedPhaseItem, CachedRenderPipelinePhaseItem, PhaseItem,
PhaseItemExtraIndex,
},
render_resource::{CachedRenderPipelineId, TextureFormat},
Expand Down
3 changes: 2 additions & 1 deletion crates/bevy_core_pipeline/src/prepass/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,15 @@ use core::ops::Range;
use crate::deferred::{DEFERRED_LIGHTING_PASS_ID_FORMAT, DEFERRED_PREPASS_FORMAT};
use bevy_asset::UntypedAssetId;
use bevy_ecs::prelude::*;
use bevy_material::render_phase::DrawFunctionId;
use bevy_math::Mat4;
use bevy_reflect::{std_traits::ReflectDefault, Reflect};
use bevy_render::mesh::allocator::SlabId;
use bevy_render::render_phase::PhaseItemBatchSetKey;
use bevy_render::sync_world::MainEntity;
use bevy_render::{
render_phase::{
BinnedPhaseItem, CachedRenderPipelinePhaseItem, DrawFunctionId, PhaseItem,
BinnedPhaseItem, CachedRenderPipelinePhaseItem, PhaseItem,
PhaseItemExtraIndex,
},
render_resource::{
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_core_pipeline/src/skybox/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ use bevy_utils::default;
use prepass::SkyboxPrepassPipeline;

use crate::{
core_3d::CORE_3D_DEPTH_FORMAT, prepass::PreviousViewUniforms,
prepass::PreviousViewUniforms,
skybox::prepass::init_skybox_prepass_pipeline,
};

Expand Down
3 changes: 1 addition & 2 deletions crates/bevy_core_pipeline/src/skybox/prepass.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use bevy_render::{
binding_types::uniform_buffer, BindGroup, BindGroupEntries, BindGroupLayoutDescriptor,
BindGroupLayoutEntries, CachedRenderPipelineId, CompareFunction, DepthStencilState,
FragmentState, MultisampleState, PipelineCache, RenderPipelineDescriptor, ShaderStages,
SpecializedRenderPipeline, SpecializedRenderPipelines,
SpecializedRenderPipeline, SpecializedRenderPipelines, CORE_3D_DEPTH_FORMAT,
},
renderer::RenderDevice,
view::{Msaa, ViewUniform, ViewUniforms},
Expand All @@ -22,7 +22,6 @@ use bevy_shader::Shader;
use bevy_utils::prelude::default;

use crate::{
core_3d::CORE_3D_DEPTH_FORMAT,
prepass::{
prepass_target_descriptors, MotionVectorPrepass, NormalPrepass, PreviousViewData,
PreviousViewUniforms,
Expand Down
1 change: 1 addition & 0 deletions crates/bevy_gizmos/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ bevy_light = { path = "../bevy_light", version = "0.18.0-dev" }
bevy_color = { path = "../bevy_color", version = "0.18.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.18.0-dev" }
bevy_image = { path = "../bevy_image", version = "0.18.0-dev" }
bevy_material = { path = "../bevy_material", version = "0.18.0-dev" }
bevy_mesh = { path = "../bevy_mesh", version = "0.18.0-dev" }
bevy_math = { path = "../bevy_math", version = "0.18.0-dev" }
bevy_asset = { path = "../bevy_asset", version = "0.18.0-dev" }
Expand Down
5 changes: 3 additions & 2 deletions crates/bevy_gizmos/src/pipeline_3d.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use bevy_app::{App, Plugin};
use bevy_asset::{load_embedded_asset, AssetServer, Handle};
use bevy_camera::visibility::RenderLayers;
use bevy_core_pipeline::{
core_3d::{Transparent3d, CORE_3D_DEPTH_FORMAT},
core_3d::{Transparent3d},
oit::OrderIndependentTransparencySettings,
prepass::{DeferredPrepass, DepthPrepass, MotionVectorPrepass, NormalPrepass},
};
Expand All @@ -21,7 +21,8 @@ use bevy_ecs::{
system::{Commands, Query, Res, ResMut},
};
use bevy_image::BevyDefault as _;
use bevy_pbr::{MeshPipeline, MeshPipelineKey, SetMeshViewBindGroup};
use bevy_material::render::{MeshPipeline, MeshPipelineKey};
use bevy_pbr::{SetMeshViewBindGroup};
use bevy_render::{
render_asset::{prepare_assets, RenderAssets},
render_phase::{
Expand Down
1 change: 1 addition & 0 deletions crates/bevy_gltf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ bevy_mesh = { path = "../bevy_mesh", version = "0.18.0-dev" }
bevy_pbr = { path = "../bevy_pbr", version = "0.18.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.18.0-dev" }
bevy_render = { path = "../bevy_render", version = "0.18.0-dev" }
bevy_material = { path = "../bevy_material", version = "0.18.0-dev" }
bevy_scene = { path = "../bevy_scene", version = "0.18.0-dev" }
bevy_transform = { path = "../bevy_transform", version = "0.18.0-dev" }
bevy_tasks = { path = "../bevy_tasks", version = "0.18.0-dev" }
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_gltf/src/loader/gltf_ext/material.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use bevy_material::alpha::AlphaMode;
use bevy_math::Affine2;
use bevy_pbr::UvChannel;
use bevy_render::alpha::AlphaMode;

use gltf::{json::texture::Info, Material};

Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_gltf/src/loader/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ use bevy_mesh::{
};
#[cfg(feature = "pbr_transmission_textures")]
use bevy_pbr::UvChannel;
use bevy_pbr::{MeshMaterial3d, StandardMaterial, MAX_JOINTS};
use bevy_pbr::{MeshMaterial3d, StandardMaterial};
use bevy_platform::collections::{HashMap, HashSet};
use bevy_render::render_resource::Face;
use bevy_render::{mesh::skin::MAX_JOINTS, render_resource::Face};
use bevy_scene::Scene;
#[cfg(not(target_arch = "wasm32"))]
use bevy_tasks::IoTaskPool;
Expand Down
6 changes: 6 additions & 0 deletions crates/bevy_internal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,11 @@ bevy_window = ["dep:bevy_window", "dep:bevy_a11y", "bevy_image"]
bevy_winit = ["dep:bevy_winit", "bevy_window"]
bevy_camera = ["dep:bevy_camera", "bevy_mesh", "bevy_window"]
bevy_scene = ["dep:bevy_scene", "bevy_asset"]
bevy_material = [
"dep:bevy_material",
"bevy_image",
"bevy_shader",
]
bevy_light = ["dep:bevy_light", "bevy_camera"]
bevy_render = [
"dep:bevy_render",
Expand Down Expand Up @@ -485,6 +490,7 @@ bevy_gltf = { path = "../bevy_gltf", optional = true, version = "0.18.0-dev" }
bevy_feathers = { path = "../bevy_feathers", optional = true, version = "0.18.0-dev" }
bevy_image = { path = "../bevy_image", optional = true, version = "0.18.0-dev" }
bevy_shader = { path = "../bevy_shader", optional = true, version = "0.18.0-dev" }
bevy_material = { path = "../bevy_material", optional = true, version = "0.18.0-dev" }
bevy_mesh = { path = "../bevy_mesh", optional = true, version = "0.18.0-dev" }
bevy_camera = { path = "../bevy_camera", optional = true, version = "0.18.0-dev" }
bevy_light = { path = "../bevy_light", optional = true, version = "0.18.0-dev" }
Expand Down
2 changes: 2 additions & 0 deletions crates/bevy_internal/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ pub use bevy_input_focus as input_focus;
pub use bevy_light as light;
#[cfg(feature = "bevy_log")]
pub use bevy_log as log;
#[cfg(feature = "bevy_material")]
pub use bevy_material as material;
pub use bevy_math as math;
#[cfg(feature = "bevy_mesh")]
pub use bevy_mesh as mesh;
Expand Down
4 changes: 4 additions & 0 deletions crates/bevy_internal/src/prelude.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ pub use crate::camera::prelude::*;
#[cfg(feature = "bevy_shader")]
pub use crate::shader::prelude::*;

#[doc(hidden)]
#[cfg(feature = "bevy_material")]
pub use crate::material::prelude::*;

pub use bevy_derive::{bevy_main, Deref, DerefMut};

#[doc(hidden)]
Expand Down
45 changes: 45 additions & 0 deletions crates/bevy_material/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
[package]
name = "bevy_material"
version = "0.18.0-dev"
edition = "2024"
description = "Provides a material abstraction for Bevy Engine"
homepage = "https://bevy.org"
repository = "https://github.com/bevyengine/bevy"
license = "MIT OR Apache-2.0"
keywords = ["bevy"]

[dependencies]
# bevy
bevy_app = { path = "../bevy_app", version = "0.18.0-dev" }
bevy_asset = { path = "../bevy_asset", version = "0.18.0-dev" }
bevy_camera = { path = "../bevy_camera", version = "0.18.0-dev" }
bevy_color = { path = "../bevy_color", version = "0.18.0-dev" }
bevy_derive = { path = "../bevy_derive", version = "0.18.0-dev" }
bevy_utils = { path = "../bevy_utils", version = "0.18.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.18.0-dev" }
bevy_material_macros = { path = "macros", version = "0.18.0-dev" }
bevy_math = { path = "../bevy_math", version = "0.18.0-dev" }
bevy_mesh = { path = "../bevy_mesh", version = "0.18.0-dev" }
bevy_image = { path = "../bevy_image", version = "0.18.0-dev" }
bevy_shader = { path = "../bevy_shader", version = "0.18.0-dev" }
bevy_transform = { path = "../bevy_transform", version = "0.18.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.18.0-dev" }
bevy_platform = { path = "../bevy_platform", version = "0.18.0-dev" }

encase = "0.12"
offset-allocator = "0.2"
tracing = { version = "0.1", default-features = false, features = ["std"] }
thiserror = { version = "2", default-features = false }
wgpu-types = { version = "26", default-features = false }
variadics_please = "1.1"
bitflags = "2"
static_assertions = "1"
nonmax = "0.5"
smallvec = { version = "1", default-features = false }

[lints]
workspace = true

[package.metadata.docs.rs]
rustdoc-args = ["-Zunstable-options", "--generate-link-to-definition"]
all-features = true
Loading
Loading