Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,21 @@ members = [
"renet_netcode",
]
resolver = "2"

[workspace.dependencies]
bevy = { version = "^0.17" , default-features = false, features = ["bevy_core_pipeline", "bevy_render", "bevy_asset", "bevy_pbr", "x11", "tonemapping_luts", "ktx2", "bevy_window", "zstd_rust"] }
bevy_app = "^0.17"
bevy_ecs = "^0.17"
bevy_time = "^0.17"
bevy_egui = "^0.38"
eframe = "^0.33"
egui = "^0.33"
serde = "^1"
bincode = "^1.3"
fastrand = "^2.3"
steamworks = "^0.12"
env_logger = "^0.11"
log = "^0.4"
bytes = "^1"
octets = "^0.3"
chacha20poly1305 = "^0.10"
19 changes: 9 additions & 10 deletions bevy_renet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,14 @@ name = "simple"
required-features = ["netcode"]

[dependencies]
bevy_app = "0.17"
bevy_ecs = "0.17"
bevy_time = "0.17"
renet = { path="../renet", version = "1.2.0", features = ["bevy"] }
renet_netcode = { path="../renet_netcode", version = "1.2.0", features = ["bevy"], optional = true }
renet_steam = { path="../renet_steam", version = "2.1.0", features = ["bevy"], optional = true }
bevy_app.workspace = true
bevy_ecs.workspace = true
bevy_time.workspace = true
renet = { path="../renet", features = ["bevy"] }
renet_netcode = { path="../renet_netcode", features = ["bevy"], optional = true }
renet_steam = { path="../renet_steam", features = ["bevy"], optional = true }

[dev-dependencies]
bevy = {version = "0.17", default-features = false, features = ["bevy_core_pipeline", "bevy_render", "bevy_asset", "bevy_pbr", "x11", "tonemapping_luts", "ktx2", "zstd_rust", "bevy_window"]}
bincode = "1.3"
env_logger = "0.11"
serde = {version = "1.0", features = ["derive"]}
bevy = {workspace = true, default-features = false, features = ["bevy_core_pipeline", "bevy_render", "bevy_asset", "bevy_pbr", "x11", "tonemapping_luts", "ktx2", "bevy_window", "zstd_rust"]}
bincode.workspace = true
serde = {workspace = true, features = ["derive"]}
13 changes: 7 additions & 6 deletions demo_bevy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ name = "server"
path = "src/bin/server.rs"

[features]
default = ["netcode"]
netcode = ["bevy_renet/netcode"]
steam = ["bevy_renet/steam", "steamworks"]

