summaryrefslogtreecommitdiff
path: root/client/src
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2025-01-08 00:02:42 +0100
committermetamuffin <metamuffin@disroot.org>2025-01-08 00:02:42 +0100
commitffca93acce5da9fa8cd1eef329b4399cfc6eace6 (patch)
tree065b46420ebd4fe622cb6ee869749973a26054d2 /client/src
parent7e06efee8b33fb8619aa5e50afc8728fd330f39d (diff)
downloadweareserver-ffca93acce5da9fa8cd1eef329b4399cfc6eace6.tar
weareserver-ffca93acce5da9fa8cd1eef329b4399cfc6eace6.tar.bz2
weareserver-ffca93acce5da9fa8cd1eef329b4399cfc6eace6.tar.zst
fix client net
Diffstat (limited to 'client/src')
-rw-r--r--client/src/download.rs3
-rw-r--r--client/src/main.rs4
-rw-r--r--client/src/network.rs2
3 files changed, 5 insertions, 4 deletions
diff --git a/client/src/download.rs b/client/src/download.rs
index e65ef25..24dbe15 100644
--- a/client/src/download.rs
+++ b/client/src/download.rs
@@ -19,7 +19,8 @@ use anyhow::Result;
use log::debug;
use std::{collections::HashSet, marker::PhantomData};
use weareshared::{
- packets::{Packet, ReadWrite, Resource},
+ helper::ReadWrite,
+ packets::{Packet, Resource},
store::{ResourceStore, sha256},
};
diff --git a/client/src/main.rs b/client/src/main.rs
index 8cf6658..40c6e3e 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -15,6 +15,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#![feature(iter_array_chunks)]
+pub mod camera;
pub mod download;
pub mod network;
pub mod renderer;
@@ -22,7 +23,6 @@ pub mod scene_prepare;
pub mod scene_render;
pub mod state;
pub mod window;
-pub mod camera;
// pub mod ui;
use anyhow::Result;
@@ -33,7 +33,7 @@ use std::{
io::Write,
net::{SocketAddr, TcpStream},
};
-use weareshared::packets::{Packet, ReadWrite};
+use weareshared::{helper::ReadWrite, packets::Packet};
use window::WindowState;
use winit::event_loop::EventLoop;
diff --git a/client/src/network.rs b/client/src/network.rs
index e754c41..57b637a 100644
--- a/client/src/network.rs
+++ b/client/src/network.rs
@@ -23,7 +23,7 @@ use std::{
use anyhow::Result;
use log::{debug, info, warn};
-use weareshared::packets::{Packet, ReadWrite};
+use weareshared::{helper::ReadWrite, packets::Packet};
pub struct Network {
pub packet_recv: Receiver<Packet>,