voxel/kubi
1
1
Fork 0
mirror of https://github.com/griffi-gh/kubi.git synced 2024-12-25 05:08:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5 from griffi-gh/use-uflow

Browse source 
Use uflow
This commit is contained in:
griffi-gh 2023-03-09 00:32:30 +01:00 committed by GitHub
parent 91b0ef3193 93457ecdcf
commit f57845671c
38 changed files with 454 additions and 982 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.vscode/settings.json vendored
View file

@ -1,6 +1,9 @@
{ {
"editor.tabSize": 2, "editor.tabSize": 2,
"rust-analyzer.diagnostics.disabled": [ "rust-analyzer.diagnostics.disabled": [
"unresolved-method" //rust-analyzer issue #14269 //rust-analyzer issue #14269,
"unresolved-method",
"unresolved-import",
"unresolved-field"
] ]
} }

132
Cargo.lock generated
View file

@ -66,6 +66,15 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]]
name = "atomic-polyfill"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28"
dependencies = [
"critical-section",
]
[[package]] [[package]]
name = "autocfg" name = "autocfg"
version = "1.1.0" version = "1.1.0"
@ -87,25 +96,6 @@ dependencies = [
"rustc-demangle", "rustc-demangle",
] ]
[[package]]
name = "bincode"
version = "2.0.0-rc.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7bb50c5a2ef4b9b1e7ae73e3a73b52ea24b20312d629f9c4df28260b7ad2c3c4"
dependencies = [
"bincode_derive",
"serde",
]
[[package]]
name = "bincode_derive"
version = "2.0.0-rc.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a45a23389446d2dd25dc8e73a7a3b3c43522b630cac068927f0649d43d719d2"
dependencies = [
"virtue",
]
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "1.3.2" version = "1.3.2"
@ -203,6 +193,12 @@ dependencies = [
"cc", "cc",
] ]
[[package]]
name = "cobs"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15"
[[package]] [[package]]
name = "cocoa" name = "cocoa"
version = "0.24.1" version = "0.24.1"
@ -302,6 +298,12 @@ dependencies = [
"cfg-if", "cfg-if",
] ]
[[package]]
name = "critical-section"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52"
[[package]] [[package]]
name = "crossbeam-channel" name = "crossbeam-channel"
version = "0.5.7" version = "0.5.7"
@ -753,6 +755,15 @@ dependencies = [
"gl_generator", "gl_generator",
] ]
[[package]]
name = "hash32"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
dependencies = [
"byteorder",
]
[[package]] [[package]]
name = "hashbrown" name = "hashbrown"
version = "0.12.3" version = "0.12.3"
@ -771,6 +782,20 @@ dependencies = [
"ahash 0.8.3", "ahash 0.8.3",
] ]
[[package]]
name = "heapless"
version = "0.7.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743"
dependencies = [
"atomic-polyfill",
"hash32",
"rustc_version",
"serde",
"spin",
"stable_deref_trait",
]
[[package]] [[package]]
name = "heck" name = "heck"
version = "0.4.1" version = "0.4.1"
@ -906,12 +931,13 @@ dependencies = [
"image", "image",
"kubi-logging", "kubi-logging",
"kubi-shared", "kubi-shared",
"kubi-udp",
"log", "log",
"nohash-hasher", "nohash-hasher",
"postcard",
"rayon", "rayon",
"shipyard", "shipyard",
"strum", "strum",
"uflow",
"winapi", "winapi",
] ]
@ -933,13 +959,15 @@ dependencies = [
"hashbrown 0.13.2", "hashbrown 0.13.2",
"kubi-logging", "kubi-logging",
"kubi-shared", "kubi-shared",
"kubi-udp",
"log", "log",
"nohash-hasher", "nohash-hasher",
"postcard",
"rand",
"rayon", "rayon",
"serde", "serde",
"shipyard", "shipyard",
"toml", "toml",
"uflow",
] ]
[[package]] [[package]]
@ -947,27 +975,16 @@ name = "kubi-shared"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bincode",
"bracket-noise", "bracket-noise",
"glam", "glam",
"postcard",
"rand", "rand",
"rand_xoshiro", "rand_xoshiro",
"serde",
"shipyard", "shipyard",
"strum", "strum",
] ]
[[package]]
name = "kubi-udp"
version = "0.1.0"
dependencies = [
"anyhow",
"bincode",
"hashbrown 0.13.2",
"kubi-logging",
"log",
"nohash-hasher",
]
[[package]] [[package]]
name = "lazy_static" name = "lazy_static"
version = "1.4.0" version = "1.4.0"
@ -1388,6 +1405,17 @@ dependencies = [
"miniz_oxide", "miniz_oxide",
] ]
[[package]]
name = "postcard"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfa512cd0d087cc9f99ad30a1bf64795b67871edbead083ffc3a4dfafa59aa00"
dependencies = [
"cobs",
"heapless",
"serde",
]
[[package]] [[package]]
name = "ppv-lite86" name = "ppv-lite86"
version = "0.2.17" version = "0.2.17"
@ -1543,6 +1571,15 @@ version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
[[package]]
name = "rustc_version"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
"semver",
]
[[package]] [[package]]
name = "rustix" name = "rustix"
version = "0.36.9" version = "0.36.9"
@ -1607,6 +1644,12 @@ dependencies = [
"tiny-skia", "tiny-skia",
] ]
[[package]]
name = "semver"
version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.152" version = "1.0.152"
@ -1731,6 +1774,12 @@ dependencies = [
"lock_api", "lock_api",
] ]
[[package]]
name = "stable_deref_trait"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]] [[package]]
name = "strsim" name = "strsim"
version = "0.10.0" version = "0.10.0"
@ -1864,6 +1913,15 @@ dependencies = [
"winnow", "winnow",
] ]
[[package]]
name = "uflow"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3be4d71c1c106a57b0333ac2c28bd4521e0b16a2b98fe84405cdf7f544be46b6"
dependencies = [
"rand",
]
[[package]] [[package]]
name = "unicode-ident" name = "unicode-ident"
version = "1.0.8" version = "1.0.8"
@ -1888,12 +1946,6 @@ version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "virtue"
version = "0.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b60dcd6a64dd45abf9bd426970c9843726da7fc08f44cd6fcebf68c21220a63"
[[package]] [[package]]
name = "wasi" name = "wasi"
version = "0.11.0+wasi-snapshot-preview1" version = "0.11.0+wasi-snapshot-preview1"

2
Cargo.toml
View file

@ -1,5 +1,5 @@
[workspace] [workspace]
members = ["kubi", "kubi-server", "kubi-shared", "kubi-udp", "kubi-logging"] members = ["kubi", "kubi-server", "kubi-shared", "kubi-logging"]
resolver = "2" resolver = "2"
[profile.release-with-debug] [profile.release-with-debug]

0
kubi/README.md → README.md
View file

10
kubi-server/Cargo.toml
View file

@ -6,11 +6,10 @@ publish = false
[dependencies] [dependencies]
kubi-shared = { path = "../kubi-shared" } kubi-shared = { path = "../kubi-shared" }
kubi-udp = { path = "../kubi-udp" }
kubi-logging = { path = "../kubi-logging" } kubi-logging = { path = "../kubi-logging" }
log = "*" log = "*"
shipyard = { git = "https://github.com/leudz/shipyard", rev = "eb189f66" } shipyard = { git = "https://github.com/leudz/shipyard", rev = "eb189f66", features = ["thread_local"] }
serde = "1.0" serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] }
toml = "0.7" toml = "0.7"
glam = { version = "0.23", features = ["debug-glam-assert", "fast-math"] } glam = { version = "0.23", features = ["debug-glam-assert", "fast-math"] }
hashbrown = "0.13" hashbrown = "0.13"
@ -18,7 +17,10 @@ nohash-hasher = "0.2.0"
anyhow = "1.0" anyhow = "1.0"
rayon = "1.6" rayon = "1.6"
flume = "0.10" flume = "0.10"
rand = "0.8"
uflow = "0.7"
postcard = { version = "1.0", features = ["alloc"] }
[features] [features]
default = [] default = []
unstable = ["glam/core-simd"] nightly = ["rand/nightly", "rand/simd_support", "serde/unstable", "glam/core-simd", "kubi-shared/nightly"]

109
kubi-server/src/auth.rs
View file

