update for assetsv2

bevyengine · Sep 7, 2023 · ec14655 · ec14655
1 parent 562fec9
commit ec14655
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/crates/bevy_core_pipeline/src/deferred/copy_lighting_id.rs b/crates/bevy_core_pipeline/src/deferred/copy_lighting_id.rs
@@ -3,10 +3,9 @@ use crate::{
     prepass::{DeferredPrepass, ViewPrepassTextures},
 };
 use bevy_app::prelude::*;
-use bevy_asset::{load_internal_asset, HandleUntyped};
+use bevy_asset::{load_internal_asset, Handle};
 use bevy_ecs::prelude::*;
 use bevy_math::UVec2;
-use bevy_reflect::TypeUuid;
 use bevy_render::{
     camera::ExtractedCamera,
     render_resource::*,
@@ -28,8 +27,8 @@ use bevy_render::{
 
 use super::DEFERRED_LIGHTING_PASS_ID_DEPTH_FORMAT;
 
-const COPY_DEFERRED_LIGHTING_ID_SHADER_HANDLE: HandleUntyped =
-    HandleUntyped::weak_from_u64(Shader::TYPE_UUID, 5230948520734987);
+pub const COPY_DEFERRED_LIGHTING_ID_SHADER_HANDLE: Handle<Shader> =
+    Handle::weak_from_u128(5230948520734987);
 pub struct CopyDeferredLightingIdPlugin;
 
 impl Plugin for CopyDeferredLightingIdPlugin {
@@ -160,7 +159,7 @@ impl FromWorld for CopyDeferredLightingIdPipeline {
                     layout: vec![layout.clone()],
                     vertex: fullscreen_shader_vertex_state(),
                     fragment: Some(FragmentState {
-                        shader: COPY_DEFERRED_LIGHTING_ID_SHADER_HANDLE.typed(),
+                        shader: COPY_DEFERRED_LIGHTING_ID_SHADER_HANDLE,
                         shader_defs: vec![],
                         entry_point: "fragment".into(),
                         targets: vec![],

diff --git a/crates/bevy_pbr/src/deferred/mod.rs b/crates/bevy_pbr/src/deferred/mod.rs
@@ -1,6 +1,6 @@
 use crate::{MeshPipeline, MeshViewBindGroup, ScreenSpaceAmbientOcclusionSettings};
 use bevy_app::prelude::*;
-use bevy_asset::{load_internal_asset, HandleUntyped};
+use bevy_asset::{load_internal_asset, Handle};
 use bevy_core_pipeline::{
     clear_color::ClearColorConfig,
     core_3d,
@@ -25,7 +25,6 @@ use bevy_render::{
     Render, RenderSet,
 };
 
-use bevy_reflect::TypeUuid;
 use bevy_render::{
     render_graph::RenderGraphApp, render_resource::*, texture::BevyDefault, view::ExtractedView,
     RenderApp,
@@ -38,8 +37,8 @@ use crate::{
 
 pub struct PbrDeferredLightingPlugin;
 
-pub const DEFERRED_LIGHTING_SHADER_HANDLE: HandleUntyped =
-    HandleUntyped::weak_from_u64(Shader::TYPE_UUID, 2708011359337029741);
+pub const DEFERRED_LIGHTING_SHADER_HANDLE: Handle<Shader> =
+    Handle::weak_from_u128(2708011359337029741);
 
 pub const DEFAULT_PBR_DEFERRED_LIGHTING_DEPTH_ID: u8 = 1;
 
@@ -310,13 +309,13 @@ impl SpecializedRenderPipeline for DeferredLightingLayout {
                 self.bind_group_layout_1.clone(),
             ],
             vertex: VertexState {
-                shader: DEFERRED_LIGHTING_SHADER_HANDLE.typed(),
+                shader: DEFERRED_LIGHTING_SHADER_HANDLE,
                 shader_defs: shader_defs.clone(),
                 entry_point: "vertex".into(),
                 buffers: Vec::new(),
             },
             fragment: Some(FragmentState {
-                shader: DEFERRED_LIGHTING_SHADER_HANDLE.typed(),
+                shader: DEFERRED_LIGHTING_SHADER_HANDLE,
                 shader_defs,
                 entry_point: "fragment".into(),
                 targets: vec![Some(ColorTargetState {

diff --git a/crates/bevy_pbr/src/pbr_material.rs b/crates/bevy_pbr/src/pbr_material.rs
@@ -585,7 +585,7 @@ impl Material for StandardMaterial {
     }
 
     fn deferred_fragment_shader() -> ShaderRef {
-        PBR_SHADER_HANDLE.typed().into()
+        PBR_SHADER_HANDLE.into()
     }
 
     fn fragment_shader() -> ShaderRef {