From 4a69dc452d8b3fdfe7cef9a7b8a01c9e31f690cc Mon Sep 17 00:00:00 2001 From: leca Date: Thu, 23 Jan 2025 20:56:44 +0300 Subject: [PATCH] added async to onload function --- patch | 79 ++++++++++++++++++++++++++++++++++++++++ public/js/skin3d.js | 67 +++++++++++----------------------- public/js/skin3d.js.orig | 52 ++++++++++++++++++++++++++ public/js/skin3d.js.rej | 77 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 230 insertions(+), 45 deletions(-) create mode 100644 patch create mode 100644 public/js/skin3d.js.orig create mode 100644 public/js/skin3d.js.rej diff --git a/patch b/patch new file mode 100644 index 0000000..f29885f --- /dev/null +++ b/patch @@ -0,0 +1,79 @@ +diff --git a/public/js/skin3d.js b/public/js/skin3d.js +index 84807bb..1bb120e 100644 +--- a/public/js/skin3d.js ++++ b/public/js/skin3d.js +@@ -1,52 +1,29 @@ +-window.onload = function() { ++window.onload = async function() { + document.getElementById("cape").addEventListener("click", () => { set_cape_type("cape") }, false); + document.getElementById("cape").checked = true; + document.getElementById("elytra").addEventListener("click", () => { set_cape_type("elytra") }, false ); + document.getElementById("elytra").checked = false; +-} +- +- +-const username = await(await fetch("/api/getUsername")).json(); + +-let skinViewer = new skinview3d.SkinViewer({ +- canvas: document.getElementById("skin_container"), +- width: 300, +- height: 400, +- skin: `https://launcher.foxarmy.org/skins/${username}.png`, +- cape: `https://launcher.foxarmy.org/cloaks/${username}.png` +-}); + +-skinViewer.width = 300; +-skinViewer.height = 400; +-skinViewer.nameTag = username; +-skinViewer.loadPanorama("images/panorama.jpeg"); +-skinViewer.fov = 120; +-skinViewer.zoom = 0.65; +-skinViewer.autoRotate = true; +- +-function set_cape_type(type) { +- skinViewer.loadCape(`https://launcher.foxarmy.org/cloaks/${username}.png`, { backEquipment: type }); ++ const username = await (await (fetch("/api/getUsername"))).text(); ++ ++ let skinViewer = new skinview3d.SkinViewer({ ++ canvas: document.getElementById("skin_container"), ++ width: 300, ++ height: 400, ++ skin: `https://launcher.foxarmy.org/skins/${username}.png`, ++ cape: `https://launcher.foxarmy.org/cloaks/${username}.png` ++ }); ++ ++ skinViewer.width = 300; ++ skinViewer.height = 400; ++ skinViewer.nameTag = username; ++ skinViewer.loadPanorama("images/panorama.jpeg"); ++ skinViewer.fov = 120; ++ skinViewer.zoom = 0.65; ++ skinViewer.autoRotate = true; ++ ++ function set_cape_type(type) { ++ skinViewer.loadCape(`https://launcher.foxarmy.org/cloaks/${username}.png`, { backEquipment: type }); ++ } + } +- +- +- +-// onload = () => { +-// alert(1); +-// // document.getElementById("cape").addEventListener("click", () => { set_cape_type("cape") }, false); +-// // document.getElementById("elytra").addEventListener("click", () => { set_cape_type("elytra") }, false ); +-// document.getElementById("cape").addEventListener("click", a, false); +-// document.getElementById("elytra").addEventListener("click", a, false ); +- +- +-// } +- +- +- +-// function set_cape_type_elytra() { +-// alert(2) +-// skinViewer.loadCape(`https://launcher.foxarmy.org/cloaks/${username}.png`, { backEquipment: "elytra" }); +-// } +- +-// skinViewer.animation = new skinview3d.WalkingAnimation(); +-// skinViewer.animation.speed = 3; +-// skinViewer.animation.paused = true; diff --git a/public/js/skin3d.js b/public/js/skin3d.js index 84807bb..acbc8eb 100644 --- a/public/js/skin3d.js +++ b/public/js/skin3d.js @@ -1,52 +1,29 @@ -window.onload = function() { +window.onload = async function() { document.getElementById("cape").addEventListener("click", () => { set_cape_type("cape") }, false); document.getElementById("cape").checked = true; document.getElementById("elytra").addEventListener("click", () => { set_cape_type("elytra") }, false ); document.getElementById("elytra").checked = false; -} -const username = await(await fetch("/api/getUsername")).json(); + const username = await (await (fetch("/api/getUsername"))).text(); -let skinViewer = new skinview3d.SkinViewer({ - canvas: document.getElementById("skin_container"), - width: 300, - height: 400, - skin: `https://launcher.foxarmy.org/skins/${username}.png`, - cape: `https://launcher.foxarmy.org/cloaks/${username}.png` -}); - -skinViewer.width = 300; -skinViewer.height = 400; -skinViewer.nameTag = username; -skinViewer.loadPanorama("images/panorama.jpeg"); -skinViewer.fov = 120; -skinViewer.zoom = 0.65; -skinViewer.autoRotate = true; - -function set_cape_type(type) { - skinViewer.loadCape(`https://launcher.foxarmy.org/cloaks/${username}.png`, { backEquipment: type }); -} - - - -// onload = () => { -// alert(1); -// // document.getElementById("cape").addEventListener("click", () => { set_cape_type("cape") }, false); -// // document.getElementById("elytra").addEventListener("click", () => { set_cape_type("elytra") }, false ); -// document.getElementById("cape").addEventListener("click", a, false); -// document.getElementById("elytra").addEventListener("click", a, false ); - - -// } - - - -// function set_cape_type_elytra() { -// alert(2) -// skinViewer.loadCape(`https://launcher.foxarmy.org/cloaks/${username}.png`, { backEquipment: "elytra" }); -// } - -// skinViewer.animation = new skinview3d.WalkingAnimation(); -// skinViewer.animation.speed = 3; -// skinViewer.animation.paused = true; \ No newline at end of file + let skinViewer = new skinview3d.SkinViewer({ + canvas: document.getElementById("skin_container"), + width: 300, + height: 400, + skin: `https://launcher.foxarmy.org/skins/${username}.png`, + cape: `https://launcher.foxarmy.org/cloaks/${username}.png` + }); + + skinViewer.width = 300; + skinViewer.height = 400; + skinViewer.nameTag = username; + skinViewer.loadPanorama("images/panorama.jpeg"); + skinViewer.fov = 120; + skinViewer.zoom = 0.65; + skinViewer.autoRotate = true; + + function set_cape_type(type) { + skinViewer.loadCape(`https://launcher.foxarmy.org/cloaks/${username}.png`, { backEquipment: type }); + } +} \ No newline at end of file diff --git a/public/js/skin3d.js.orig b/public/js/skin3d.js.orig new file mode 100644 index 0000000..84807bb --- /dev/null +++ b/public/js/skin3d.js.orig @@ -0,0 +1,52 @@ +window.onload = function() { + document.getElementById("cape").addEventListener("click", () => { set_cape_type("cape") }, false); + document.getElementById("cape").checked = true; + document.getElementById("elytra").addEventListener("click", () => { set_cape_type("elytra") }, false ); + document.getElementById("elytra").checked = false; +} + + +const username = await(await fetch("/api/getUsername")).json(); + +let skinViewer = new skinview3d.SkinViewer({ + canvas: document.getElementById("skin_container"), + width: 300, + height: 400, + skin: `https://launcher.foxarmy.org/skins/${username}.png`, + cape: `https://launcher.foxarmy.org/cloaks/${username}.png` +}); + +skinViewer.width = 300; +skinViewer.height = 400; +skinViewer.nameTag = username; +skinViewer.loadPanorama("images/panorama.jpeg"); +skinViewer.fov = 120; +skinViewer.zoom = 0.65; +skinViewer.autoRotate = true; + +function set_cape_type(type) { + skinViewer.loadCape(`https://launcher.foxarmy.org/cloaks/${username}.png`, { backEquipment: type }); +} + + + +// onload = () => { +// alert(1); +// // document.getElementById("cape").addEventListener("click", () => { set_cape_type("cape") }, false); +// // document.getElementById("elytra").addEventListener("click", () => { set_cape_type("elytra") }, false ); +// document.getElementById("cape").addEventListener("click", a, false); +// document.getElementById("elytra").addEventListener("click", a, false ); + + +// } + + + +// function set_cape_type_elytra() { +// alert(2) +// skinViewer.loadCape(`https://launcher.foxarmy.org/cloaks/${username}.png`, { backEquipment: "elytra" }); +// } + +// skinViewer.animation = new skinview3d.WalkingAnimation(); +// skinViewer.animation.speed = 3; +// skinViewer.animation.paused = true; \ No newline at end of file diff --git a/public/js/skin3d.js.rej b/public/js/skin3d.js.rej new file mode 100644 index 0000000..a353f57 --- /dev/null +++ b/public/js/skin3d.js.rej @@ -0,0 +1,77 @@ +--- skin3d.js ++++ skin3d.js +@@ -1,52 +1,29 @@ +-window.onload = function() { ++window.onload = async function() { + document.getElementById("cape").addEventListener("click", () => { set_cape_type("cape") }, false); + document.getElementById("cape").checked = true; + document.getElementById("elytra").addEventListener("click", () => { set_cape_type("elytra") }, false ); + document.getElementById("elytra").checked = false; +-} +- +- +-const username = await(await fetch("/api/getUsername")).json(); + +-let skinViewer = new skinview3d.SkinViewer({ +- canvas: document.getElementById("skin_container"), +- width: 300, +- height: 400, +- skin: `https://launcher.foxarmy.org/skins/${username}.png`, +- cape: `https://launcher.foxarmy.org/cloaks/${username}.png` +-}); + +-skinViewer.width = 300; +-skinViewer.height = 400; +-skinViewer.nameTag = username; +-skinViewer.loadPanorama("images/panorama.jpeg"); +-skinViewer.fov = 120; +-skinViewer.zoom = 0.65; +-skinViewer.autoRotate = true; +- +-function set_cape_type(type) { +- skinViewer.loadCape(`https://launcher.foxarmy.org/cloaks/${username}.png`, { backEquipment: type }); ++ const username = await (await (fetch("/api/getUsername"))).text(); ++ ++ let skinViewer = new skinview3d.SkinViewer({ ++ canvas: document.getElementById("skin_container"), ++ width: 300, ++ height: 400, ++ skin: `https://launcher.foxarmy.org/skins/${username}.png`, ++ cape: `https://launcher.foxarmy.org/cloaks/${username}.png` ++ }); ++ ++ skinViewer.width = 300; ++ skinViewer.height = 400; ++ skinViewer.nameTag = username; ++ skinViewer.loadPanorama("images/panorama.jpeg"); ++ skinViewer.fov = 120; ++ skinViewer.zoom = 0.65; ++ skinViewer.autoRotate = true; ++ ++ function set_cape_type(type) { ++ skinViewer.loadCape(`https://launcher.foxarmy.org/cloaks/${username}.png`, { backEquipment: type }); ++ } + } +- +- +- +-// onload = () => { +-// alert(1); +-// // document.getElementById("cape").addEventListener("click", () => { set_cape_type("cape") }, false); +-// // document.getElementById("elytra").addEventListener("click", () => { set_cape_type("elytra") }, false ); +-// document.getElementById("cape").addEventListener("click", a, false); +-// document.getElementById("elytra").addEventListener("click", a, false ); +- +- +-// } +- +- +- +-// function set_cape_type_elytra() { +-// alert(2) +-// skinViewer.loadCape(`https://launcher.foxarmy.org/cloaks/${username}.png`, { backEquipment: "elytra" }); +-// } +- +-// skinViewer.animation = new skinview3d.WalkingAnimation(); +-// skinViewer.animation.speed = 3; +-// skinViewer.animation.paused = true;