@ -1,49 +1,86 @@
use shipyard::{UniqueView, UniqueViewMut}; use shipyard::{UniqueView, NonSendSync};
use kubi_shared::networking::messages::{ClientToServerMessage, ServerToClientMessage, InitData}; use uflow::{server::Event as ServerEvent, SendMode};
use kubi_udp::server::ServerEvent; use kubi_shared::networking::messages::{
use crate::{server::{ServerEvents, UdpServer}, config::ConfigTable, util::log_error}; ClientToServerMessage,
ServerToClientMessage,
InitData,
C_CLIENT_HELLO
};
use crate::{
server::{ServerEvents, UdpServer, IsMessageOfType},
config::ConfigTable
};
pub fn authenticate_players( pub fn authenticate_players(
mut server: UniqueViewMut<UdpServer>, server: NonSendSync<UniqueView<UdpServer>>,
events: UniqueView<ServerEvents>, events: UniqueView<ServerEvents>,
config: UniqueView<ConfigTable> config: UniqueView<ConfigTable>
) { ) {
for event in &events.0 { for event in &events.0 {
if let ServerEvent::MessageReceived { // if let ServerEvent::MessageReceived {
from, // from,
message: ClientToServerMessage::ClientHello { // message: ClientToServerMessage::ClientHello {
username, // username,
password // password
} // }
} = event { // } = event {
log::info!("ClientHello from {} with username {} and password {:?}", from, username, password);
let ServerEvent::Receive(client_addr, data) = event else{
continue
};
let Some(client) = server.0.client(client_addr) else {
log::error!("Client doesn't exist");
continue
};
if !event.is_message_of_type::<C_CLIENT_HELLO>() {
continue
}
let Ok(parsed_message) = postcard::from_bytes(data) else {
log::error!("Malformed message");
continue
};
let ClientToServerMessage::ClientHello { username, password } = parsed_message else {
unreachable!()
};
// Handle password auth log::info!("ClientHello; username={} password={:?}", username, password);
if let Some(server_password) = &config.server.password {
if let Some(user_password) = &password { // Handle password auth
if server_password != user_password { if let Some(server_password) = &config.server.password {
server.0.send_message(*from, ServerToClientMessage::ServerFuckOff { if let Some(user_password) = &password {
reason: "Passwords don't match".into() if server_password != user_password {
}).map_err(log_error).ok(); let res = postcard::to_allocvec(&ServerToClientMessage::ServerFuckOff {
continue reason: "Passwords don't match".into()
} }).unwrap().into_boxed_slice();
} else { client.borrow_mut().send(
server.0.send_message(*from, ServerToClientMessage::ServerFuckOff { res, 0, SendMode::Reliable
reason: "This server is password-protected".into() );
}).map_err(log_error).ok();
continue continue
} }
} else {
let res = postcard::to_allocvec(&ServerToClientMessage::ServerFuckOff {
reason: "This server is password protected".into()
}).unwrap().into_boxed_slice();
client.borrow_mut().send(
res, 0, SendMode::Reliable
);
continue
} }
//Spawn the user
//TODO Spawn the user on server side
//Approve the user
server.0.send_message(*from, ServerToClientMessage::ServerHello {
init: InitData {
users: vec![] //TODO create init data
}
}).map_err(log_error).ok();
} }
//Spawn the user
//TODO Spawn the user on server side
//Approve the user
let res = postcard::to_allocvec(&ServerToClientMessage::ServerHello {
init: InitData {
users: vec![] //TODO create init data
}
}).unwrap().into_boxed_slice();
client.borrow_mut().send(
res, 0, SendMode::Reliable
);
log::info!("{username} joined the game!")
} }
} }

4
kubi-server/src/client.rs
View file

