Skip to content

Commit

Permalink
Dependency reduction (#53)
Browse files Browse the repository at this point in the history
* Updates for Bevy main (will become 0.13)

* Update deps

* Fix features

* enable winit x11 by default

* fix docs

---------

Co-authored-by: Arend van Beelen jr <arend@arendjr.nl>
  • Loading branch information
aevyrie and arendjr committed Mar 4, 2024
1 parent 71dfd5a commit 11e3549
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 19 deletions.
28 changes: 23 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,21 @@ documentation = "https://docs.rs/bevy_framepace"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
bevy = { version = "0.13", default-features = false, features = [
"bevy_render",
"bevy_winit",
] }
bevy_app = "0.13"
bevy_ecs = "0.13"
bevy_diagnostic = "0.13"
bevy_log = "0.13"
bevy_render = "0.13"
bevy_reflect = "0.13"
bevy_time = "0.13"
bevy_utils = "0.13"
bevy_window = "0.13"
bevy_winit = "0.13"
# Non-bevy
spin_sleep = "1.0"

[features]
default = ["framepace_debug", "bevy/x11"]
default = ["framepace_debug", "bevy_winit/x11"]
framepace_debug = []

[dev-dependencies]
Expand All @@ -28,4 +35,15 @@ bevy = { version = "0.13", default-features = false, features = [
"bevy_ui",
"default_font",
"multi-threaded",
"x11",
] }

[[example]]
name = "demo"
path = "examples/demo.rs"
required-features = ["default"]

[[example]]
name = "minimal"
path = "examples/minimal.rs"
required-features = ["default"]
8 changes: 4 additions & 4 deletions src/debug.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//! Adds diagnostic logging and a cursor for debugging.

use bevy::{
diagnostic::{Diagnostic, DiagnosticPath, Diagnostics, RegisterDiagnostic},
prelude::*,
};
use bevy_app::prelude::*;
use bevy_diagnostic::{Diagnostic, DiagnosticPath, Diagnostics, RegisterDiagnostic};
use bevy_ecs::prelude::*;
use bevy_time::prelude::*;

/// Adds [`Diagnostics`] data from `bevy_framepace`
pub struct DiagnosticsPlugin;
Expand Down
22 changes: 12 additions & 10 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//! This is a [`bevy`] plugin that adds framepacing and framelimiting to improve input latency and
//! This is a `bevy` plugin that adds framepacing and framelimiting to improve input latency and
//! power use.
//!
//! # How it works
Expand Down Expand Up @@ -27,13 +27,15 @@

#![deny(missing_docs)]

use bevy_app::prelude::*;
use bevy_ecs::prelude::*;
use bevy_reflect::prelude::*;
use bevy_render::{pipelined_rendering::RenderExtractApp, Render, RenderApp, RenderSet};
use bevy_utils::Instant;
use bevy_window::prelude::*;

#[cfg(not(target_arch = "wasm32"))]
use bevy::winit::WinitWindows;
use bevy::{
prelude::*,
render::{pipelined_rendering::RenderExtractApp, RenderApp, RenderSet},
utils::Instant,
};
use bevy_winit::WinitWindows;

use std::{
sync::{Arc, Mutex},
Expand Down Expand Up @@ -78,7 +80,7 @@ impl Plugin for FramepacePlugin {
.insert_resource(limit)
.insert_resource(stats)
.add_systems(
bevy::render::Render,
Render,
framerate_limiter
.in_set(RenderSet::Cleanup)
.after(World::clear_entities),
Expand Down Expand Up @@ -199,7 +201,7 @@ fn get_display_refresh_rate(
Limiter::Off => {
#[cfg(feature = "framepace_debug")]
if settings.is_changed() {
info!("Frame limiter disabled");
bevy_log::info!("Frame limiter disabled");
}
return;
}
Expand All @@ -208,7 +210,7 @@ fn get_display_refresh_rate(
if let Ok(mut limit) = frame_limit.0.try_lock() {
if new_frametime != *limit {
#[cfg(feature = "framepace_debug")]
info!("Frametime limit changed to: {:?}", new_frametime);
bevy_log::info!("Frametime limit changed to: {:?}", new_frametime);
*limit = new_frametime;
}
}
Expand Down

0 comments on commit 11e3549

Please sign in to comment.