diff options
Diffstat (limited to 'engine/src/shader/default.rs')
| -rw-r--r-- | engine/src/shader/default.rs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/engine/src/shader/default.rs b/engine/src/shader/default.rs index 28bbdc9..bc8202c 100644 --- a/engine/src/shader/default.rs +++ b/engine/src/shader/default.rs @@ -15,13 +15,14 @@ use crate::material::{Flags as MaterialFlags, Material}; use crate::matrix::Matrix; use crate::model::{MaterialSearchResult, Model}; use crate::projection::{ClipVolume as ProjectionClipVolume, Projection}; -use crate::renderer::{DEFAULT_TEXTURE_ASSET_LABEL, PendingShaderBindings}; +use crate::renderer::PendingShaderBindings; use crate::shader::cursor::{BindingValue as ShaderBindingValue, Cursor as ShaderCursor}; use crate::shader::{ Context as ShaderContext, ModuleSource as ShaderModuleSource, Shader, }; +use crate::texture::WHITE_1X1_ASSET_LABEL as TEXTURE_WHITE_1X1_ASSET_LABEL; use crate::transform::{Scale, Transform, WorldPosition}; use crate::vector::Vec3; use crate::windowing::window::Window; @@ -122,7 +123,7 @@ pub fn enqueue_set_shader_bindings( ] .into_iter() .flatten() - .any(|texture| !assets.is_loaded_and_has_type(&texture.asset_handle)) + .any(|texture_asset| !assets.is_loaded_and_has_type(&texture_asset)) { continue; } @@ -270,10 +271,10 @@ pub fn enqueue_set_shader_bindings( model_material .ambient_map .as_ref() - .map(|ambient_map| ambient_map.asset_handle.clone()) + .map(|ambient_map| ambient_map.clone()) .unwrap_or_else(|| { assets - .get_handle_to_loaded(DEFAULT_TEXTURE_ASSET_LABEL.clone()) + .get_handle_to_loaded(TEXTURE_WHITE_1X1_ASSET_LABEL.clone()) .expect("Not possible") }), ), @@ -285,10 +286,10 @@ pub fn enqueue_set_shader_bindings( model_material .diffuse_map .as_ref() - .map(|diffuse_map| diffuse_map.asset_handle.clone()) + .map(|diffuse_map| diffuse_map.clone()) .unwrap_or_else(|| { assets - .get_handle_to_loaded(DEFAULT_TEXTURE_ASSET_LABEL.clone()) + .get_handle_to_loaded(TEXTURE_WHITE_1X1_ASSET_LABEL.clone()) .expect("Not possible") }), ), @@ -300,10 +301,10 @@ pub fn enqueue_set_shader_bindings( model_material .specular_map .as_ref() - .map(|specular_map| specular_map.asset_handle.clone()) + .map(|specular_map| specular_map.clone()) .unwrap_or_else(|| { assets - .get_handle_to_loaded(DEFAULT_TEXTURE_ASSET_LABEL.clone()) + .get_handle_to_loaded(TEXTURE_WHITE_1X1_ASSET_LABEL.clone()) .expect("Not possible") }), ), |