@ -1,12 +1,12 @@
use shipyard::{Component, EntityId}; use shipyard::{Component, EntityId};
use hashbrown::HashMap; use hashbrown::HashMap;
use nohash_hasher::BuildNoHashHasher; use nohash_hasher::BuildNoHashHasher;
use kubi_udp::{ClientId, ClientIdRepr}; use kubi_shared::networking::client::ClientId;
#[derive(Component)] #[derive(Component)]
pub struct Client(ClientId); pub struct Client(ClientId);
pub struct ClientMap(HashMap<ClientId, EntityId, BuildNoHashHasher<ClientIdRepr>>); pub struct ClientMap(HashMap<ClientId, EntityId, BuildNoHashHasher<ClientId>>);
impl ClientMap { impl ClientMap {
pub fn new() -> Self { pub fn new() -> Self {
Self(HashMap::with_hasher(BuildNoHashHasher::default())) Self(HashMap::with_hasher(BuildNoHashHasher::default()))

18
kubi-server/src/main.rs
View file

@ -5,29 +5,31 @@ pub(crate) mod util;
pub(crate) mod config; pub(crate) mod config;
pub(crate) mod server; pub(crate) mod server;
pub(crate) mod client; pub(crate) mod client;
pub(crate) mod world; //pub(crate) mod world;
pub(crate) mod auth; pub(crate) mod auth;
use config::read_config; use config::read_config;
use server::{bind_server, update_server, update_server_events}; use server::{bind_server, update_server, log_server_errors};
use auth::authenticate_players; use auth::authenticate_players;
use world::{update_world, init_world}; //use world::{update_world, init_world};
fn initialize() -> Workload { fn initialize() -> Workload {
( (
read_config, read_config,
bind_server, bind_server,
init_world, //init_world,
).into_workload() ).into_workload()
} }
fn update() -> Workload { fn update() -> Workload {
( (
update_server, update_server,
update_server_events, (
authenticate_players, log_server_errors,
update_world, authenticate_players,
).into_workload() //update_world,
).into_workload()
).into_sequential_workload()
} }
fn main() { fn main() {

63
kubi-server/src/server.rs
View file

@ -1,47 +1,62 @@
use shipyard::{AllStoragesView, Unique, UniqueView, UniqueViewMut}; use shipyard::{AllStoragesView, Unique, UniqueView, UniqueViewMut, NonSendSync};
use kubi_udp::server::{Server, ServerConfig, ServerEvent}; use uflow::{server::{Server, Event as ServerEvent, Config as ServerConfig}, EndpointConfig};
use kubi_shared::networking::messages::{ClientToServerMessage, ServerToClientMessage};
use std::time::Duration;
use crate::config::ConfigTable; use crate::config::ConfigTable;
#[derive(Unique)] #[derive(Unique)]
#[repr(transparent)] #[repr(transparent)]
pub struct UdpServer(pub Server<ServerToClientMessage, ClientToServerMessage>); pub struct UdpServer(pub Server);
#[derive(Unique, Default)] #[derive(Unique, Default)]
pub struct ServerEvents(pub Vec<ServerEvent<ClientToServerMessage>>); pub struct ServerEvents(pub Vec<ServerEvent>);
pub trait IsMessageOfType {
///Checks if postcard-encoded message has a type
fn is_message_of_type<const T: u8>(&self) -> bool;
}
impl IsMessageOfType for ServerEvent {
fn is_message_of_type<const T: u8>(&self) -> bool {
let ServerEvent::Receive(_, data) = &self else { return false };
if data.len() == 0 { return false }
data[0] == T
}
}
pub fn bind_server( pub fn bind_server(
storages: AllStoragesView, storages: AllStoragesView,
) { ) {
log::info!("Creating server..."); log::info!("Creating server...");
let config = storages.borrow::<UniqueView<ConfigTable>>().unwrap(); let config = storages.borrow::<UniqueView<ConfigTable>>().unwrap();
let server: Server<ServerToClientMessage, ClientToServerMessage> = Server::bind( let server = Server::bind(
config.server.address, config.server.address,
ServerConfig { ServerConfig {
max_clients: config.server.max_clients, max_total_connections: config.server.max_clients,
client_timeout: Duration::from_millis(config.server.timeout_ms), max_active_connections: config.server.max_clients,
enable_handshake_errors: true,
endpoint_config: EndpointConfig {
active_timeout_ms: config.server.timeout_ms,
..Default::default()
},
..Default::default() ..Default::default()
} }
).unwrap(); ).expect("Failed to create the server");
storages.add_unique(UdpServer(server)); storages.add_unique_non_send_sync(UdpServer(server));
storages.add_unique(ServerEvents::default()); storages.add_unique(ServerEvents::default());
} }
pub fn update_server( pub fn update_server(
mut server: UniqueViewMut<UdpServer> mut server: NonSendSync<UniqueViewMut<UdpServer>>,
) {
if let Err(error) = server.0.update() {
log::error!("Server error: {error:?}")
}
}
pub fn update_server_events(
mut server: UniqueViewMut<UdpServer>,
mut events: UniqueViewMut<ServerEvents>, mut events: UniqueViewMut<ServerEvents>,
) { ) {
//drop current events
events.0.clear(); events.0.clear();
//fetch new ones events.0.extend(server.0.step());
events.0.extend(server.0.process_events().rev()); }
pub fn log_server_errors(
events: UniqueView<ServerEvents>,
) {
for event in &events.0 {
if let ServerEvent::Error(addr, error) = event {
log::error!("Server error addr: {addr} error: {error:?}");
}
}
} }

3
kubi-server/src/world.rs
View file

@ -2,7 +2,6 @@ use shipyard::{Unique, UniqueView, UniqueViewMut, Workload, IntoWorkload, AllSto
use glam::IVec3; use glam::IVec3;
use hashbrown::HashMap; use hashbrown::HashMap;
use kubi_shared::networking::messages::{ClientToServerMessage, ServerToClientMessage}; use kubi_shared::networking::messages::{ClientToServerMessage, ServerToClientMessage};
use kubi_udp::server::ServerEvent;
use crate::{ use crate::{
server::{UdpServer, ServerEvents}, server::{UdpServer, ServerEvents},
config::ConfigTable, config::ConfigTable,
@ -87,7 +86,7 @@ fn process_finished_tasks(
server.0.send_message(subscriber, ServerToClientMessage::ChunkResponse { server.0.send_message(subscriber, ServerToClientMessage::ChunkResponse {
chunk: chunk_position.to_array(), chunk: chunk_position.to_array(),
data: blocks.clone(), data: blocks.clone(),
queued: queue.iter().map(|item| (item.position.to_array(), item.block_type)).collect() queued: queue
}).map_err(log_error).ok(); }).map_err(log_error).ok();
} }
log::debug!("Chunk {chunk_position} loaded, {} subs", chunk.subscriptions.len()); log::debug!("Chunk {chunk_position} loaded, {} subs", chunk.subscriptions.len());

8
kubi-server/src/world/chunk.rs
View file

@ -1,8 +1,10 @@
use glam::IVec3; use glam::IVec3;
use hashbrown::HashSet; use hashbrown::HashSet;
use nohash_hasher::BuildNoHashHasher; use nohash_hasher::BuildNoHashHasher;
use kubi_shared::chunk::BlockData; use kubi_shared::{
use kubi_udp::{ClientId, ClientIdRepr}; chunk::BlockData,
networking::client::ClientId
};
#[derive(Clone, Copy, Debug, PartialEq, Eq)] #[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum ChunkState { pub enum ChunkState {
@ -15,7 +17,7 @@ pub struct Chunk {
pub position: IVec3, pub position: IVec3,
pub state: ChunkState, pub state: ChunkState,
pub blocks: Option<BlockData>, pub blocks: Option<BlockData>,
pub subscriptions: HashSet<ClientId, BuildNoHashHasher<ClientIdRepr>>, pub subscriptions: HashSet<ClientId, BuildNoHashHasher<ClientId>>,
} }
impl Chunk { impl Chunk {
pub fn new(position: IVec3) -> Self { pub fn new(position: IVec3) -> Self {

3
kubi-server/src/world/tasks.rs
View file

@ -5,7 +5,8 @@ use rayon::{ThreadPool, ThreadPoolBuilder};
use anyhow::Result; use anyhow::Result;
use kubi_shared::{ use kubi_shared::{
chunk::BlockData, chunk::BlockData,
worldgen::{QueuedBlock, generate_world} worldgen::generate_world,
queue::QueuedBlock,
}; };
pub enum ChunkTask { pub enum ChunkTask {

7
kubi-shared/Cargo.toml
View file

@ -8,9 +8,10 @@ publish = false
[dependencies] [dependencies]
glam = { version = "0.23", features = ["debug-glam-assert", "fast-math", "serde"] } glam = { version = "0.23", features = ["debug-glam-assert", "fast-math", "serde"] }
shipyard = { git = "https://github.com/leudz/shipyard", rev = "eb189f66" } shipyard = { git = "https://github.com/leudz/shipyard", rev = "eb189f66", default-features = false, features = ["std"] }
strum = { version = "0.24", features = ["derive"] } strum = { version = "0.24", features = ["derive"] }
bincode = "2.0.0-rc" postcard = { version = "1.0", features = ["alloc"] }
serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] }
anyhow = "1.0" anyhow = "1.0"
bracket-noise = "0.8" bracket-noise = "0.8"
rand = { version = "0.8", default_features = false, features = ["std", "min_const_gen"] } rand = { version = "0.8", default_features = false, features = ["std", "min_const_gen"] }
@ -18,4 +19,4 @@ rand_xoshiro = "0.6"
[features] [features]
default = [] default = []
nightly = ["rand/nightly", "rand/simd_support"] nightly = ["rand/nightly", "rand/simd_support", "serde/unstable", "glam/core-simd"]

6
kubi-shared/src/block.rs
View file

@ -1,7 +1,7 @@
use bincode::{Encode, Decode}; use serde::{Serialize, Deserialize};
use strum::EnumIter; use strum::EnumIter;
#[derive(Clone, Copy, Debug, EnumIter)] #[derive(Serialize, Deserialize, Clone, Copy, Debug, EnumIter)]
#[repr(u8)] #[repr(u8)]
pub enum BlockTexture { pub enum BlockTexture {
Stone, Stone,
@ -22,7 +22,7 @@ pub enum BlockTexture {
WaterSolid, WaterSolid,
} }
#[derive(Encode, Decode, Clone, Copy, Debug, PartialEq, Eq, EnumIter)] #[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq, EnumIter)]
#[repr(u8)] #[repr(u8)]
pub enum Block { pub enum Block {
Air, Air,

2
kubi-shared/src/lib.rs
View file

@ -4,3 +4,5 @@ pub mod worldgen;
pub mod chunk; pub mod chunk;
pub mod transform; pub mod transform;
pub mod entity; pub mod entity;
pub mod player;
pub mod queue;

1
kubi-shared/src/networking.rs
View file

@ -1,2 +1,3 @@
pub mod messages; pub mod messages;
pub mod state; pub mod state;
pub mod client;

3
kubi-shared/src/networking/client.rs Normal file
View file

@ -0,0 +1,3 @@
pub type ClientId = u16;
pub type ClientKey = u16;

77
kubi-shared/src/networking/messages.rs
View file

@ -1,30 +1,63 @@
use std::num::NonZeroUsize; use std::num::NonZeroUsize;
use bincode::{Encode, Decode}; use serde::{Serialize, Deserialize};
use crate::{chunk::BlockData, block::Block}; use crate::{chunk::BlockData, queue::QueuedBlock};
type IVec3Arr = [i32; 3]; pub type IVec3Arr = [i32; 3];
type Vec3Arr = [f32; 3]; pub type Vec3Arr = [f32; 3];
type QuatArr = [f32; 3]; pub type QuatArr = [f32; 3];
pub const PROTOCOL_ID: u16 = 1; pub const PROTOCOL_ID: u16 = 2;
#[derive(Encode, Decode, Clone)] pub const C_CLIENT_HELLO: u8 = 0;
pub const C_POSITION_CHANGED: u8 = 1;
pub const C_CHUNK_SUB_REQUEST: u8 = 2;
#[derive(Serialize, Deserialize, Clone)]
#[repr(u8)]
pub enum ClientToServerMessage { pub enum ClientToServerMessage {
ClientHello { ClientHello {
username: String, username: String,
password: Option<String>, password: Option<String>,
}, } = C_CLIENT_HELLO,
PositionChanged { PositionChanged {
position: Vec3Arr, position: Vec3Arr,
velocity: Vec3Arr, velocity: Vec3Arr,
direction: QuatArr, direction: QuatArr,
}, } = C_POSITION_CHANGED,
ChunkSubRequest { ChunkSubRequest {
chunk: IVec3Arr, chunk: IVec3Arr,
}, } = C_CHUNK_SUB_REQUEST,
} }
#[derive(Encode, Decode, Clone)] pub const S_SERVER_HELLO: u8 = 0;
pub const S_SERVER_FUCK_OFF: u8 = 1;
pub const S_PLAYER_POSITION_CHANGED: u8 = 2;
pub const S_CHUNK_RESPONSE: u8 = 3;
#[derive(Serialize, Deserialize, Clone)]
#[repr(u8)]
pub enum ServerToClientMessage {
ServerHello {
init: InitData
} = S_SERVER_HELLO,
ServerFuckOff {
reason: String,
} = S_SERVER_FUCK_OFF,
PlayerPositionChanged {
client_id: u8,
position: Vec3Arr,
direction: QuatArr,
} = S_PLAYER_POSITION_CHANGED,
ChunkResponse {
chunk: IVec3Arr,
data: BlockData,
queued: Vec<QueuedBlock>,
} = S_CHUNK_RESPONSE,
}
//---
#[derive(Serialize, Deserialize, Clone)]
pub struct UserInitData { pub struct UserInitData {
pub client_id: NonZeroUsize, //maybe use the proper type instead pub client_id: NonZeroUsize, //maybe use the proper type instead
pub username: String, pub username: String,
@ -33,27 +66,7 @@ pub struct UserInitData {
pub direction: QuatArr, pub direction: QuatArr,
} }
#[derive(Encode, Decode, Clone)] #[derive(Serialize, Deserialize, Clone)]
pub struct InitData { pub struct InitData {
pub users: Vec<UserInitData> pub users: Vec<UserInitData>
} }
#[derive(Encode, Decode, Clone)]
pub enum ServerToClientMessage {
ServerHello {
init: InitData
},
ServerFuckOff {
reason: String,
},
PlayerPositionChanged {
client_id: u8,
position: Vec3Arr,
direction: QuatArr,
},
ChunkResponse {
chunk: IVec3Arr,
data: BlockData,
queued: Vec<(IVec3Arr, Block)>,
}
}

4
kubi-shared/src/player.rs Normal file
View file

@ -0,0 +1,4 @@
use shipyard::Component;
#[derive(Component)]
pub struct Player;

11
kubi-shared/src/queue.rs Normal file
View file

@ -0,0 +1,11 @@
use glam::IVec3;
use serde::{Serialize, Deserialize};
use crate::block::Block;
#[derive(Serialize, Deserialize, Clone, Copy, Debug)]
pub struct QueuedBlock {
pub position: IVec3,
pub block_type: Block,
/// Only replace air blocks
pub soft: bool,
}

10
kubi-shared/src/worldgen.rs
View file

@ -4,7 +4,8 @@ use glam::{IVec3, ivec3, Vec3Swizzles, IVec2};
use rand_xoshiro::Xoshiro256StarStar; use rand_xoshiro::Xoshiro256StarStar;
use crate::{ use crate::{
chunk::{BlockData, CHUNK_SIZE}, chunk::{BlockData, CHUNK_SIZE},
block::Block block::Block,
queue::QueuedBlock,
}; };
fn mountain_ramp(mut x: f32) -> f32 { fn mountain_ramp(mut x: f32) -> f32 {
@ -29,10 +30,6 @@ fn local_y_position(height: i32, chunk_position: IVec3) -> Option<usize> {
(0..CHUNK_SIZE as i32).contains(&position).then_some(position as usize) (0..CHUNK_SIZE as i32).contains(&position).then_some(position as usize)
} }
pub struct QueuedBlock {
pub position: IVec3,
pub block_type: Block,
}
pub fn generate_world(chunk_position: IVec3, seed: u64) -> (BlockData, Vec<QueuedBlock>) { pub fn generate_world(chunk_position: IVec3, seed: u64) -> (BlockData, Vec<QueuedBlock>) {
let offset = chunk_position * CHUNK_SIZE as i32; let offset = chunk_position * CHUNK_SIZE as i32;
@ -47,7 +44,8 @@ pub fn generate_world(chunk_position: IVec3, seed: u64) -> (BlockData, Vec<Queue
}); });
queue.push(QueuedBlock { queue.push(QueuedBlock {
position: event_pos, position: event_pos,
block_type: block block_type: block,
soft: true
}); });
} else { } else {
blocks[position.x as usize][position.y as usize][position.z as usize] = block; blocks[position.x as usize][position.y as usize][position.z as usize] = block;

17
kubi-udp/Cargo.toml
View file

@ -1,17 +0,0 @@
[package]
name = "kubi-udp"
version = "0.1.0"
edition = "2021"
publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
bincode = "2.0.0-rc"
anyhow = "1.0"
hashbrown = "0.13"
nohash-hasher = "0.2.0"
log = "0.4"
[dev-dependencies]
kubi-logging = { path = "../kubi-logging" }

270
kubi-udp/src/client.rs
View file

@ -1,270 +0,0 @@
use anyhow::{Result, bail};
use std::{
net::{UdpSocket, SocketAddr},
time::{Instant, Duration},
marker::PhantomData,
collections::{VecDeque, vec_deque::Drain as DrainDeque},
io::ErrorKind,
};
use crate::{
BINCODE_CONFIG,
packet::{ClientPacket, IdClientPacket, IdServerPacket, ServerPacket, Message},
common::{ClientId, PROTOCOL_ID, DEFAULT_USER_PROTOCOL_ID, PACKET_SIZE}
};
#[derive(Default, Clone, Debug)]
#[repr(u8)]
pub enum DisconnectReason {
#[default]
NotConnected,
ClientDisconnected,
KickedByServer(Option<String>),
Timeout,
ConnectionReset,
InvalidProtocolId,
}
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum ClientStatus {
Disconnected,
Connecting,
Connected,
}
#[derive(Clone, Copy, Debug)]
pub struct ClientConfig {
pub protocol_id: u16,
pub timeout: Duration,
pub heartbeat_interval: Duration,
}
impl Default for ClientConfig {
fn default() -> Self {
Self {
protocol_id: DEFAULT_USER_PROTOCOL_ID,
timeout: Duration::from_secs(5),
heartbeat_interval: Duration::from_secs(3),
}
}
}
pub enum ClientEvent<T> where T: Message {
Connected(ClientId),
Disconnected(DisconnectReason),
MessageReceived(T)
}
pub struct Client<S, R> where S: Message, R: Message {
config: ClientConfig,
addr: SocketAddr,
socket: UdpSocket,
status: ClientStatus,
timeout: Instant,
last_heartbeat: Instant,
client_id: Option<ClientId>,
disconnect_reason: DisconnectReason,
event_queue: VecDeque<ClientEvent<R>>,
_s: PhantomData<S>,
}
impl<S, R> Client<S, R> where S: Message, R: Message {
#[inline]
pub fn new(addr: SocketAddr, config: ClientConfig) -> Result<Self> {
if config.protocol_id == 0 {
log::warn!("Warning: using 0 as protocol_id is not recommended");
}
if config.protocol_id == DEFAULT_USER_PROTOCOL_ID {
log::warn!("Warning: using default protocol_id is not recommended");
}
let bind_addr: SocketAddr = "0.0.0.0:0".parse().unwrap();
let socket = UdpSocket::bind(bind_addr)?;
socket.set_nonblocking(true)?;
Ok(Self {
addr,
config,
socket,
status: ClientStatus::Disconnected,
timeout: Instant::now(),
last_heartbeat: Instant::now(),
client_id: None,
disconnect_reason: DisconnectReason::default(),
event_queue: VecDeque::new(),
_s: PhantomData,
})
}
fn send_raw_packet(&self, packet: ClientPacket<S>) -> Result<()> {
let id_packet = IdClientPacket(self.client_id, packet);
let bytes = bincode::encode_to_vec(id_packet, BINCODE_CONFIG)?;
self.socket.send(&bytes)?;
Ok(())
}
fn disconnect_inner(&mut self, reason: DisconnectReason, silent: bool) -> Result<()> {
log::info!("client disconnected because {reason:?}");
if !silent {
self.send_raw_packet(ClientPacket::Disconnect)?;
}
self.client_id = None;
self.status = ClientStatus::Disconnected;
self.disconnect_reason = reason;
self.event_queue.push_back(ClientEvent::Disconnected(self.disconnect_reason.clone()));
Ok(())
}
fn reset_timeout(&mut self) {
self.timeout = Instant::now();
}
#[inline]
pub fn connect(&mut self) -> Result<()> {
log::info!("Client connecting..");
if self.status != ClientStatus::Disconnected {
bail!("Not Disconnected");
}
self.status = ClientStatus::Connecting;
self.last_heartbeat = Instant::now();
self.reset_timeout();
self.socket.connect(self.addr)?;
self.send_raw_packet(ClientPacket::Connect{
user_protocol: self.config.protocol_id,
inner_protocol: PROTOCOL_ID,
})?;
Ok(())
}
#[inline]
pub fn disconnect(&mut self) -> Result<()> {
if self.status != ClientStatus::Connected {
bail!("Not Connected");
}
self.disconnect_inner(DisconnectReason::ClientDisconnected, false)?;
Ok(())
}
#[inline]
pub fn set_nonblocking(&mut self, is_nonblocking: bool) -> Result<()> {
self.socket.set_nonblocking(is_nonblocking)?;
Ok(())
}
#[inline]
pub fn get_status(&self) -> ClientStatus {
self.status
}
#[inline]
pub fn is_connected(&self) -> bool {
self.status == ClientStatus::Connected
}
#[inline]
pub fn is_connecting(&self) -> bool {
self.status == ClientStatus::Connecting
}
#[inline]
pub fn is_disconnected(&self) -> bool {
self.status == ClientStatus::Disconnected
}
//Return true if the client has not made any connection attempts yet
#[inline]
pub fn has_not_made_connection_attempts(&self) -> bool {
matches!(self.status, ClientStatus::Disconnected) &&
matches!(self.disconnect_reason, DisconnectReason::NotConnected)
}
#[inline]
pub fn send_message(&self, message: S) -> Result<()> {
if self.status != ClientStatus::Connected {
bail!("Not Connected");
}
self.send_raw_packet(ClientPacket::Data(message))?;
Ok(())
}
#[inline]
pub fn update(&mut self) -> Result<()> { // , callback: fn(ClientEvent<R>) -> Result<()>
if self.status == ClientStatus::Disconnected {
return Ok(())
}
if self.timeout.elapsed() > self.config.timeout {
log::warn!("Client timed out");
//We don't care if this packet actually gets sent because the server is likely dead
let _ = self.disconnect_inner(DisconnectReason::Timeout, false).map_err(|_| {
log::warn!("Failed to send disconnect packet");
});
return Ok(())
}
if self.last_heartbeat.elapsed() > self.config.heartbeat_interval {
log::trace!("Sending heartbeat packet");
self.send_raw_packet(ClientPacket::Heartbeat)?;
self.last_heartbeat = Instant::now();
}
//receive
let mut buf = [0; PACKET_SIZE];
loop {
match self.socket.recv(&mut buf) {
Ok(length) => {
//TODO check the first byte of the raw data instead of decoding?
let (packet, _): (IdServerPacket<R>, _) = bincode::decode_from_slice(&buf[..length], BINCODE_CONFIG)?;
let IdServerPacket(user_id, packet) = packet;
if self.client_id.map(|x| Some(x) != user_id).unwrap_or_default() {
return Ok(())
}
self.reset_timeout();
match packet {
ServerPacket::Connected(client_id) => {
log::info!("client connected with id {client_id}");
self.client_id = Some(client_id);
self.status = ClientStatus::Connected;
self.event_queue.push_back(ClientEvent::Connected(client_id));
return Ok(())
},
ServerPacket::Disconnected(reason) => {
log::info!("client kicked: {reason}");
let reason = DisconnectReason::KickedByServer(Some(reason));
self.disconnect_inner(reason, true)?; //this should never fail but we're handling the error anyway
return Ok(())
},
ServerPacket::Data(message) => {
self.event_queue.push_back(ClientEvent::MessageReceived(message));
self.timeout = Instant::now();
},
ServerPacket::Heartbeat => {
self.timeout = Instant::now();
},
ServerPacket::ProtoDisconnect => {
let reason = DisconnectReason::InvalidProtocolId;
self.disconnect_inner(reason, true)?; //this should never fail but we're handling the error anyway
return Ok(());
}
}
},
Err(error) if error.kind() != ErrorKind::WouldBlock => {
match error.kind() {
ErrorKind::ConnectionReset => {
log::error!("Connection interrupted");
self.disconnect_inner(DisconnectReason::ConnectionReset, true)?;
},
_ => {
log::error!("IO error {error}");
return Err(error.into());
},
}
},
_ => break,
}
}
Ok(())
}
#[inline]
pub fn pop_event(&mut self) -> Option<ClientEvent<R>> {
self.event_queue.pop_front()
}
#[inline]
pub fn process_events(&mut self) -> DrainDeque<ClientEvent<R>> {
self.event_queue.drain(..)
}
}

11
kubi-udp/src/common.rs
View file

@ -1,11 +0,0 @@
use std::num::NonZeroU8;
pub type ClientId = NonZeroU8;
pub type ClientIdRepr = u8;
pub const MAX_CLIENTS: usize = u8::MAX as _;
pub const PROTOCOL_ID: u16 = 1;
pub const DEFAULT_USER_PROTOCOL_ID: u16 = 0xffff;
pub const PACKET_SIZE: usize = u16::MAX as usize;

13
kubi-udp/src/lib.rs
View file

@ -1,13 +0,0 @@
pub mod client;
pub mod server;
pub(crate) mod packet;
pub(crate) mod common;
pub use common::ClientId;
pub use common::ClientIdRepr;
pub use common::MAX_CLIENTS;
//pub(crate) trait Serializable: bincode::Encode + bincode::Decode {}
pub(crate) const BINCODE_CONFIG: bincode::config::Configuration<bincode::config::LittleEndian, bincode::config::Varint, bincode::config::SkipFixedArrayLength> = bincode::config::standard()
.with_little_endian()
.with_variable_int_encoding()
.skip_fixed_array_length();

33
kubi-udp/src/packet.rs
View file

@ -1,33 +0,0 @@
use bincode::{Encode, Decode};
use crate::common::ClientId;
pub trait Message: Encode + Decode + Clone {}
impl<T: Encode + Decode + Clone> Message for T {}
#[repr(u8)]
#[derive(Encode, Decode)]
pub enum ClientPacket<T> where T: Message {
Connect {
inner_protocol: u16,
user_protocol: u16,
}, //should always stay 0!
Data(T),
Disconnect,
Heartbeat,
}
#[derive(Encode, Decode)]
pub struct IdClientPacket<T: Message>(pub Option<ClientId>, pub ClientPacket<T>);
#[repr(u8)]
#[derive(Encode, Decode)]
pub enum ServerPacket<T> where T: Message {
ProtoDisconnect = 0,
Data(T),
Disconnected(String),
Connected(ClientId),
Heartbeat,
}
#[derive(Encode, Decode)]
pub struct IdServerPacket<T: Message>(pub Option<ClientId>, pub ServerPacket<T>);

266
kubi-udp/src/server.rs
View file

@ -1,266 +0,0 @@
use std::{
net::{UdpSocket, SocketAddr},
time::{Instant, Duration},
marker::PhantomData,
collections::{VecDeque, vec_deque::Drain as DrainDeque},
io::ErrorKind
};
use anyhow::{Result, Error, bail};
use hashbrown::HashMap;
use nohash_hasher::BuildNoHashHasher;
use crate::{
BINCODE_CONFIG,
common::{ClientId, ClientIdRepr, MAX_CLIENTS, PROTOCOL_ID, DEFAULT_USER_PROTOCOL_ID, PACKET_SIZE},
packet::{IdClientPacket, ClientPacket, ServerPacket, IdServerPacket, Message}
};
//i was feeling a bit sick while writing most of this please excuse me for my terrible code :3
pub struct ConnectedClient {
id: ClientId,
addr: SocketAddr,
timeout: Instant,
}
#[derive(Clone, Copy, Debug)]
pub struct ServerConfig {
pub max_clients: usize,
pub client_timeout: Duration,
pub protocol_id: u16,
}
impl Default for ServerConfig {
fn default() -> Self {
Self {
max_clients: MAX_CLIENTS,
client_timeout: Duration::from_secs(5),
protocol_id: DEFAULT_USER_PROTOCOL_ID,
}
}
}
pub enum ServerEvent<T> where T: Message {
Connected(ClientId),
Disconnected(ClientId),
MessageReceived {
from: ClientId,
message: T
}
}
pub struct Server<S, R> where S: Message, R: Message {
socket: UdpSocket,
clients: HashMap<ClientId, ConnectedClient, BuildNoHashHasher<ClientIdRepr>>,
config: ServerConfig,
event_queue: VecDeque<ServerEvent<R>>,
_s: PhantomData<S>,
}
impl<S, R> Server<S, R> where S: Message, R: Message {
pub fn bind(addr: SocketAddr, config: ServerConfig) -> anyhow::Result<Self> {
assert!(config.max_clients <= MAX_CLIENTS, "max_clients value exceeds the maximum allowed amount of clients");
if config.protocol_id == 0 {
log::warn!("Warning: using 0 as protocol_id is not recommended");
}
if config.protocol_id == DEFAULT_USER_PROTOCOL_ID {
log::warn!("Warning: using default protocol_id is not recommended");
}
let socket = UdpSocket::bind(addr)?;
socket.set_nonblocking(true)?;
Ok(Self {
config,
socket,
clients: HashMap::with_capacity_and_hasher(MAX_CLIENTS, BuildNoHashHasher::default()),
event_queue: VecDeque::new(),
_s: PhantomData,
})
}
fn send_to_addr_inner(socket: &UdpSocket, addr: SocketAddr, packet: IdServerPacket<S>) -> Result<()> {
let bytes = bincode::encode_to_vec(packet, BINCODE_CONFIG)?;
socket.send_to(&bytes, addr)?;
Ok(())
}
fn send_to_addr(&self, addr: SocketAddr, packet: IdServerPacket<S>) -> Result<()> {
Self::send_to_addr_inner(&self.socket, addr, packet)
}
fn send_packet(&self, packet: IdServerPacket<S>) -> Result<()> {
let Some(id) = packet.0 else {
bail!("send_to_client call without id")
};
let Some(client) = self.clients.get(&id) else {
bail!("client with id {id} doesn't exist")
};
self.send_to_addr(client.addr, packet)?;
Ok(())
}
fn add_client(&mut self, addr: SocketAddr) -> Result<ClientId> {
let Some(id) = (1..=self.config.max_clients)
.map(|x| ClientId::new(x as _).unwrap())
.find(|i| !self.clients.contains_key(i)) else {
bail!("Server full");
};
if self.clients.iter().any(|x| x.1.addr == addr) {
bail!("Already connected from the same address");
}
self.clients.insert(id, ConnectedClient {
id,
addr,
timeout: Instant::now(),
});
Ok(id)
}
fn disconnect_client_inner(&mut self, id: ClientId, reason: String) -> Result<()> {
let result = self.send_packet(IdServerPacket(
Some(id), ServerPacket::Disconnected(reason)
));
self.clients.remove(&id);
result
}
pub fn kick_client(&mut self, id: ClientId, reason: String) -> Result<()> {
if !self.clients.contains_key(&id) {
bail!("Already disconnected")
}
self.disconnect_client_inner(id, reason)?;
Ok(())
}
pub fn shutdown(mut self) -> Result<()> {
let clients = self.clients.keys().copied().collect::<Vec<ClientId>>();
for id in clients {
self.kick_client(id, "Server is shutting down".into())?;
}
Ok(())
}
pub fn send_message(&mut self, id: ClientId, message: S) -> Result<()> {
self.send_packet(IdServerPacket(Some(id), ServerPacket::Data(message)))?;
Ok(())
}
pub fn multicast_message(&mut self, clients: impl IntoIterator<Item = ClientId>, message: S) -> Vec<Error> {
//TODO use actual udp multicast
let mut errors = Vec::with_capacity(0);
for client in clients {
if let Err(error) = self.send_message(client, message.clone()) {
log::error!("Message broadcast failed for id {client}");
errors.push(error);
}
}
errors
}
pub fn broadcast_message(&mut self, message: S) -> Vec<Error> {
let ids = self.clients.keys().copied().collect::<Vec<ClientId>>();
self.multicast_message(ids, message)
}
pub fn broadcast_message_except(&mut self, except: ClientId, message: S) -> Vec<Error> {
let ids = self.clients.keys().copied().filter(|&k| k != except).collect::<Vec<ClientId>>();
self.multicast_message(ids, message)
}
pub fn update(&mut self) -> Result<()> {
//kick inactive clients
self.clients.retain(|&id, client| {
if client.timeout.elapsed() > self.config.client_timeout {
if let Err(_) = Self::send_to_addr_inner(&self.socket, client.addr, IdServerPacket(
Some(id), ServerPacket::Disconnected("Timed out".into())
)) {
log::warn!("Client {id} timed out and we failed to send the kick packet. This shouldn't reaally matter")
} else {
log::info!("Client {id} timed out");
}
return false
}
true
});
let mut buf = [0; PACKET_SIZE];
loop {
match self.socket.recv_from(&mut buf) {
Ok((len, addr)) => {
if let Ok(packet) = bincode::decode_from_slice(&buf[..len], BINCODE_CONFIG) {
let (packet, _): (IdClientPacket<R>, _) = packet;
let IdClientPacket(id, packet) = packet;
match id {
Some(id) => {
if !self.clients.contains_key(&id) {
bail!("Client with id {id} doesn't exist");
}
if self.clients.get(&id).unwrap().addr != addr {
bail!("Client addr doesn't match");
}
match packet {
ClientPacket::Data(data) => {
self.event_queue.push_back(ServerEvent::MessageReceived {
from: id,
message: data,
});
}
ClientPacket::Disconnect => {
log::info!("Client {id} disconnected");
self.event_queue.push_back(ServerEvent::Disconnected(id));
self.disconnect_client_inner(id, "Disconnected".into())?;
},
ClientPacket::Heartbeat => {
self.clients.get_mut(&id).unwrap().timeout = Instant::now();
self.send_packet(IdServerPacket(Some(id), ServerPacket::Heartbeat))?;
},
ClientPacket::Connect{..} => bail!("Client already connected"),
}
},
None => {
match packet {
ClientPacket::Connect { user_protocol, inner_protocol } => {
if (inner_protocol != PROTOCOL_ID) || (user_protocol != self.config.protocol_id ) {
log::error!("Client conenction refused: Invalid protocol id");
self.send_to_addr(addr,
IdServerPacket(None, ServerPacket::ProtoDisconnect)
)?;
continue;
}
match self.add_client(addr) {
Ok(id) => {
log::info!("Client with id {id} connected");
self.event_queue.push_back(ServerEvent::Connected(id));
self.send_to_addr(addr,
IdServerPacket(None, ServerPacket::Connected(id))
)?;
},
Err(error) => {
let reason = error.to_string();
log::error!("Client connection failed: {reason}");
self.send_to_addr(addr, IdServerPacket(
None, ServerPacket::Disconnected(reason)
))?;
}
}
},
_ => bail!("Invalid packet type for non-id packet")
}
}
}
} else {
bail!("Corrupted packet received");
}
},
Err(error) if error.kind() != ErrorKind::WouldBlock => {
log::error!("IO error {}", error);
// return Err(error.into());
},
_ => break,
}
}
Ok(())
}
pub fn pop_event(&mut self) -> Option<ServerEvent<R>> {
self.event_queue.pop_front()
}
pub fn process_events(&mut self) -> DrainDeque<ServerEvent<R>> {
self.event_queue.drain(..)
}
}

93
kubi-udp/tests/test.rs
View file

@ -1,93 +0,0 @@
use kubi_udp::{
server::{Server, ServerConfig, ServerEvent},
client::{Client, ClientConfig, ClientEvent},
};
use std::{thread, time::Duration};
const TEST_ADDR: &str = "127.0.0.1:22342";
type CtsMessage = u32;
type StcMessage = u64;
const CTS_MSG: CtsMessage = 0xbeef_face;
const STC_MSG: StcMessage = 0xdead_beef_cafe_face;
#[test]
fn test_connection() {
//Init logging
kubi_logging::init();
//Create server and client
let mut server: Server<StcMessage, CtsMessage> = Server::bind(
TEST_ADDR.parse().expect("Invalid TEST_ADDR"),
ServerConfig::default()
).expect("Failed to create server");
let mut client: Client<CtsMessage, StcMessage> = Client::new(
TEST_ADDR.parse().unwrap(),
ClientConfig::default()
).expect("Failed to create client");
//Start server update thread
let server_handle = thread::spawn(move || {
let mut message_received = false;
loop {
server.update().unwrap();
let events: Vec<_> = server.process_events().collect();
for event in events {
match event {
ServerEvent::Connected(id) => {
assert_eq!(id.get(), 1, "Unexpected client id");
server.send_message(id, STC_MSG).unwrap();
},
ServerEvent::Disconnected(id) => {
assert!(message_received, "Client {id} disconnected from the server before sending the message");
return;
},
ServerEvent::MessageReceived { from, message } => {
log::info!("server received message");
assert_eq!(message, CTS_MSG, "Received message not equal");
message_received = true;
},
_ => ()
}
}
}
});
//Wait a bit
thread::sleep(Duration::from_secs(1));
//Connect client
client.connect().expect("Client connect failed");
//Start updating the client
let client_handle = thread::spawn(move || {
let mut message_received = false;
loop {
client.update().unwrap();
let events: Vec<_> = client.process_events().collect();
for event in events {
match event {
ClientEvent::Connected(id) => {
assert_eq!(id.get(), 1, "Unexpected client id");
client.send_message(CTS_MSG).unwrap();
},
ClientEvent::Disconnected(reason) => {
assert!(message_received, "Client lost connection to the server before sending the message with reason: {reason:?}");
return;
},
ClientEvent::MessageReceived(data) => {
log::info!("client received message");
assert_eq!(data, STC_MSG, "Received message not equal");
message_received = true;
client.disconnect().unwrap();
},
_ => ()
}
}
}
});
server_handle.join().unwrap();
client_handle.join().unwrap();
}

6
kubi/Cargo.toml
View file

@ -6,7 +6,6 @@ publish = false
[dependencies] [dependencies]
kubi-shared = { path = "../kubi-shared" } kubi-shared = { path = "../kubi-shared" }
kubi-udp = { path = "../kubi-udp" }
kubi-logging = { path = "../kubi-logging" } kubi-logging = { path = "../kubi-logging" }
log = "*" log = "*"
glium = "0.32" glium = "0.32"
@ -15,15 +14,18 @@ image = { version = "0.24", default_features = false, features = ["png"] }
strum = { version = "0.24", features = ["derive"] } strum = { version = "0.24", features = ["derive"] }
hashbrown = "0.13" hashbrown = "0.13"
rayon = "1.6" rayon = "1.6"
shipyard = { git = "https://github.com/leudz/shipyard", rev = "eb189f66", features = ["thread_local"] } shipyard = { git = "https://github.com/leudz/shipyard", rev = "eb189f66", default-features = false, features = ["std", "proc", "thread_local"] }
nohash-hasher = "0.2.0" nohash-hasher = "0.2.0"
anyhow = "1.0" anyhow = "1.0"
flume = "0.10" flume = "0.10"
gilrs = { version = "0.10", default_features = false, features = ["xinput"] } gilrs = { version = "0.10", default_features = false, features = ["xinput"] }
uflow = "0.7"
postcard = { version = "1.0", features = ["alloc"] }
[target.'cfg(target_os = "windows")'.dependencies] [target.'cfg(target_os = "windows")'.dependencies]
winapi = { version = "0.3" } winapi = { version = "0.3" }
[features] [features]
default = [] default = []
parallel = ["shipyard/parallel"]
nightly = ["glam/core-simd", "kubi-shared/nightly"] nightly = ["glam/core-simd", "kubi-shared/nightly"]

11
kubi/src/block_placement.rs
View file

@ -1,9 +1,12 @@
use shipyard::{UniqueViewMut, UniqueView, View, IntoIter, ViewMut, EntitiesViewMut, Component, Workload, IntoWorkload}; use shipyard::{UniqueViewMut, UniqueView, View, IntoIter, ViewMut, EntitiesViewMut, Component, Workload, IntoWorkload};
use glium::glutin::event::VirtualKeyCode; use glium::glutin::event::VirtualKeyCode;
use kubi_shared::block::Block; use kubi_shared::{
block::Block,
queue::QueuedBlock,
};
use crate::{ use crate::{
player::MainPlayer, player::MainPlayer,
world::{raycast::{LookingAtBlock, RAYCAST_STEP}, queue::{BlockUpdateQueue, BlockUpdateEvent}}, world::{raycast::{LookingAtBlock, RAYCAST_STEP}, queue::BlockUpdateQueue},
input::{Inputs, PrevInputs, RawKbmInputState}, input::{Inputs, PrevInputs, RawKbmInputState},
events::{EventComponent, player_actions::PlayerActionEvent}, events::{EventComponent, player_actions::PlayerActionEvent},
}; };
@ -67,9 +70,9 @@ fn block_placement_system(
(ray.block_position, Block::Air) (ray.block_position, Block::Air)
}; };
//queue place //queue place
block_event_queue.push(BlockUpdateEvent { block_event_queue.push(QueuedBlock {
position: place_position, position: place_position,
value: place_block, block_type: place_block,
soft: place_block != Block::Air, soft: place_block != Block::Air,
}); });
//send event //send event

21
kubi/src/camera/matrices.rs
View file

@ -1,6 +1,6 @@
use glam::{Vec3, Mat4}; use glam::{Vec3, Mat4};
use shipyard::{ViewMut, View, IntoIter, Workload, IntoWorkload, track}; use shipyard::{ViewMut, View, IntoIter, Workload, IntoWorkload, track, UniqueView, SystemModificator};
use crate::{transform::Transform, events::WindowResizedEvent}; use crate::{transform::Transform, rendering::WindowSize, events::WindowResizedEvent};
use super::Camera; use super::Camera;
//maybe parallelize these two? //maybe parallelize these two?
@ -18,11 +18,8 @@ fn update_view_matrix(
fn update_perspective_matrix( fn update_perspective_matrix(
mut vm_camera: ViewMut<Camera>, mut vm_camera: ViewMut<Camera>,
resize: View<WindowResizedEvent>, size: UniqueView<WindowSize>,
) { ) {
let Some(&size) = resize.iter().next() else {
return
};
for mut camera in (&mut vm_camera).iter() { for mut camera in (&mut vm_camera).iter() {
camera.perspective_matrix = Mat4::perspective_rh_gl( camera.perspective_matrix = Mat4::perspective_rh_gl(
camera.fov, camera.fov,
@ -33,9 +30,19 @@ fn update_perspective_matrix(
} }
} }
fn need_perspective_calc(
v_camera: View<Camera>,
resize_event: View<WindowResizedEvent>,
) -> bool {
(resize_event.len() > 0) ||
(v_camera.iter().any(|camera| {
camera.perspective_matrix == Mat4::default()
}))
}
pub fn update_matrices() -> Workload { pub fn update_matrices() -> Workload {
( (
update_view_matrix, update_view_matrix,
update_perspective_matrix, update_perspective_matrix.run_if(need_perspective_calc),
).into_workload() ).into_workload()
} }

23
kubi/src/main.rs
View file

@ -7,7 +7,8 @@
use shipyard::{ use shipyard::{
World, Workload, IntoWorkload, World, Workload, IntoWorkload,
UniqueView, UniqueViewMut, UniqueView, UniqueViewMut,
NonSendSync, WorkloadModificator, SystemModificator NonSendSync, WorkloadModificator,
SystemModificator
}; };
use glium::{ use glium::{
glutin::{ glutin::{
@ -46,9 +47,9 @@ use world::{
loading::update_loaded_world_around_player, loading::update_loaded_world_around_player,
raycast::update_raycasts, raycast::update_raycasts,
queue::apply_queued_blocks, queue::apply_queued_blocks,
tasks::inject_network_responses_into_manager_queue tasks::{inject_network_responses_into_manager_queue, ChunkTaskManager}, ChunkStorage
}; };
use player::spawn_player; use player::{spawn_player, MainPlayer};
use prefabs::load_prefabs; use prefabs::load_prefabs;
use settings::load_settings; use settings::load_settings;
use camera::compute_cameras; use camera::compute_cameras;
@ -96,8 +97,6 @@ fn startup() -> Workload {
lock_cursor_now, lock_cursor_now,
init_input, init_input,
init_gui, init_gui,
init_game_world,
spawn_player,
insert_control_flow_unique, insert_control_flow_unique,
init_delta_time, init_delta_time,
).into_workload() ).into_workload()
@ -107,19 +106,23 @@ fn update() -> Workload {
update_window_size, update_window_size,
update_cursor_lock_state, update_cursor_lock_state,
process_inputs, process_inputs,
(
init_game_world.run_if_missing_unique::<ChunkTaskManager>(),
spawn_player.run_if_storage_empty::<MainPlayer>(),
).into_sequential_workload().run_if(is_ingame_or_loading).tag("game_init"),
( (
update_networking, update_networking,
inject_network_responses_into_manager_queue, inject_network_responses_into_manager_queue.run_if(is_ingame_or_loading).skip_if_missing_unique::<ChunkTaskManager>(),
).into_sequential_workload().run_if(is_multiplayer), ).into_sequential_workload().run_if(is_multiplayer).tag("networking").after_all("game_init"),
( (
switch_to_loading_if_connected switch_to_loading_if_connected
).into_workload().run_if(is_connecting), ).into_workload().run_if(is_connecting).after_all("networking"),
( (
update_loading_screen, update_loading_screen,
).into_workload().run_if(is_loading), ).into_workload().run_if(is_loading).after_all("game_init"),
( (
update_loaded_world_around_player, update_loaded_world_around_player,
).into_workload().run_if(is_ingame_or_loading), ).into_workload().run_if(is_ingame_or_loading).after_all("game_init"),
( (
update_controllers, update_controllers,
generate_move_events, generate_move_events,

110
kubi/src/networking.rs
View file

@ -1,9 +1,9 @@
use shipyard::{Unique, AllStoragesView, UniqueView, UniqueViewMut, Workload, IntoWorkload, EntitiesViewMut, Component, ViewMut, SystemModificator, View, IntoIter, WorkloadModificator}; use shipyard::{Unique, AllStoragesView, UniqueView, UniqueViewMut, Workload, IntoWorkload, EntitiesViewMut, Component, ViewMut, SystemModificator, View, IntoIter, WorkloadModificator};
use glium::glutin::event_loop::ControlFlow; use glium::glutin::event_loop::ControlFlow;
use std::net::SocketAddr; use std::net::SocketAddr;
use kubi_udp::client::{Client, ClientConfig, ClientEvent}; use uflow::client::{Client, Config as ClientConfig, Event as ClientEvent};
use kubi_shared::networking::{ use kubi_shared::networking::{
messages::{ClientToServerMessage, ServerToClientMessage}, messages::{ClientToServerMessage, ServerToClientMessage, S_SERVER_HELLO},
state::ClientJoinState state::ClientJoinState
}; };
use crate::{events::EventComponent, control_flow::SetControlFlow}; use crate::{events::EventComponent, control_flow::SetControlFlow};
@ -18,43 +18,34 @@ pub enum GameType {
pub struct ServerAddress(pub SocketAddr); pub struct ServerAddress(pub SocketAddr);
#[derive(Unique)] #[derive(Unique)]
pub struct UdpClient(pub Client<ClientToServerMessage, ServerToClientMessage>); pub struct UdpClient(pub Client);
#[derive(Component)] #[derive(Component)]
pub struct NetworkEvent(pub ClientEvent<ServerToClientMessage>); pub struct NetworkEvent(pub ClientEvent);
fn create_client( impl NetworkEvent {
///Checks if postcard-encoded message has a type
pub fn is_message_of_type<const T: u8>(&self) -> bool {
let ClientEvent::Receive(data) = &self.0 else { return false };
if data.len() == 0 { return false }
data[0] == T
}
}
#[derive(Component)]
pub struct NetworkMessageEvent(pub ServerToClientMessage);
fn connect_client(
storages: AllStoragesView storages: AllStoragesView
) { ) {
log::info!("Creating client"); log::info!("Creating client");
let address = storages.borrow::<UniqueView<ServerAddress>>().unwrap(); let address = storages.borrow::<UniqueView<ServerAddress>>().unwrap();
storages.add_unique(UdpClient(Client::new( let client = Client::connect(address.0, ClientConfig::default()).expect("Client connection failed");
address.0, storages.add_unique(UdpClient(client));
ClientConfig::default()
).unwrap()));
storages.add_unique(ClientJoinState::Disconnected); storages.add_unique(ClientJoinState::Disconnected);
} }
fn connect_client( fn poll_client(
mut client: UniqueViewMut<UdpClient>
) {
log::info!("Connect called");
client.0.connect().unwrap();
}
fn should_connect(
client: UniqueView<UdpClient>
) -> bool {
client.0.has_not_made_connection_attempts()
}
fn update_client(
mut client: UniqueViewMut<UdpClient>,
) {
client.0.update().unwrap();
}
fn insert_client_events(
mut client: UniqueViewMut<UdpClient>, mut client: UniqueViewMut<UdpClient>,
mut entities: EntitiesViewMut, mut entities: EntitiesViewMut,
mut events: ViewMut<EventComponent>, mut events: ViewMut<EventComponent>,
@ -63,7 +54,7 @@ fn insert_client_events(
entities.bulk_add_entity(( entities.bulk_add_entity((
&mut events, &mut events,
&mut network_events, &mut network_events,
), client.0.process_events().map(|event| { ), client.0.step().map(|event| {
(EventComponent, NetworkEvent(event)) (EventComponent, NetworkEvent(event))
})); }));
} }
@ -76,13 +67,19 @@ fn set_client_join_state_to_connected(
} }
fn say_hello( fn say_hello(
client: UniqueViewMut<UdpClient>, mut client: UniqueViewMut<UdpClient>,
) { ) {
log::info!("Authenticating"); log::info!("Authenticating");
client.0.send_message(ClientToServerMessage::ClientHello { client.0.send(
username: "Sbeve".into(), postcard::to_allocvec(
password: None &ClientToServerMessage::ClientHello {
}).unwrap(); username: "Sbeve".into(),
password: None
}
).unwrap().into_boxed_slice(),
0,
uflow::SendMode::Reliable
);
} }
fn check_server_hello_response( fn check_server_hello_response(
@ -90,20 +87,30 @@ fn check_server_hello_response(
mut join_state: UniqueViewMut<ClientJoinState> mut join_state: UniqueViewMut<ClientJoinState>
) { ) {
for event in network_events.iter() { for event in network_events.iter() {
if let ClientEvent::MessageReceived(ServerToClientMessage::ServerHello { init }) = &event.0 { let ClientEvent::Receive(data) = &event.0 else {
log::info!("Joined the server!"); continue
//TODO handle init data };
*join_state = ClientJoinState::Joined; if !event.is_message_of_type::<S_SERVER_HELLO>() {
continue
} }
let Ok(parsed_message) = postcard::from_bytes(data) else {
log::error!("Malformed message");
continue
};
let ServerToClientMessage::ServerHello { init } = parsed_message else {
unreachable!()
};
//TODO handle init data
*join_state = ClientJoinState::Joined;
log::info!("Joined the server!");
return;
} }
} }
pub fn update_networking() -> Workload { pub fn update_networking() -> Workload {
( (
create_client.run_if_missing_unique::<UdpClient>(), connect_client.run_if_missing_unique::<UdpClient>(),
connect_client.run_if(should_connect), poll_client,
update_client,
insert_client_events,
( (
set_client_join_state_to_connected, set_client_join_state_to_connected,
say_hello, say_hello,
@ -119,12 +126,19 @@ pub fn disconnect_on_exit(
mut client: UniqueViewMut<UdpClient>, mut client: UniqueViewMut<UdpClient>,
) { ) {
if let Some(ControlFlow::ExitWithCode(_)) = control_flow.0 { if let Some(ControlFlow::ExitWithCode(_)) = control_flow.0 {
client.0.set_nonblocking(false).expect("Failed to switch socket to blocking mode"); if client.0.is_active() {
if let Err(error) = client.0.disconnect() { client.0.flush();
log::error!("failed to disconnect: {}", error); client.0.disconnect();
} else { while client.0.is_active() { client.0.step().for_each(|_|()); }
log::info!("Client disconnected"); log::info!("Client disconnected");
} else {
log::info!("Client inactive")
} }
// if let Err(error) = client.0. {
// log::error!("failed to disconnect: {}", error);
// } else {
// log::info!("Client disconnected");
// }
} }
} }
@ -133,7 +147,7 @@ pub fn disconnect_on_exit(
fn if_just_connected( fn if_just_connected(
network_events: View<NetworkEvent>, network_events: View<NetworkEvent>,
) -> bool { ) -> bool {
network_events.iter().any(|event| matches!(&event.0, ClientEvent::Connected(_))) network_events.iter().any(|event| matches!(&event.0, ClientEvent::Connect))
} }
fn is_join_state<const STATE: u8>( fn is_join_state<const STATE: u8>(

8
kubi/src/player.rs
View file

@ -1,4 +1,4 @@
use shipyard::{Component, AllStoragesViewMut}; use shipyard::{Component, AllStoragesViewMut, View, IntoIter};
use crate::{ use crate::{
transform::Transform, transform::Transform,
camera::Camera, camera::Camera,
@ -6,9 +6,7 @@ use crate::{
world::raycast::LookingAtBlock, world::raycast::LookingAtBlock,
block_placement::PlayerHolding, block_placement::PlayerHolding,
}; };
pub use kubi_shared::player::Player;
#[derive(Component)]
pub struct Player;
#[derive(Component)] #[derive(Component)]
pub struct MainPlayer; pub struct MainPlayer;
@ -17,7 +15,7 @@ pub fn spawn_player (
mut storages: AllStoragesViewMut mut storages: AllStoragesViewMut
) { ) {
log::info!("spawning player"); log::info!("spawning player");
storages.add_entity(( let entity_id = storages.add_entity((
Player, Player,
MainPlayer, MainPlayer,
Transform::default(), Transform::default(),

27
kubi/src/world/loading.rs
View file

@ -2,6 +2,8 @@ use glam::{IVec3, ivec3};
use glium::{VertexBuffer, IndexBuffer, index::PrimitiveType}; use glium::{VertexBuffer, IndexBuffer, index::PrimitiveType};
use kubi_shared::networking::messages::ClientToServerMessage; use kubi_shared::networking::messages::ClientToServerMessage;
use shipyard::{View, UniqueView, UniqueViewMut, IntoIter, Workload, IntoWorkload, NonSendSync, track}; use shipyard::{View, UniqueView, UniqueViewMut, IntoIter, Workload, IntoWorkload, NonSendSync, track};
use kubi_shared::queue::QueuedBlock;
use uflow::SendMode;
use crate::{ use crate::{
player::MainPlayer, player::MainPlayer,
transform::Transform, transform::Transform,
@ -14,7 +16,7 @@ use super::{
ChunkStorage, ChunkMeshStorage, ChunkStorage, ChunkMeshStorage,
chunk::{Chunk, DesiredChunkState, CHUNK_SIZE, ChunkMesh, CurrentChunkState, ChunkData}, chunk::{Chunk, DesiredChunkState, CHUNK_SIZE, ChunkMesh, CurrentChunkState, ChunkData},
tasks::{ChunkTaskManager, ChunkTaskResponse, ChunkTask}, tasks::{ChunkTaskManager, ChunkTaskResponse, ChunkTask},
queue::{BlockUpdateQueue, BlockUpdateEvent}, queue::BlockUpdateQueue
}; };
const MAX_CHUNK_OPS_INGAME: usize = 6; const MAX_CHUNK_OPS_INGAME: usize = 6;
@ -120,7 +122,7 @@ fn unload_downgrade_chunks(
fn start_required_tasks( fn start_required_tasks(
task_manager: UniqueView<ChunkTaskManager>, task_manager: UniqueView<ChunkTaskManager>,
udp_client: Option<UniqueView<UdpClient>>, mut udp_client: Option<UniqueViewMut<UdpClient>>,
mut world: UniqueViewMut<ChunkStorage>, mut world: UniqueViewMut<ChunkStorage>,
) { ) {
if !world.is_modified() { if !world.is_modified() {
@ -133,10 +135,14 @@ fn start_required_tasks(
match chunk.desired_state { match chunk.desired_state {
DesiredChunkState::Loaded | DesiredChunkState::Rendered if chunk.current_state == CurrentChunkState::Nothing => { DesiredChunkState::Loaded | DesiredChunkState::Rendered if chunk.current_state == CurrentChunkState::Nothing => {
//start load task //start load task
if let Some(client) = &udp_client { if let Some(client) = &mut udp_client {
client.0.send_message(ClientToServerMessage::ChunkSubRequest { client.0.send(
chunk: position.to_array() postcard::to_allocvec(&ClientToServerMessage::ChunkSubRequest {
}).unwrap(); chunk: position.to_array()
}).unwrap().into_boxed_slice(),
0,
SendMode::Reliable
);
} else { } else {
task_manager.spawn_task(ChunkTask::LoadChunk { task_manager.spawn_task(ChunkTask::LoadChunk {
seed: 0xbeef_face_dead_cafe, seed: 0xbeef_face_dead_cafe,
@ -208,12 +214,9 @@ fn process_completed_tasks(
chunk.current_state = CurrentChunkState::Loaded; chunk.current_state = CurrentChunkState::Loaded;
//push queued blocks //push queued blocks
for event in queued { //TODO use extend
queue.push(BlockUpdateEvent { for item in queued {
position: event.position, queue.push(item);
value: event.block_type,
soft: true,
});
} }
//increase ops counter //increase ops counter

2
kubi/src/world/mesh/builder.rs
View file

@ -126,7 +126,7 @@ impl MeshBuilder {
let face_type = face_type as usize; let face_type = face_type as usize;
let vertices = CROSS_FACES[face_type]; let vertices = CROSS_FACES[face_type];
let normal_front = CROSS_FACE_NORMALS[face_type].to_array(); let normal_front = CROSS_FACE_NORMALS[face_type].to_array();
let normal_back = CROSS_FACE_NORMALS[face_type].to_array(); let normal_back = CROSS_FACE_NORMALS_BACK[face_type].to_array();
self.vertex_buffer.reserve(8); self.vertex_buffer.reserve(8);
for i in 0..4 { //push front vertices for i in 0..4 { //push front vertices
self.vertex_buffer.push(ChunkVertex { self.vertex_buffer.push(ChunkVertex {

17
kubi/src/world/queue.rs
View file

@ -1,26 +1,17 @@
use glam::{IVec3, ivec3}; use glam::{IVec3, ivec3};
use kubi_shared::{block::Block, chunk::CHUNK_SIZE}; use kubi_shared::{block::Block, chunk::CHUNK_SIZE, queue::QueuedBlock};
use shipyard::{UniqueViewMut, Unique}; use shipyard::{UniqueViewMut, Unique};
use super::ChunkStorage; use super::ChunkStorage;
#[derive(Clone, Copy, Debug)]
pub struct BlockUpdateEvent {
pub position: IVec3,
pub value: Block,
//Only replace air blocks
pub soft: bool,
}
#[derive(Unique, Default, Clone)] #[derive(Unique, Default, Clone)]
pub struct BlockUpdateQueue { pub struct BlockUpdateQueue {
queue: Vec<BlockUpdateEvent> queue: Vec<QueuedBlock>
} }
impl BlockUpdateQueue { impl BlockUpdateQueue {
pub fn new() -> Self { pub fn new() -> Self {
Self::default() Self::default()
} }
pub fn push(&mut self, event: BlockUpdateEvent) { pub fn push(&mut self, event: QueuedBlock) {
self.queue.push(event) self.queue.push(event)
} }
} }
@ -35,7 +26,7 @@ pub fn apply_queued_blocks(
if event.soft && *block != Block::Air { if event.soft && *block != Block::Air {
return false return false
} }
*block = event.value; *block = event.block_type;
//mark chunk as dirty //mark chunk as dirty
let (chunk_pos, block_pos) = ChunkStorage::to_chunk_coords(event.position); let (chunk_pos, block_pos) = ChunkStorage::to_chunk_coords(event.position);
let chunk = world.chunks.get_mut(&chunk_pos).expect("This error should never happen, if it does then something is super fucked up and the whole project needs to be burnt down."); let chunk = world.chunks.get_mut(&chunk_pos).expect("This error should never happen, if it does then something is super fucked up and the whole project needs to be burnt down.");

30
kubi/src/world/tasks.rs
View file

@ -1,11 +1,12 @@
use flume::{Sender, Receiver}; use flume::{Sender, Receiver};
use glam::IVec3; use glam::IVec3;
use kubi_shared::{ use kubi_shared::{
networking::messages::ServerToClientMessage, networking::messages::{S_CHUNK_RESPONSE, ServerToClientMessage},
worldgen::QueuedBlock queue::QueuedBlock
}; };
use shipyard::{Unique, UniqueView, View, IntoIter}; use shipyard::{Unique, UniqueView, View, IntoIter};
use rayon::{ThreadPool, ThreadPoolBuilder}; use rayon::{ThreadPool, ThreadPoolBuilder};
use uflow::client::Event as ClientEvent;
use super::{ use super::{
chunk::BlockData, chunk::BlockData,
mesh::{generate_mesh, data::MeshGenData}, mesh::{generate_mesh, data::MeshGenData},
@ -15,7 +16,6 @@ use crate::{
rendering::world::ChunkVertex, rendering::world::ChunkVertex,
networking::NetworkEvent, networking::NetworkEvent,
}; };
use kubi_udp::client::ClientEvent;
pub enum ChunkTask { pub enum ChunkTask {
LoadChunk { LoadChunk {
@ -83,16 +83,24 @@ pub fn inject_network_responses_into_manager_queue(
events: View<NetworkEvent> events: View<NetworkEvent>
) { ) {
for event in events.iter() { for event in events.iter() {
if let ClientEvent::MessageReceived(ServerToClientMessage::ChunkResponse { chunk, data, queued }) = &event.0 { if event.is_message_of_type::<S_CHUNK_RESPONSE>() {
let position = IVec3::from_array(*chunk); let NetworkEvent(ClientEvent::Receive(data)) = &event else { unreachable!() };
let ServerToClientMessage::ChunkResponse {
chunk, data, queued
} = postcard::from_bytes(data).expect("Chunk decode failed") else { unreachable!() };
manager.add_sussy_response(ChunkTaskResponse::LoadedChunk { manager.add_sussy_response(ChunkTaskResponse::LoadedChunk {
position, position: IVec3::from_array(chunk),
chunk_data: data.clone(), chunk_data: data,
queued: queued.iter().map(|&(position, block_type)| QueuedBlock { queued
position: IVec3::from_array(position),
block_type
}).collect()
}); });
} }
// if let ClientEvent::MessageReceived(ServerToClientMessage::ChunkResponse { &chunk, data, queued }) = &event.0 {
// let position = IVec3::from_array(chunk);
// manager.add_sussy_response(ChunkTaskResponse::LoadedChunk {
// position,
// chunk_data: data.clone(),
// queued
// });
// }
} }
} }