~starkingdoms/starkingdoms

53e0dde84108e3b1e3b09c8a2efd1ed05a2dc82d — ghostlyzsh 2 years ago 7498500 + c233a7c
Merge branch 'master' of https://gitlab.com/starkingdoms.tk/starkingdoms.tk
2 files changed, 6 insertions(+), 0 deletions(-)

M client/src/rendering/renderer.rs
M web/play.html
M client/src/rendering/renderer.rs => client/src/rendering/renderer.rs +2 -0
@@ 3,6 3,7 @@ use async_trait::async_trait;
use web_sys::{CanvasRenderingContext2d, HtmlCanvasElement};
use crate::rendering::Renderer;
use wasm_bindgen::JsCast;
use crate::CLIENT;

#[derive(Debug)]
pub struct WebRenderer {


@@ 25,6 26,7 @@ impl Renderer for WebRenderer {
        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()?;
        Ok(())
    }
}
\ No newline at end of file

M web/play.html => web/play.html +4 -0
@@ 29,6 29,10 @@
            init().then(() => {
                const urlSearchParams = new URLSearchParams(window.location.search);

                if (!(urlSearchParams.has("server") || urlSearchParams.has("username") || urlSearchParams.has("textures"))) {
                    window.location.href = "/index.html";
                }

                rust_init(urlSearchParams.get("server"), urlSearchParams.get("username"), urlSearchParams.get("textures")).then(() => {
                    document.getElementById("chat-submit").addEventListener("click", e => {
                        send_chat(document.getElementById("chat-value").value);