From a72a6d78a5b2d05fdf970477b83f737867b96806 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 15 Jul 2024 17:49:36 +0200 Subject: add notice to light-client --- light-client/src/atlas.rs | 17 +++++++++++++++++ light-client/src/game.rs | 17 +++++++++++++++++ light-client/src/main.rs | 6 +++--- light-client/src/network.rs | 17 +++++++++++++++++ 4 files changed, 54 insertions(+), 3 deletions(-) (limited to 'light-client/src') diff --git a/light-client/src/atlas.rs b/light-client/src/atlas.rs index 94114176..b1d2c5e0 100644 --- a/light-client/src/atlas.rs +++ b/light-client/src/atlas.rs @@ -1,3 +1,20 @@ +/* + Hurry Curry! - a game about cooking + Copyright 2024 metamuffin + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, version 3 of the License only. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +*/ use hurrycurry_protocol::{ glam::{IVec2, Vec2}, ClientGamedata, ItemIndex, TileIndex, diff --git a/light-client/src/game.rs b/light-client/src/game.rs index e432c517..c9b20e56 100644 --- a/light-client/src/game.rs +++ b/light-client/src/game.rs @@ -1,3 +1,20 @@ +/* + Hurry Curry! - a game about cooking + Copyright 2024 metamuffin + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, version 3 of the License only. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +*/ use crate::atlas::SpriteRenderer; use hurrycurry_protocol::{glam::IVec2, PacketC, TileIndex}; use std::collections::HashMap; diff --git a/light-client/src/main.rs b/light-client/src/main.rs index 2145e9b6..fa1a38ba 100644 --- a/light-client/src/main.rs +++ b/light-client/src/main.rs @@ -1,6 +1,3 @@ -use atlas::SpriteRenderer; -use game::Game; -use hurrycurry_protocol::PacketC; /* Hurry Curry! - a game about cooking Copyright 2024 metamuffin @@ -18,6 +15,9 @@ use hurrycurry_protocol::PacketC; along with this program. If not, see . */ +use atlas::SpriteRenderer; +use game::Game; +use hurrycurry_protocol::PacketC; use network::Network; use sdl2::{event::Event, keyboard::Keycode, pixels::Color}; diff --git a/light-client/src/network.rs b/light-client/src/network.rs index e3cd1eb5..f2c42518 100644 --- a/light-client/src/network.rs +++ b/light-client/src/network.rs @@ -1,3 +1,20 @@ +/* + Hurry Curry! - a game about cooking + Copyright 2024 metamuffin + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, version 3 of the License only. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +*/ use anyhow::Result; use hurrycurry_protocol::{PacketC, PacketS, BINCODE_CONFIG}; use log::warn; -- cgit v1.2.3-70-g09d2 From b66e12ccd8823ffeaff23e2b4e5426cb15f59c99 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 15 Jul 2024 17:52:33 +0200 Subject: set websocket nonblocking --- light-client/src/network.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'light-client/src') diff --git a/light-client/src/network.rs b/light-client/src/network.rs index f2c42518..3eb3f50a 100644 --- a/light-client/src/network.rs +++ b/light-client/src/network.rs @@ -59,9 +59,14 @@ impl Network { }); let stream = TcpStream::connect((host, port))?; stream.set_nodelay(true).unwrap(); - // stream.set_nonblocking(true).unwrap(); - let (sock, _) = client_tls_with_config(request, stream, None, None).unwrap(); + let (mut sock, _) = client_tls_with_config(request, stream, None, None).unwrap(); + + match sock.get_mut() { + MaybeTlsStream::Plain(s) => s.set_nonblocking(true).unwrap(), + MaybeTlsStream::Rustls(s) => s.sock.set_nonblocking(true).unwrap(), + _ => todo!(), + }; Ok(Self { sock, -- cgit v1.2.3-70-g09d2 From 1aa4f358bc22bda63c062683fd0749541e9fad61 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 15 Jul 2024 18:20:40 +0200 Subject: fix rendering again --- light-client/src/atlas.rs | 2 +- light-client/src/network.rs | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'light-client/src') diff --git a/light-client/src/atlas.rs b/light-client/src/atlas.rs index b1d2c5e0..4a39b649 100644 --- a/light-client/src/atlas.rs +++ b/light-client/src/atlas.rs @@ -97,7 +97,7 @@ impl<'a> SpriteRenderer<'a> { tiles: vec![], sprites: vec![], view_offset: Vec2::ZERO, - view_scale: Vec2::new(1., 0.75) * 2., + view_scale: Vec2::splat(4.), } } diff --git a/light-client/src/network.rs b/light-client/src/network.rs index 3eb3f50a..997a3344 100644 --- a/light-client/src/network.rs +++ b/light-client/src/network.rs @@ -36,27 +36,26 @@ pub struct Network { impl Network { pub fn connect(addr: &str) -> Result { let (parts, _) = addr.into_client_request().unwrap().into_parts(); - let uri = parts.uri.clone(); - let mut builder = Request::builder() - .uri(uri.clone()) + .uri(parts.uri.clone().clone()) .method(parts.method.clone()) .version(parts.version); *builder.headers_mut().unwrap() = parts.headers.clone(); let request = builder.body(()).unwrap(); - let uri = request.uri(); - let mode = uri_mode(uri)?; let host = request.uri().host().unwrap(); let host = if host.starts_with('[') { &host[1..host.len() - 1] } else { host }; - let port = uri.port_u16().unwrap_or(match mode { - Mode::Plain => 27032, - Mode::Tls => 443, - }); + let port = request + .uri() + .port_u16() + .unwrap_or(match uri_mode(request.uri())? { + Mode::Plain => 27032, + Mode::Tls => 443, + }); let stream = TcpStream::connect((host, port))?; stream.set_nodelay(true).unwrap(); -- cgit v1.2.3-70-g09d2