Skip to content

Commit

Permalink
cargo fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
Neo-Zhixing committed Feb 7, 2021
1 parent 0060cce commit 0dee3b0
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 38 deletions.
43 changes: 17 additions & 26 deletions crates/bevy_render/src/wireframe/mod.rs
Original file line number Diff line number Diff line change
@@ -1,37 +1,27 @@
use crate::{
pipeline::{
BlendFactor, BlendOperation, ColorWrite,
CompareFunction, CullMode, FrontFace, PipelineDescriptor,
PolygonMode, RenderPipeline,
},
draw::DrawContext,
mesh::Indices,
pipeline::{PipelineDescriptor, PipelineSpecialization, RenderPipeline},
prelude::*,
shader::{Shader, ShaderStage, ShaderStages},
texture::TextureFormat,
shader::Shader,
};
use bevy_app::prelude::*;
use bevy_asset::{Assets, Handle, HandleUntyped};
use bevy_ecs::{Entity, World, ResMut, Res, Query, With, QuerySet, Commands, Mut};
use bevy_reflect::TypeUuid;
use crate::draw::DrawContext;
use crate::renderer::{RenderResourceBindings, RenderResourceContext, RenderContext};
use crate::mesh::Indices;
use crate::pipeline::{PipelineSpecialization, VertexBufferLayout};
use bevy_ecs::IntoSystem;
use bevy_ecs::{IntoSystem, Mut, Query, QuerySet, Res, With};
use bevy_reflect::{Reflect, ReflectComponent, TypeUuid};
use bevy_utils::HashSet;
use bevy_reflect::{Reflect, ReflectComponent};

mod pipeline;

pub const WIREFRAME_PIPELINE_HANDLE: HandleUntyped =
HandleUntyped::weak_from_u64(PipelineDescriptor::TYPE_UUID, 0x137c75ab7e9ad7f5);
HandleUntyped::weak_from_u64(PipelineDescriptor::TYPE_UUID, 0x137c75ab7e9ad7f5);

#[derive(Debug, Default)]
pub struct WireframePlugin;

impl Plugin for WireframePlugin {
fn build(&self, app: &mut AppBuilder) {
app
.init_resource::<WireframeConfig>()
app.init_resource::<WireframeConfig>()
.add_system_to_stage(crate::stage::DRAW, draw_wireframes_system.system());
let resources = app.resources();
let mut shaders = resources.get_mut::<Assets<Shader>>().unwrap();
Expand All @@ -54,9 +44,7 @@ pub struct WireframeConfig {

impl Default for WireframeConfig {
fn default() -> Self {
WireframeConfig {
global: false
}
WireframeConfig { global: false }
}
}

Expand All @@ -67,10 +55,15 @@ pub fn draw_wireframes_system(
wireframe_config: Res<WireframeConfig>,
mut query: QuerySet<(
Query<(&mut Draw, &mut RenderPipelines, &Handle<Mesh>, &Visible)>,
Query<(&mut Draw, &mut RenderPipelines, &Handle<Mesh>, &Visible), With<Wireframe>>
Query<(&mut Draw, &mut RenderPipelines, &Handle<Mesh>, &Visible), With<Wireframe>>,
)>,
) {
let iterator = |(mut draw, mut render_pipelines, mesh_handle, visible): (Mut<Draw>, Mut<RenderPipelines>, &Handle<Mesh>, &Visible)| {
let iterator = |(mut draw, mut render_pipelines, mesh_handle, visible): (
Mut<Draw>,
Mut<RenderPipelines>,
&Handle<Mesh>,
&Visible,
)| {
if !visible.is_visible {
return;
}
Expand Down Expand Up @@ -108,9 +101,7 @@ pub fn draw_wireframes_system(
)
.unwrap();
draw_context
.set_bind_groups_from_bindings(&mut draw, &mut [
&mut render_pipelines.bindings,
])
.set_bind_groups_from_bindings(&mut draw, &mut [&mut render_pipelines.bindings])
.unwrap();
draw_context
.set_vertex_buffers_from_bindings(&mut draw, &[&render_pipelines.bindings])
Expand Down
13 changes: 3 additions & 10 deletions crates/bevy_render/src/wireframe/pipeline.rs
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
use crate::{
pipeline::{
BlendFactor, BlendOperation, ColorWrite,
CompareFunction, CullMode, FrontFace,
PolygonMode,

},
prelude::*,
CullMode, FrontFace, PipelineDescriptor, PolygonMode, PrimitiveState, PrimitiveTopology,
},
shader::{Shader, ShaderStage, ShaderStages},
texture::TextureFormat,
};
use bevy_app::prelude::*;
use bevy_asset::{Assets, Handle};
use crate::pipeline::{PrimitiveState, PrimitiveTopology, DepthStencilState, StencilState, StencilFaceState, DepthBiasState, MultisampleState, PipelineDescriptor};
use bevy_asset::Assets;

pub(crate) fn build_wireframe_pipeline(shaders: &mut Assets<Shader>) -> PipelineDescriptor {
PipelineDescriptor {
Expand Down
6 changes: 4 additions & 2 deletions examples/3d/3d_scene.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
use bevy::prelude::*;
use bevy_internal::render::wireframe::{WireframePlugin, Wireframe};
use bevy_internal::wgpu::{WgpuOptions, WgpuFeatures};
use bevy_internal::{
render::wireframe::{Wireframe, WireframePlugin},
wgpu::{WgpuFeatures, WgpuOptions},
};

fn main() {
App::build()
Expand Down

0 comments on commit 0dee3b0

Please sign in to comment.