franklinblanco/bevy_mod_outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix panic if DepthMode hasn't propagated (yet).

Browse Source
This commit is contained in:
Robin KAY 2023-04-10 22:19:20 +01:00
parent 3f304437cd
commit 1d5cff5eda
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/draw.rs
View File

@ -8,8 +8,9 @@ use bevy::render::view::{ExtractedView, RenderLayers};
use crate::node::{OpaqueOutline, StencilOutline, TransparentOutline}; use crate::node::{OpaqueOutline, StencilOutline, TransparentOutline};
use crate::pipeline::{OutlinePipeline, PassType, PipelineKey}; use crate::pipeline::{OutlinePipeline, PassType, PipelineKey};
use crate::uniforms::{ use crate::uniforms::{
OutlineFragmentUniform, OutlineStencilFlags, OutlineStencilUniform, OutlineVolumeFlags, DepthMode, OutlineFragmentUniform, OutlineStencilFlags, OutlineStencilUniform,
OutlineVolumeUniform, SetOutlineStencilBindGroup, SetOutlineVolumeBindGroup, OutlineVolumeFlags, OutlineVolumeUniform, SetOutlineStencilBindGroup,
SetOutlineVolumeBindGroup,
}; };
use crate::view_uniforms::SetOutlineViewBindGroup; use crate::view_uniforms::SetOutlineViewBindGroup;
use crate::OutlineRenderLayers; use crate::OutlineRenderLayers;
@ -60,7 +61,10 @@ pub(crate) fn queue_outline_stencil_mesh(
material_meshes.iter() material_meshes.iter()
{ {
if !view_mask.intersects(outline_mask) { if !view_mask.intersects(outline_mask) {
continue; continue; // Layer not enabled
}
if stencil_flags.depth_mode == DepthMode::Invalid {
continue; // DepthMode not propagated
} }
if let Some(mesh) = render_meshes.get(mesh_handle) { if let Some(mesh) = render_meshes.get(mesh_handle) {
let key = base_key let key = base_key
@ -134,7 +138,10 @@ pub(crate) fn queue_outline_volume_mesh(
material_meshes.iter() material_meshes.iter()
{ {
if !view_mask.intersects(outline_mask) { if !view_mask.intersects(outline_mask) {
continue; continue; // Layer not enabled
}
if volume_flags.depth_mode == DepthMode::Invalid {
continue; // DepthMode not propagated
} }
if let Some(mesh) = render_meshes.get(mesh_handle) { if let Some(mesh) = render_meshes.get(mesh_handle) {
let transparent = fragment_uniform.colour[3] < 1.0; let transparent = fragment_uniform.colour[3] < 1.0;