~starkingdoms/starkingdoms

0bef1cbe75cbc99cb4004686a4ef8e483ea265ae — core 2 years ago d86ccb2
cargo-fix
3 files changed, 6 insertions(+), 6 deletions(-)

M client/src/rendering/renderer.rs
M server/src/manager.rs
M server/src/timer.rs
M client/src/rendering/renderer.rs => client/src/rendering/renderer.rs +3 -3
@@ 18,15 18,15 @@ impl Renderer for WebRenderer {
        })
    }

    async fn render_frame(&self, time_delta_ms: f64) -> Result<(), Box<dyn Error>> {
    async fn render_frame(&self, _time_delta_ms: f64) -> Result<(), Box<dyn Error>> {
        // TODO
        // time_delta_ms is the delta, in ms, from when the last render_frame was called by the browser
        let window = web_sys::window().ok_or("window needs to exist")?;
        let document = window.document().ok_or("window.document needs to exist")?;
        let canvas_element = document.get_element_by_id(&self.canvas_element_id).ok_or("canvas element does not exist")?;
        let typed_canvas_element: HtmlCanvasElement = canvas_element.dyn_into::<web_sys::HtmlCanvasElement>().map_err(|_| ()).unwrap();
        let context = typed_canvas_element.get_context("2d").unwrap().unwrap().dyn_into::<CanvasRenderingContext2d>().unwrap();
        let client = CLIENT.read()?;
        let _context = typed_canvas_element.get_context("2d").unwrap().unwrap().dyn_into::<CanvasRenderingContext2d>().unwrap();
        let _client = CLIENT.read()?;
        Ok(())
    }
}
\ No newline at end of file

M server/src/manager.rs => server/src/manager.rs +2 -2
@@ 3,8 3,8 @@ use std::collections::HashMap;
use std::net::SocketAddr;
use std::sync::Arc;

use rapier2d::na::{Vector3, Vector2};
use rapier2d::prelude::{IntegrationParameters, PhysicsPipeline, IslandManager, BroadPhase, NarrowPhase, ImpulseJointSet, MultibodyJointSet, CCDSolver, EventHandler, PhysicsHooks, RigidBodySet, ColliderSet, RigidBodyHandle};
use rapier2d::na::{Vector2};
use rapier2d::prelude::{IntegrationParameters, PhysicsPipeline, IslandManager, BroadPhase, NarrowPhase, ImpulseJointSet, MultibodyJointSet, CCDSolver, RigidBodySet, ColliderSet, RigidBodyHandle};
use tokio::sync::mpsc::Sender;
use tokio::sync::RwLock;


M server/src/timer.rs => server/src/timer.rs +1 -1
@@ 4,7 4,7 @@ use log::{error};

use rapier2d::prelude::{PhysicsPipeline};
use tokio::{time::sleep, sync::RwLock};
use crate::{manager::{ClientHandlerMessage, ClientManager, PhysicsData}, SCALE, send};
use crate::{manager::{ClientHandlerMessage, ClientManager, PhysicsData}, SCALE};

pub async fn timer_main(mgr: ClientManager, physics_data: Arc<RwLock<PhysicsData>>) {
    let mut pipeline = PhysicsPipeline::new();