This commit is contained in:
1 parent
293811aecd
commit
d1a56f77cc
23 files changed
+1730
-62
No files matched your search
@@ -17,15 +17,92 @@ use bevy::render::render_resource::{
|
||||
};
|
||||
use bevy::shader::{Shader, ShaderRef};
|
||||
use shared::{
|
||||
asset_server_path, material_from_desc, HydratedRendererMaterialBinding, MaterialAsset,
|
||||
MaterialInstanceAsset, MaterialParameterValue, MaterialRef, ShaderPropertyType,
|
||||
ShaderSchemaAsset, MATERIAL_INSTANCE_SCHEMA_VERSION,
|
||||
asset_server_path, material_from_desc, HydratedRendererMaterialBinding,
|
||||
HydratedTerrainMaterialBinding, MaterialAsset, MaterialDesc, MaterialInstanceAsset,
|
||||
MaterialParameterValue, MaterialRef, ShaderPropertyType, ShaderSchemaAsset,
|
||||
TerrainMaterialLayer, MATERIAL_INSTANCE_SCHEMA_VERSION, TERRAIN_MATERIAL_LAYER_LIMIT,
|
||||
};
|
||||
|
||||
pub const SURFACE_ABI_VERSION: u32 = 1;
|
||||
pub const SURFACE_PARAMETER_LANES: usize = 16;
|
||||
pub const SURFACE_TEXTURE_SLOTS: usize = 8;
|
||||
pub const DEFAULT_SURFACE_SHADER_PATH: &str = "shaders/blacksite_surface.wgsl";
|
||||
pub const TERRAIN_LAYER_SHADER_PATH: &str = "shaders/terrain_layers.wgsl";
|
||||
|
||||
#[derive(ShaderType, Reflect, Debug, Clone, Copy, PartialEq)]
|
||||
pub struct TerrainLayerUniform {
|
||||
pub base_colors: [Vec4; TERRAIN_MATERIAL_LAYER_LIMIT],
|
||||
/// Metallic, perceptual roughness, normal-map enabled, layer enabled.
|
||||
pub properties: [Vec4; TERRAIN_MATERIAL_LAYER_LIMIT],
|
||||
pub uv_scales: Vec4,
|
||||
pub base_texture_enabled: Vec4,
|
||||
}
|
||||
|
||||
impl Default for TerrainLayerUniform {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
base_colors: [Vec4::ONE; TERRAIN_MATERIAL_LAYER_LIMIT],
|
||||
properties: [Vec4::new(0.0, 0.9, 0.0, 0.0); TERRAIN_MATERIAL_LAYER_LIMIT],
|
||||
uv_scales: Vec4::splat(8.0),
|
||||
base_texture_enabled: Vec4::ZERO,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Asset, AsBindGroup, Reflect, Debug, Clone, Default)]
|
||||
pub struct TerrainLayerExtension {
|
||||
#[uniform(100)]
|
||||
pub uniform: TerrainLayerUniform,
|
||||
#[texture(101)]
|
||||
#[sampler(102)]
|
||||
pub base_color0: Option<Handle<Image>>,
|
||||
#[texture(103)]
|
||||
#[sampler(104)]
|
||||
pub normal0: Option<Handle<Image>>,
|
||||
#[texture(105)]
|
||||
#[sampler(106)]
|
||||
pub base_color1: Option<Handle<Image>>,
|
||||
#[texture(107)]
|
||||
#[sampler(108)]
|
||||
pub normal1: Option<Handle<Image>>,
|
||||
#[texture(109)]
|
||||
#[sampler(110)]
|
||||
pub base_color2: Option<Handle<Image>>,
|
||||
#[texture(111)]
|
||||
#[sampler(112)]
|
||||
pub normal2: Option<Handle<Image>>,
|
||||
#[texture(113)]
|
||||
#[sampler(114)]
|
||||
pub base_color3: Option<Handle<Image>>,
|
||||
#[texture(115)]
|
||||
#[sampler(116)]
|
||||
pub normal3: Option<Handle<Image>>,
|
||||
}
|
||||
|
||||
impl MaterialExtension for TerrainLayerExtension {
|
||||
fn fragment_shader() -> ShaderRef {
|
||||
TERRAIN_LAYER_SHADER_PATH.into()
|
||||
}
|
||||
|
||||
fn deferred_fragment_shader() -> ShaderRef {
|
||||
TERRAIN_LAYER_SHADER_PATH.into()
|
||||
}
|
||||
}
|
||||
|
||||
pub type TerrainLayerMaterial = ExtendedMaterial<StandardMaterial, TerrainLayerExtension>;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
struct TerrainLayerCacheEntry {
|
||||
layers: Vec<TerrainMaterialLayer>,
|
||||
handle: Handle<TerrainLayerMaterial>,
|
||||
revision: u64,
|
||||
}
|
||||
|
||||
#[derive(Resource, Default)]
|
||||
struct TerrainLayerMaterialCache(HashMap<Entity, TerrainLayerCacheEntry>);
|
||||
|
||||
type TerrainMaterialBindings<'w, 's> =
|
||||
Query<'w, 's, (Entity, &'static HydratedTerrainMaterialBinding)>;
|
||||
|
||||
#[derive(ShaderType, Reflect, Debug, Clone, Copy, PartialEq)]
|
||||
pub struct SurfaceUniform {
|
||||
@@ -121,10 +198,6 @@ impl MaterialExtension for SurfaceExtension {
|
||||
DEFAULT_SURFACE_SHADER_PATH.into()
|
||||
}
|
||||
|
||||
fn prepass_fragment_shader() -> ShaderRef {
|
||||
DEFAULT_SURFACE_SHADER_PATH.into()
|
||||
}
|
||||
|
||||
fn specialize(
|
||||
_pipeline: &MaterialExtensionPipeline,
|
||||
descriptor: &mut RenderPipelineDescriptor,
|
||||
@@ -179,10 +252,180 @@ pub struct SurfaceMaterialPlugin;
|
||||
impl Plugin for SurfaceMaterialPlugin {
|
||||
fn build(&self, app: &mut App) {
|
||||
app.add_plugins(MaterialPlugin::<SurfaceMaterial>::default())
|
||||
.add_plugins(MaterialPlugin::<TerrainLayerMaterial>::default())
|
||||
.init_resource::<SurfaceMaterialCache>()
|
||||
.init_resource::<TerrainLayerMaterialCache>()
|
||||
.init_resource::<SurfaceDiagnostics>()
|
||||
.init_resource::<SurfaceEvaluatorRegistry>()
|
||||
.add_systems(Update, sync_surface_material_bindings);
|
||||
.add_systems(
|
||||
Update,
|
||||
(
|
||||
sync_surface_material_bindings,
|
||||
sync_terrain_layer_material_bindings,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
fn sync_terrain_layer_material_bindings(
|
||||
mut commands: Commands,
|
||||
asset_server: Res<AssetServer>,
|
||||
mut materials: ResMut<Assets<TerrainLayerMaterial>>,
|
||||
mut cache: ResMut<TerrainLayerMaterialCache>,
|
||||
mut diagnostics: ResMut<SurfaceDiagnostics>,
|
||||
bindings: TerrainMaterialBindings,
|
||||
) {
|
||||
for (entity, binding) in &bindings {
|
||||
if binding.layers.is_empty() {
|
||||
continue;
|
||||
}
|
||||
let revision = terrain_layer_revision(&binding.layers);
|
||||
let cached = cache
|
||||
.0
|
||||
.get(&binding.owner)
|
||||
.filter(|entry| entry.layers == binding.layers && entry.revision == revision)
|
||||
.map(|entry| entry.handle.clone());
|
||||
let handle = cached.unwrap_or_else(|| {
|
||||
let material =
|
||||
build_terrain_layer_material(&asset_server, &binding.layers, &mut diagnostics.0);
|
||||
let handle = cache
|
||||
.0
|
||||
.get(&binding.owner)
|
||||
.map(|entry| entry.handle.clone())
|
||||
.filter(|handle| {
|
||||
materials
|
||||
.get_mut(handle)
|
||||
.map(|mut slot| {
|
||||
*slot = material.clone();
|
||||
})
|
||||
.is_some()
|
||||
})
|
||||
.unwrap_or_else(|| materials.add(material));
|
||||
cache.0.insert(
|
||||
binding.owner,
|
||||
TerrainLayerCacheEntry {
|
||||
layers: binding.layers.clone(),
|
||||
handle: handle.clone(),
|
||||
revision,
|
||||
},
|
||||
);
|
||||
handle
|
||||
});
|
||||
commands
|
||||
.entity(entity)
|
||||
.remove::<MeshMaterial3d<StandardMaterial>>()
|
||||
.insert(MeshMaterial3d(handle));
|
||||
}
|
||||
}
|
||||
|
||||
fn terrain_layer_revision(layers: &[TerrainMaterialLayer]) -> u64 {
|
||||
let mut dependencies = layers
|
||||
.iter()
|
||||
.filter_map(|layer| layer.material.as_ref())
|
||||
.filter_map(|reference| reference.source_path.as_deref())
|
||||
.flat_map(|path| material_dependency_paths(path).unwrap_or_else(|_| vec![path.to_string()]))
|
||||
.collect::<Vec<_>>();
|
||||
dependencies.sort();
|
||||
dependencies.dedup();
|
||||
dependency_revision(&dependencies)
|
||||
}
|
||||
|
||||
fn build_terrain_layer_material(
|
||||
asset_server: &AssetServer,
|
||||
layers: &[TerrainMaterialLayer],
|
||||
diagnostics: &mut Vec<String>,
|
||||
) -> TerrainLayerMaterial {
|
||||
let mut extension = TerrainLayerExtension::default();
|
||||
for (index, layer) in layers.iter().take(TERRAIN_MATERIAL_LAYER_LIMIT).enumerate() {
|
||||
extension.uniform.uv_scales[index] = layer.uv_scale;
|
||||
let desc = resolve_terrain_layer(layer, index, diagnostics);
|
||||
let color = desc.base_color.to_color().to_linear();
|
||||
extension.uniform.base_colors[index] =
|
||||
Vec4::new(color.red, color.green, color.blue, color.alpha);
|
||||
extension.uniform.properties[index] = Vec4::new(
|
||||
desc.metallic,
|
||||
desc.roughness,
|
||||
f32::from(desc.normal_map_texture.is_some()),
|
||||
1.0,
|
||||
);
|
||||
extension.uniform.base_texture_enabled[index] =
|
||||
f32::from(desc.base_color_texture.is_some());
|
||||
let base_color = desc
|
||||
.base_color_texture
|
||||
.as_deref()
|
||||
.map(|path| asset_server.load(asset_server_path(path)));
|
||||
let normal = desc
|
||||
.normal_map_texture
|
||||
.as_deref()
|
||||
.map(|path| asset_server.load(asset_server_path(path)));
|
||||
match index {
|
||||
0 => {
|
||||
extension.base_color0 = base_color;
|
||||
extension.normal0 = normal;
|
||||
}
|
||||
1 => {
|
||||
extension.base_color1 = base_color;
|
||||
extension.normal1 = normal;
|
||||
}
|
||||
2 => {
|
||||
extension.base_color2 = base_color;
|
||||
extension.normal2 = normal;
|
||||
}
|
||||
3 => {
|
||||
extension.base_color3 = base_color;
|
||||
extension.normal3 = normal;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
TerrainLayerMaterial {
|
||||
base: StandardMaterial {
|
||||
base_color: Color::WHITE,
|
||||
perceptual_roughness: 1.0,
|
||||
..default()
|
||||
},
|
||||
extension,
|
||||
}
|
||||
}
|
||||
|
||||
fn resolve_terrain_layer(
|
||||
layer: &TerrainMaterialLayer,
|
||||
index: usize,
|
||||
diagnostics: &mut Vec<String>,
|
||||
) -> MaterialDesc {
|
||||
let Some(reference) = layer.material.as_ref() else {
|
||||
diagnostics.push(format!(
|
||||
"terrain material layer {} is unassigned; using visible fallback",
|
||||
index + 1
|
||||
));
|
||||
return terrain_layer_fallback();
|
||||
};
|
||||
let Some(path) = reference.source_path.as_deref() else {
|
||||
diagnostics.push(format!(
|
||||
"terrain material layer {} ({}) has no loadable source path; using visible fallback",
|
||||
index + 1,
|
||||
reference.label
|
||||
));
|
||||
return terrain_layer_fallback();
|
||||
};
|
||||
match shared::load_resolved_material_from_path(path) {
|
||||
Ok((desc, _)) => desc,
|
||||
Err(error) => {
|
||||
diagnostics.push(format!(
|
||||
"terrain material layer {} ({}) could not resolve: {error}; using visible fallback",
|
||||
index + 1,
|
||||
reference.label
|
||||
));
|
||||
terrain_layer_fallback()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn terrain_layer_fallback() -> MaterialDesc {
|
||||
MaterialDesc {
|
||||
base_color: shared::ColorDesc::srgb(0.24, 0.29, 0.25),
|
||||
roughness: 0.92,
|
||||
..Default::default()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -759,4 +1002,60 @@ mod tests {
|
||||
assert_eq!(SURFACE_TEXTURE_SLOTS, 8);
|
||||
assert_eq!(std::mem::size_of::<SurfaceUniform>(), 400);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn material_extensions_leave_non_deferred_prepasses_to_standard_material() {
|
||||
assert!(matches!(
|
||||
<SurfaceExtension as MaterialExtension>::prepass_fragment_shader(),
|
||||
ShaderRef::Default
|
||||
));
|
||||
assert!(matches!(
|
||||
<TerrainLayerExtension as MaterialExtension>::prepass_fragment_shader(),
|
||||
ShaderRef::Default
|
||||
));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn terrain_layer_builder_packs_project_material_values() {
|
||||
let mut app = App::new();
|
||||
app.add_plugins((MinimalPlugins, AssetPlugin::default()));
|
||||
let asset_server = app.world().resource::<AssetServer>();
|
||||
let materials_root =
|
||||
std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../assets/materials");
|
||||
let layers = [
|
||||
TerrainMaterialLayer {
|
||||
material: Some(
|
||||
shared::EditorAssetRef::new("concrete", "material:source", "Concrete")
|
||||
.with_source_path(
|
||||
materials_root.join("concrete.ron").display().to_string(),
|
||||
),
|
||||
),
|
||||
uv_scale: 6.0,
|
||||
},
|
||||
TerrainMaterialLayer {
|
||||
material: Some(
|
||||
shared::EditorAssetRef::new("tint", "material:source", "Surface Tint")
|
||||
.with_source_path(
|
||||
materials_root
|
||||
.join("surface_tint.ron")
|
||||
.display()
|
||||
.to_string(),
|
||||
),
|
||||
),
|
||||
uv_scale: 10.0,
|
||||
},
|
||||
];
|
||||
let mut diagnostics = Vec::new();
|
||||
let material = build_terrain_layer_material(asset_server, &layers, &mut diagnostics);
|
||||
|
||||
assert!(diagnostics.is_empty(), "{diagnostics:?}");
|
||||
assert_eq!(material.extension.uniform.uv_scales.x, 6.0);
|
||||
assert_eq!(material.extension.uniform.uv_scales.y, 10.0);
|
||||
assert_eq!(material.extension.uniform.properties[0].w, 1.0);
|
||||
assert_eq!(material.extension.uniform.properties[1].w, 1.0);
|
||||
assert_ne!(
|
||||
material.extension.uniform.base_colors[0],
|
||||
material.extension.uniform.base_colors[1]
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user