From 7fd59e35344869a769c89f4fc3376c9d4fd6cb4f Mon Sep 17 00:00:00 2001 From: ENGO150 Date: Sun, 28 May 2023 18:08:24 +0200 Subject: [PATCH] added 'few' points --- res/script.js | 71 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 62 insertions(+), 9 deletions(-) diff --git a/res/script.js b/res/script.js index c8fd624..ea88894 100644 --- a/res/script.js +++ b/res/script.js @@ -1,29 +1,71 @@ const points = -[ - [1240, 625, "1;2", 9, 16] +[//2 - 1; 2 + [87.6, 78.4, "1;2", 9, 16], + [86.2, 69.9, "27"], + [86.5, 68.55, "26"], + [82.9, 68.9, "4", 16, 9], + [73, 69.8, "5;6", 16, 9], + [74.9, 73.9, "7", 16, 9], + [71.4, 76.3, "8", 16, 9], + [74.81, 79.88, "9", 16, 9], + [74.37, 81.66, "10", 16, 9], + [63.56, 78.55, "11;34", 16, 9], + [44.81, 68.33, "12;37"], + [70.87, 81.22, "13;18"], + [24.62, 72.88, "14"], + [74.62, 75.22, "15", 47, 102], + [78.31, 72.55, "16", 47, 102], + [82.18, 75.77, "17", 47, 102], + [71.37, 83.11, "19", 3, 4], + [38.12, 60.66, "20;51"], + [39.25, 60.11, "21", 3, 4], + [68.18, 80, "22", 3, 4], + [65, 77.55, "23;24"], + [38.12, 74.11, "25"], + [40.62, 74.44, "28"], + [26.25, 73.44, "29", 3, 4], + [10.5, 61.66, "30"], + [6.06, 63.33, "31"], + [42.12, 67.88, "32", 3, 4], + [65.5, 79.77, "33;35", 3, 4], + [62.81, 71.22, "36"], + [39.5, 64.22, "38"], + [39.37, 65.77, "39;52"], + [37.31, 62.44, "40"], + [38.81, 60.55, "41"], + [42.43, 54, "42"], + [39.68, 52.22, "43"], + [38.87, 52.44, "44;46"], + [38.43, 51, "45"], + [39, 50, "48;50"], + [8.62, 61.11, "53"], ]; -const tolerance = 3; +const tolerance_x = 0.2; +const tolerance_y = 0.3; window.onload = function() { - document.querySelector("img").onclick = (e) => + let img = document.querySelector("img"); + img.onclick = (e) => { - let x = e.pageX - e.target.offsetLeft; - let y = e.pageY - e.target.offsetTop; + let x = Math.floor((e.pageX - e.target.offsetLeft) / img.width * 10000) / 100; + let y = Math.floor((e.pageY - e.target.offsetTop) / img.height * 10000) / 100; for (let i = 0; i < points.length; i++) { if ( - ((Math.abs(x - points[i][0]) <= tolerance || -Math.abs(x - points[i][0]) >= tolerance) && - (Math.abs(y - points[i][1]) <= tolerance || -Math.abs(y - points[i][1]) >= tolerance)) + ((Math.abs(x - points[i][0]) <= tolerance_x || -Math.abs(x - points[i][0]) >= tolerance_x) && + (Math.abs(y - points[i][1]) <= tolerance_y || -Math.abs(y - points[i][1]) >= tolerance_y)) ) { move(points[i][2], points[i][3], points[i][4]); break; } } + + console.log(x, y); //TODO: REMOVE } } @@ -40,6 +82,17 @@ function move(img, x, y) } else { let imgs = img.split(";"); - open_panorama(imgs[Math.floor(Math.random() * imgs.length)], x, y); + let random_index = Math.floor(Math.random() * imgs.length); + + //EXCEPTIONS + switch (imgs[random_index]) + { + case 34: + x = 4; + y = 3; + break; + } + + open_panorama(imgs[random_index], x, y); } } \ No newline at end of file