From fa5f2a98eb841ad621d92b09e2436fcc35ffe80e Mon Sep 17 00:00:00 2001
From: OleSTEEP <krinkinoleg@gmail.com>
Date: Sat, 2 Mar 2024 17:59:38 +0300
Subject: [PATCH] Fix FPS Button

---
 www.eng/index.html                |  2 +-
 www.eng/js/porting/jscontrols.css |  8 +++++++
 www.eng/js/porting/jscontrols.js  | 35 ++++++++++++-------------------
 www.rus/index.html                |  2 +-
 www.rus/js/porting/jscontrols.css |  8 +++++++
 www.rus/js/porting/jscontrols.js  | 35 ++++++++++++-------------------
 6 files changed, 44 insertions(+), 46 deletions(-)
 create mode 100644 www.eng/js/porting/jscontrols.css
 create mode 100644 www.rus/js/porting/jscontrols.css

diff --git a/www.eng/index.html b/www.eng/index.html
index 6e48dc2..f90ab79 100644
--- a/www.eng/index.html
+++ b/www.eng/index.html
@@ -9,7 +9,7 @@
     <link rel="apple-touch-icon" href="icon/icon.png">
     <link rel="stylesheet" type="text/css" href="fonts/gamefont.css">
     <meta name="viewport" content="user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, width=device-width, viewport-fit=cover">
-    
+    <link rel="stylesheet" type="text/css" href="js/porting/css/controls.css">
     <title>OMORI</title>
 </head>
 
diff --git a/www.eng/js/porting/jscontrols.css b/www.eng/js/porting/jscontrols.css
new file mode 100644
index 0000000..0fe4404
--- /dev/null
+++ b/www.eng/js/porting/jscontrols.css
@@ -0,0 +1,8 @@
+.fps-button {
+    position: absolute;
+    left: 5px;
+    top: 5px;
+    width: 90px;
+    height: 40px;
+    z-index: 1489;
+}
\ No newline at end of file
diff --git a/www.eng/js/porting/jscontrols.js b/www.eng/js/porting/jscontrols.js
index b57417c..a64c6eb 100644
--- a/www.eng/js/porting/jscontrols.js
+++ b/www.eng/js/porting/jscontrols.js
@@ -2,18 +2,23 @@
 
 function create_fps_button() {
     // Remove in release 
-    const keys = [{ key: 'F2', keyCode: 113 }];
-
     const FPSBtn = document.createElement("div");
     FPSBtn.className = "fps-button";
     FPSBtn.id = "buttonF2";
-    document.body.appendChild(FPSBtn); 
+    document.body.appendChild(FPSBtn);
 
-    for (const key of keys) {
-        const elementId = key.id === undefined ? `button${key.key}` : key.id;
-        console.log(`Setting up the ${elementId} key...`);
-        setupKey(elementId, key.key, key.keyCode);
-    }
+    console.log(`Setting up the FPS key...`);
+
+    FPSBtn.addEventListener("pointerdown", (event) => {
+        console.log(`Pointer down for F2`); //Remove in release
+        event.stopImmediatePropagation();
+        event.preventDefault();
+        sendEvent(false, 113);
+    });
+
+    FPSBtn.addEventListener("pointerup", () => {
+        sendEvent(true, 113);
+    });
 }
 
 function sendEvent(isUp, keycode) {
@@ -21,20 +26,6 @@ function sendEvent(isUp, keycode) {
     document.dispatchEvent(new KeyboardEvent(isUp ? 'keyup' : 'keydown', { 'key': '', keyCode: keycode }))
 }
 
-function setupKey(id, key, keyCode) {
-    const element = document.getElementById(id);
-    element.addEventListener("pointerdown", (event) => {
-        console.log(`Pointer down for ${id}`); //Remove in release
-        event.stopImmediatePropagation();
-        event.preventDefault();
-        sendEvent(false, keyCode);
-    });
-
-    element.addEventListener("pointerup", () => {
-        sendEvent(true, keyCode);
-    });
-}
-
 window.addEventListener('load', () => {
     create_fps_button(); // Remove in release 
 });
\ No newline at end of file
diff --git a/www.rus/index.html b/www.rus/index.html
index 6e48dc2..f90ab79 100644
--- a/www.rus/index.html
+++ b/www.rus/index.html
@@ -9,7 +9,7 @@
     <link rel="apple-touch-icon" href="icon/icon.png">
     <link rel="stylesheet" type="text/css" href="fonts/gamefont.css">
     <meta name="viewport" content="user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, width=device-width, viewport-fit=cover">
-    
+    <link rel="stylesheet" type="text/css" href="js/porting/css/controls.css">
     <title>OMORI</title>
 </head>
 
diff --git a/www.rus/js/porting/jscontrols.css b/www.rus/js/porting/jscontrols.css
new file mode 100644
index 0000000..0fe4404
--- /dev/null
+++ b/www.rus/js/porting/jscontrols.css
@@ -0,0 +1,8 @@
+.fps-button {
+    position: absolute;
+    left: 5px;
+    top: 5px;
+    width: 90px;
+    height: 40px;
+    z-index: 1489;
+}
\ No newline at end of file
diff --git a/www.rus/js/porting/jscontrols.js b/www.rus/js/porting/jscontrols.js
index b57417c..a64c6eb 100644
--- a/www.rus/js/porting/jscontrols.js
+++ b/www.rus/js/porting/jscontrols.js
@@ -2,18 +2,23 @@
 
 function create_fps_button() {
     // Remove in release 
-    const keys = [{ key: 'F2', keyCode: 113 }];
-
     const FPSBtn = document.createElement("div");
     FPSBtn.className = "fps-button";
     FPSBtn.id = "buttonF2";
-    document.body.appendChild(FPSBtn); 
+    document.body.appendChild(FPSBtn);
 
-    for (const key of keys) {
-        const elementId = key.id === undefined ? `button${key.key}` : key.id;
-        console.log(`Setting up the ${elementId} key...`);
-        setupKey(elementId, key.key, key.keyCode);
-    }
+    console.log(`Setting up the FPS key...`);
+
+    FPSBtn.addEventListener("pointerdown", (event) => {
+        console.log(`Pointer down for F2`); //Remove in release
+        event.stopImmediatePropagation();
+        event.preventDefault();
+        sendEvent(false, 113);
+    });
+
+    FPSBtn.addEventListener("pointerup", () => {
+        sendEvent(true, 113);
+    });
 }
 
 function sendEvent(isUp, keycode) {
@@ -21,20 +26,6 @@ function sendEvent(isUp, keycode) {
     document.dispatchEvent(new KeyboardEvent(isUp ? 'keyup' : 'keydown', { 'key': '', keyCode: keycode }))
 }
 
-function setupKey(id, key, keyCode) {
-    const element = document.getElementById(id);
-    element.addEventListener("pointerdown", (event) => {
-        console.log(`Pointer down for ${id}`); //Remove in release
-        event.stopImmediatePropagation();
-        event.preventDefault();
-        sendEvent(false, keyCode);
-    });
-
-    element.addEventListener("pointerup", () => {
-        sendEvent(true, keyCode);
-    });
-}
-
 window.addEventListener('load', () => {
     create_fps_button(); // Remove in release 
 });
\ No newline at end of file