[dependencies]
bevy = { version = "0.17", default-features = false, features = [
bevy = { workspace = true, default-features = false, features = [
"bevy_core_pipeline",
"bevy_render",
"bevy_asset",
Expand All @@ -29,9 +30,9 @@ bevy = { version = "0.17", default-features = false, features = [
]}

bevy_renet = { path = "../bevy_renet", default-features = false }
serde = { version = "1.0", features = ["derive"] }
bincode = "1.3"
bevy_egui = "0.37"
renet_visualizer = { path = "../renet_visualizer", features = ["bevy"] }
fastrand = "2.0"
steamworks = { version = "0.12.2", optional = true }
serde = { workspace = true, features = ["derive"] }
bevy_egui.workspace = true
bincode.workspace = true
fastrand.workspace = true
steamworks = { workspace = true, optional = true }
6 changes: 3 additions & 3 deletions demo_bevy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Simple bevy application to demonstrates how you could replicate entities and sen

## How to run

Running using the netcode transport:
Running using the netcode transport (default):

- server: `cargo run --bin server --features netcode`
- client: `cargo run --bin client --features netcode`
- server: `cargo run --bin server`
- client: `cargo run --bin client`

Running using the steam transport:

Expand Down
10 changes: 5 additions & 5 deletions demo_bevy/src/bin/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,10 @@ use bevy::{
};
use bevy_egui::{EguiContexts, EguiPlugin, EguiPrimaryContextPass};
use bevy_renet::{
client_connected,
renet::{ClientId, RenetClient},
RenetClientPlugin,
};
use demo_bevy::{
connection_config, setup_level, ClientChannel, NetworkedEntities, PlayerCommand, PlayerInput, ServerChannel, ServerMessages,
};
use demo_bevy::{setup_level, ClientChannel, NetworkedEntities, PlayerCommand, PlayerInput, ServerChannel, ServerMessages};
use renet_visualizer::{RenetClientVisualizer, RenetVisualizerStyle};

#[derive(Component)]
Expand Down Expand Up @@ -42,8 +39,9 @@ struct Connected;

#[cfg(feature = "netcode")]
fn add_netcode_network(app: &mut App) {
use bevy_renet::client_connected;
use bevy_renet::netcode::{ClientAuthentication, NetcodeClientPlugin, NetcodeClientTransport, NetcodeTransportError};
use demo_bevy::PROTOCOL_ID;
use demo_bevy::{connection_config, PROTOCOL_ID};
use std::{net::UdpSocket, time::SystemTime};

app.add_plugins(NetcodeClientPlugin);
Expand Down Expand Up @@ -82,7 +80,9 @@ fn add_netcode_network(app: &mut App) {

#[cfg(feature = "steam")]
fn add_steam_network(app: &mut App) {
use bevy_renet::client_connected;
use bevy_renet::steam::{SteamClientPlugin, SteamClientTransport, SteamTransportError};
use demo_bevy::connection_config;
use steamworks::SteamId;

let steam_client = steamworks::Client::init_app(480).unwrap();
Expand Down
10 changes: 5 additions & 5 deletions demo_chat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ edition = "2021"
renet = { path = "../renet" }
renet_netcode = { path = "../renet_netcode" }
renet_visualizer = { path = "../renet_visualizer" }
eframe = "0.32"
serde = { version = "1.0", features = ["derive"] }
bincode = "1.3"
log = "0.4.22"
env_logger = "0.11"
eframe.workspace = true
serde = { workspace = true, features = ["derive"] }
bincode.workspace = true
log.workspace = true
env_logger.workspace = true
3 changes: 2 additions & 1 deletion deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ allow = [
"Apache-2.0",
"BSD-2-Clause",
"BSD-3-Clause",
"Unicode-DFS-2016",
"Unicode-3.0",
"Zlib",
"ISC",
"OFL-1.1",
"Ubuntu-font-1.0",
"CC0-1.0",
"BSL-1.0",
]
Expand Down
10 changes: 5 additions & 5 deletions renet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ version = "1.2.0"
bevy = ["dep:bevy_ecs"]

[dependencies]
bevy_ecs = { version = "0.17", optional = true }
bytes = "1.1"
log = "0.4.22"
octets = "0.3"
bevy_ecs = { workspace = true, optional = true }
bytes.workspace = true
log.workspace = true
octets.workspace = true

[dev-dependencies]
env_logger = "0.11"
env_logger.workspace = true
renet_netcode = { path = "../renet_netcode" }
8 changes: 4 additions & 4 deletions renet_netcode/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
bevy = ["dep:bevy_ecs"]

[dependencies]
renet = { version = "1.2.0", path = "../renet" }
renetcode = { path = "../renetcode", version = "1.0.0" }
bevy_ecs = { version = "0.17", optional = true }
log = "0.4.22"
renet = { path = "../renet" }
renetcode = { path = "../renetcode" }
bevy_ecs = { workspace = true, optional = true }
log.workspace = true
10 changes: 5 additions & 5 deletions renet_steam/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ edition = "2021"
bevy = ["dep:bevy_ecs"]

[dependencies]
renet = { version = "1.2.0", path = "../renet" }
steamworks = "0.12.2"
log = "0.4.22"
bevy_ecs = { version = "0.17", optional = true }
renet = { path = "../renet" }
steamworks.workspace = true
log.workspace = true
bevy_ecs = { workspace = true, optional = true }

[dev-dependencies]
env_logger = "0.11"
env_logger.workspace = true
6 changes: 3 additions & 3 deletions renet_visualizer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ edition = "2021"
bevy = ["dep:bevy_ecs"]

[dependencies]
renet = { path = "../renet", version = "1.2.0" }
egui = "0.32"
bevy_ecs = { version = "0.17", optional = true }
renet = { path = "../renet" }
egui.workspace = true
bevy_ecs = { workspace = true, optional = true }
4 changes: 2 additions & 2 deletions renetcode/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
chacha20poly1305 = "0.10.0"
log = "0.4.22"
chacha20poly1305.workspace = true
log.workspace = true