Skip to content

Add binned 2d/3d Wireframe render phase #18587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Apr 9, 2025
Merged

Add binned 2d/3d Wireframe render phase #18587

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d3b24b8
Start wireframe.
tychedelia Mar 27, 2025
00880a1
More.
tychedelia Mar 27, 2025
1bf7e81
Use correct.
tychedelia Mar 27, 2025
d929af2
Fixes.
tychedelia Mar 28, 2025
f8a6e93
Fixes for 3d.
tychedelia Mar 28, 2025
d993961
2d + fixes.
tychedelia Mar 28, 2025
e217027
Fmt.
tychedelia Mar 28, 2025
e00fbb1
Fix 2d shader import.
tychedelia Mar 28, 2025
a28ad68
Add missing edges.
tychedelia Mar 28, 2025
dabd22d
Ci.
tychedelia Mar 28, 2025
f4dc838
Ci.
tychedelia Mar 28, 2025
19b9e24
Ci.
tychedelia Mar 28, 2025
10ce11f
Fix whitespace removal.
tychedelia Apr 1, 2025
97ceb4b
Remove debug pass.
tychedelia Apr 7, 2025
d04f038
Incorrect comment.
tychedelia Apr 7, 2025
99cffc3
Merge remote-tracking branch 'origin/main' into wireframes
tychedelia Apr 7, 2025
65e898e
Evict from caches.
tychedelia Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions crates/bevy_core_pipeline/src/core_2d/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ pub mod graph {
MainOpaquePass,
MainTransparentPass,
EndMainPass,
StartDebugPass,
EndDebugPass,
Bloom,
PostProcessing,
Tonemapping,
Expand Down Expand Up @@ -109,6 +111,8 @@ impl Plugin for Core2dPlugin {
Node2d::MainTransparentPass,
)
.add_render_graph_node::<EmptyNode>(Core2d, Node2d::EndMainPass)
.add_render_graph_node::<EmptyNode>(Core2d, Node2d::StartDebugPass)
.add_render_graph_node::<EmptyNode>(Core2d, Node2d::EndDebugPass)
.add_render_graph_node::<ViewNodeRunner<TonemappingNode>>(Core2d, Node2d::Tonemapping)
.add_render_graph_node::<EmptyNode>(Core2d, Node2d::EndMainPassPostProcessing)
.add_render_graph_node::<ViewNodeRunner<UpscalingNode>>(Core2d, Node2d::Upscaling)
Expand All @@ -119,6 +123,8 @@ impl Plugin for Core2dPlugin {
Node2d::MainOpaquePass,
Node2d::MainTransparentPass,
Node2d::EndMainPass,
Node2d::StartDebugPass,
Node2d::EndDebugPass,
Node2d::Tonemapping,
Node2d::EndMainPassPostProcessing,
Node2d::Upscaling,
Expand Down
6 changes: 6 additions & 0 deletions crates/bevy_core_pipeline/src/core_3d/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ pub mod graph {
MainTransmissivePass,
MainTransparentPass,
EndMainPass,
StartDebugPass,
EndDebugPass,
LateDownsampleDepth,
Taa,
MotionBlur,
Expand Down Expand Up @@ -208,6 +210,8 @@ impl Plugin for Core3dPlugin {
Node3d::MainTransparentPass,
)
.add_render_graph_node::<EmptyNode>(Core3d, Node3d::EndMainPass)
.add_render_graph_node::<EmptyNode>(Core3d, Node3d::StartDebugPass)
.add_render_graph_node::<EmptyNode>(Core3d, Node3d::EndDebugPass)
.add_render_graph_node::<ViewNodeRunner<DepthOfFieldNode>>(Core3d, Node3d::DepthOfField)
.add_render_graph_node::<ViewNodeRunner<TonemappingNode>>(Core3d, Node3d::Tonemapping)
.add_render_graph_node::<EmptyNode>(Core3d, Node3d::EndMainPassPostProcessing)
Expand All @@ -226,6 +230,8 @@ impl Plugin for Core3dPlugin {
Node3d::MainTransmissivePass,
Node3d::MainTransparentPass,
Node3d::EndMainPass,
Node3d::StartDebugPass,
Node3d::EndDebugPass,
Node3d::Tonemapping,
Node3d::EndMainPassPostProcessing,
Node3d::Upscaling,
Expand Down
12 changes: 6 additions & 6 deletions crates/bevy_pbr/src/render/wireframe.wgsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#import bevy_pbr::forward_io::VertexOutput

struct WireframeMaterial {
color: vec4<f32>,
};
struct PushConstants {
color: vec4<f32>
Copy link
Contributor

@JMS55 JMS55 Apr 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI push constants aren't available on WebGPU. Idk how we feel about requiring them for wireframes.

Copy link
Member Author

@tychedelia tychedelia Apr 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wireframes require the POLYGON_MODE_LINE feature which isn't available on web.

}

var<push_constant> push_constants: PushConstants;

@group(2) @binding(0)
var<uniform> material: WireframeMaterial;
@fragment
fn fragment(in: VertexOutput) -> @location(0) vec4<f32> {
return material.color;
return push_constants.color;
}
Loading