Skip to content

Commit

Permalink
Switch networking crate to local version for now
Browse files Browse the repository at this point in the history
  • Loading branch information
Alainx277 committed Feb 16, 2022
1 parent 60cf9cf commit e487f75
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 8 deletions.
3 changes: 0 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ futures-lite = "1.4.0"
log = "0.4.8"
glam = "0.20.2"
nalgebra = { version = "*", features = ["convert-glam020"] }
bevy_networking_turbulence = "*"
serde = { version = "*", features = ["derive"] }
clap = { version = "3.0.13", features = ["derive"] }

Expand Down
2 changes: 1 addition & 1 deletion crates/networking/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"

[dependencies]
bevy = "0.6"
bevy_networking_turbulence = "0.4.1"
bevy_networking_turbulence = { version = "0.4.1", path = "../../../bevy_networking_turbulence" }
serde = { version = "*", features = ["derive"] }
bincode = "1.3.3"
bevy_rapier3d = { version = "0.12.0" }
4 changes: 3 additions & 1 deletion crates/networking/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ pub mod visibility;
pub mod spawning;
pub mod transform;

pub use bevy_networking_turbulence::NetworkResource;

use std::{net::SocketAddr, fmt::Display};

use bevy::{
Expand All @@ -15,7 +17,7 @@ use bevy::{
};
use bevy_networking_turbulence::{
MessageFlushingStrategy,
NetworkEvent, NetworkResource,
NetworkEvent,
};
use identity::IdentityPlugin;
use messaging::{MessageSender, MessageReceivers, MessageEvent, MessagingPlugin, AppExt};
Expand Down
3 changes: 1 addition & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ use bevy::log::LogPlugin;
use bevy::prelude::*;
use bevy::tasks::{AsyncComputeTaskPool, Task};
use bevy_fly_camera::{FlyCamera, FlyCameraPlugin};
use bevy_networking_turbulence::NetworkResource;
use bevy_rapier3d::na::{Point3, Vector3};
use bevy_rapier3d::physics::{
ColliderBundle, NoUserData, RapierPhysicsPlugin, RigidBodyPositionSync,
Expand Down Expand Up @@ -46,7 +45,7 @@ use networking::identity::{EntityCommandsExt as NetworkingEntityCommandsExt, Net
use networking::spawning::{NetworkedEntityEvent, PrefabPath, ClientControls, ClientControlled};
use networking::transform::{NetworkedTransform, NetworkTransform};
use networking::visibility::NetworkObserver;
use networking::{NetworkRole, NetworkingPlugin, ClientEvent, ConnectionId, ServerEvent};
use networking::{NetworkRole, NetworkingPlugin, ClientEvent, ConnectionId, ServerEvent, NetworkResource};

#[derive(Parser)]
struct Args {
Expand Down

0 comments on commit e487f75

Please sign in to comment.