fix compiler warnings

crates/bevy_ui/src/lib.rs

@@ -37,7 +37,7 @@ pub mod prelude {
  #[doc(hidden)]
  pub use crate::{
  camera_config::*, geometry::*, material::*, node_bundles::*, ui_node::*, widget::Button,
- widget::Label, Interaction, UiScale,
+ widget::Label, Interaction, UiScale, UiMaterialPlugin
  };
 }
 

crates/bevy_ui/src/material.rs

@@ -22,7 +22,7 @@ use bevy_render::render_resource::{AsBindGroup, RenderPipelineDescriptor, Shader
 /// # use bevy_render::{render_resource::{AsBindGroup, ShaderRef}, texture::Image, color::Color};
 /// # use bevy_asset::{Handle, AssetServer, Assets, Asset};
 ///
-/// #[derive(AsBindGroup, Debug, Clone, Asset)]
+/// #[derive(AsBindGroup, Asset, TypePath, Debug, Clone)]
 /// pub struct CustomMaterial {
 /// // Uniform bindings must implement `ShaderType`, which will be used to convert the value to
 /// // its shader-compatible equivalent. Most core math types already implement `ShaderType`.

crates/bevy_ui/src/node_bundles.rs

@@ -7,7 +7,7 @@ use crate::{
  BackgroundColor, BorderColor, ContentSize, FocusPolicy, Interaction, Node, Style, UiImage,
  UiMaterial, UiMaterialNode, UiTextureAtlasImage, ZIndex,
 };
-use bevy_asset::{AssetId, Handle};
+use bevy_asset::{Handle};
 use bevy_ecs::bundle::Bundle;
 use bevy_render::{
  prelude::Color,

crates/bevy_ui/src/render/material_pipeline.rs

@@ -18,21 +18,19 @@ use bevy_math::{Mat4, Rect, Vec2, Vec4Swizzles};
 use bevy_render::{
  extract_component::ExtractComponentPlugin,
  prelude::Color,
- render_asset::{prepare_assets, RenderAssets},
+ render_asset::RenderAssets,
  render_phase::{
- sort_phase_system, AddRenderCommand, CachedRenderPipelinePhaseItem, DrawFunctionId,
- DrawFunctions, PhaseItem, RenderCommand, RenderCommandResult, RenderPhase, SetItemPipeline,
- TrackedRenderPass,
+ AddRenderCommand, DrawFunctions, PhaseItem, RenderCommand, RenderCommandResult,
+ RenderPhase, SetItemPipeline, TrackedRenderPass,
  },
  render_resource::{
  AsBindGroupError, BindGroup, BindGroupDescriptor, BindGroupEntry, BindGroupLayout,
  BindGroupLayoutDescriptor, BindGroupLayoutEntry, BindingType, BlendState,
- BufferBindingType, BufferUsages, BufferVec, CachedRenderPipelineId, ColorTargetState,
- ColorWrites, FragmentState, FrontFace, MultisampleState, OwnedBindingResource,
- PipelineCache, PolygonMode, PrimitiveState, PrimitiveTopology, RenderPipelineDescriptor,
- Shader, ShaderRef, ShaderStages, ShaderType, SpecializedRenderPipeline,
- SpecializedRenderPipelines, TextureFormat, VertexBufferLayout, VertexFormat, VertexState,
- VertexStepMode,
+ BufferBindingType, BufferUsages, BufferVec, ColorTargetState, ColorWrites, FragmentState,
+ FrontFace, MultisampleState, OwnedBindingResource, PipelineCache, PolygonMode,
+ PrimitiveState, PrimitiveTopology, RenderPipelineDescriptor, Shader, ShaderRef,
+ ShaderStages, ShaderType, SpecializedRenderPipeline, SpecializedRenderPipelines,
+ TextureFormat, VertexBufferLayout, VertexFormat, VertexState, VertexStepMode,
  },
  renderer::{RenderDevice, RenderQueue},
  texture::{BevyDefault, FallbackImage, Image},
@@ -86,7 +84,6 @@ where
 
  if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
  render_app
- // .init_resource::<DrawFunctions<TransparentMaterialUi>>()
  .add_render_command::<TransparentUi, DrawUiMaterial<M>>()
  .init_resource::<ExtractedUiMaterials<M>>()
  .init_resource::<ExtractedUiMaterialNodes<M>>()
@@ -105,7 +102,6 @@ where
  (
  prepare_ui_materials::<M>.in_set(RenderSet::PrepareAssets),
  queue_ui_material_nodes::<M>.in_set(RenderSet::Queue),
- // sort_phase_system::<TransparentMaterialUi>.in_set(RenderSet::PhaseSort),
  prepare_uimaterial_nodes::<M>.in_set(RenderSet::PrepareBindGroups),
  ),
  );
@@ -466,9 +462,7 @@ pub fn prepare_uimaterial_nodes<M: UiMaterial>(
  batches.push((item.entity, new_batch));
 
  existing_batch = batches.last_mut();
- } else {
- continue;
- }
+ } 
 
  let uinode_rect = extracted_uinode.rect;
 
@@ -551,6 +545,7 @@ pub fn prepare_uimaterial_nodes<M: UiMaterial>(
  color: Color::WHITE.as_linear_rgba_f32(),
  });
  }
+
  index += QUAD_INDICES.len() as u32;
  existing_batch.unwrap().1.range.end = index;
  ui_phase.items[batch_item_index].batch_size += 1;
@@ -746,47 +741,3 @@ pub fn queue_ui_material_nodes<M: UiMaterial>(
  }
  }
 }
-
-pub struct TransparentMaterialUi {
- pub sort_key: FloatOrd,
- pub entity: Entity,
- pub pipeline: CachedRenderPipelineId,
- pub draw_function: DrawFunctionId,
- pub batch_size: usize,
-}
-
-impl PhaseItem for TransparentMaterialUi {
- type SortKey = FloatOrd;
-
- #[inline]
- fn entity(&self) -> Entity {
- self.entity
- }
-
- #[inline]
- fn sort_key(&self) -> Self::SortKey {
- self.sort_key
- }
-
- #[inline]
- fn draw_function(&self) -> DrawFunctionId {
- self.draw_function
- }
-
- #[inline]
- fn sort(items: &mut [Self]) {
- items.sort_by_key(|item| item.sort_key());
- }
-
- #[inline]
- fn batch_size(&self) -> usize {
- self.batch_size
- }
-}
-
-impl CachedRenderPipelinePhaseItem for TransparentMaterialUi {
- #[inline]
- fn cached_pipeline(&self) -> CachedRenderPipelineId {
- self.pipeline
- }
-}

examples/ui/ui_material.rs

@@ -4,7 +4,6 @@
 use bevy::prelude::*;
 use bevy::reflect::TypePath;
 use bevy::render::render_resource::*;
-use bevy::ui::UiMaterialPlugin;
 
 fn main() {
  App::new()