From 78beb7187a57a4a3a9ca71336c5dc08d0f5175cd Mon Sep 17 00:00:00 2001 From: devil-ira Date: Thu, 10 Nov 2022 17:31:20 +0100 Subject: [PATCH] disable v-sync, add warning, appease clippy --- crates/bevy_debug_draw/src/debug_draw.rs | 4 ++-- crates/bevy_debug_draw/src/lib.rs | 4 ++-- crates/bevy_debug_draw/src/pipeline_2d.rs | 1 + crates/bevy_debug_draw/src/pipeline_3d.rs | 1 + examples/stress_tests/many_debug_lines.rs | 12 +++++++++++- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/crates/bevy_debug_draw/src/debug_draw.rs b/crates/bevy_debug_draw/src/debug_draw.rs index 49f9fa2d7dbcea..3fc4c753aa40d4 100644 --- a/crates/bevy_debug_draw/src/debug_draw.rs +++ b/crates/bevy_debug_draw/src/debug_draw.rs @@ -93,7 +93,7 @@ impl DebugDraw { let br = (position + rotation * vec3(half_size.x, -half_size.y, 0.)).to_array(); self.positions.extend([tl, tr, tr, br, br, bl, bl, tl]); self.colors - .extend(std::iter::repeat(color.as_linear_rgba_f32()).take(8)) + .extend(std::iter::repeat(color.as_linear_rgba_f32()).take(8)); } /// Draw a box. @@ -115,7 +115,7 @@ impl DebugDraw { tlf, tlb, trf, trb, brf, brb, blf, blb, // Front to back ]); self.colors - .extend(std::iter::repeat(color.as_linear_rgba_f32()).take(24)) + .extend(std::iter::repeat(color.as_linear_rgba_f32()).take(24)); } /// Draw a line from `start` to `end`. diff --git a/crates/bevy_debug_draw/src/lib.rs b/crates/bevy_debug_draw/src/lib.rs index 2763830adfe850..1cbcb7dc89e09c 100644 --- a/crates/bevy_debug_draw/src/lib.rs +++ b/crates/bevy_debug_draw/src/lib.rs @@ -105,13 +105,13 @@ fn update( mut meshes: ResMut>, mut commands: Commands, ) { - if let Some(mut mesh) = debug_draw + if let Some(mesh) = debug_draw .mesh_handle .as_ref() .and_then(|handle| meshes.get_mut(handle)) { if config.enabled { - debug_draw.update_mesh(&mut mesh); + debug_draw.update_mesh(mesh); } else { debug_draw.clear(); mesh.remove_attribute(Mesh::ATTRIBUTE_POSITION); diff --git a/crates/bevy_debug_draw/src/pipeline_2d.rs b/crates/bevy_debug_draw/src/pipeline_2d.rs index 7c94640148f41a..3da36f093e80bc 100644 --- a/crates/bevy_debug_draw/src/pipeline_2d.rs +++ b/crates/bevy_debug_draw/src/pipeline_2d.rs @@ -91,6 +91,7 @@ pub(crate) type DrawDebugLines = ( DrawMesh2d, ); +#[allow(clippy::too_many_arguments)] pub(crate) fn queue( config: Res, draw2d_functions: Res>, diff --git a/crates/bevy_debug_draw/src/pipeline_3d.rs b/crates/bevy_debug_draw/src/pipeline_3d.rs index 0c65e80c7b0d5d..0b4eba26a0baca 100644 --- a/crates/bevy_debug_draw/src/pipeline_3d.rs +++ b/crates/bevy_debug_draw/src/pipeline_3d.rs @@ -128,6 +128,7 @@ pub(crate) type DrawDebugLines = ( DrawMesh, ); +#[allow(clippy::too_many_arguments)] pub(crate) fn queue( opaque_3d_draw_functions: Res>, debug_line_pipeline: Res, diff --git a/examples/stress_tests/many_debug_lines.rs b/examples/stress_tests/many_debug_lines.rs index af60ffaaf2ba1f..69e9d930cf7ecd 100644 --- a/examples/stress_tests/many_debug_lines.rs +++ b/examples/stress_tests/many_debug_lines.rs @@ -3,11 +3,19 @@ use std::f32::consts::TAU; use bevy::{ diagnostic::{Diagnostics, FrameTimeDiagnosticsPlugin}, prelude::*, + window::PresentMode, }; fn main() { App::new() - .add_plugins(DefaultPlugins) + .add_plugins(DefaultPlugins.set(WindowPlugin { + window: WindowDescriptor { + title: "Many Debug Lines".to_string(), + present_mode: PresentMode::AutoNoVsync, + ..default() + }, + ..default() + })) .add_plugin(FrameTimeDiagnosticsPlugin::default()) .insert_resource(Config { line_count: 50_000, @@ -63,6 +71,8 @@ fn system( } fn setup(mut commands: Commands, asset_server: Res) { + warn!(include_str!("warning_string.txt")); + commands.spawn(Camera3dBundle { transform: Transform::from_xyz(3., 1., 5.).looking_at(Vec3::ZERO, Vec3::Y), ..default()