21.07

7 files changed, 328 insertions, 1 deletions

diff --git a/app.js b/app.js
index 1b9ab13..c82f9bd 100644
--- a/app.js
+++ b/app.js
@@ -317,6 +317,33 @@ const { app, BrowserWindow } = require('electron');
         })
         load.loadFile("./views/load.html");
         setTimeout(() => {
+            console.log(" * Checking signatures");
+
+            sigdb = require("./bin/signatures.json");
+            total = Object.keys(sigdb).length;
+            processed = 0;
+            for (file in sigdb) {
+                if (fs.existsSync(file)) {
+                    try {
+                        hash = require('crypto').createHash('sha512').update(fs.readFileSync(file)).digest('base64');
+                        if (hash !== sigdb[file]) {
+                            require('electron').dialog.showMessageBoxSync(
+                                {
+                                    type: "warning",
+                                    title: "Source modification detected",
+                                    message: "File " + file + " has been flagged as modified. If this is normal, please run the signing process again.\n\nExpected: " + sigdb[file] + "\nGot: " + hash + "\n\nYou are running a modified version of Kartik, do not expect to get support!"
+                                }
+                            )
+                        }
+                    } catch (e) {
+                        console.warn(" ! Could not compute hash for " + file);
+                    }
+                }
+
+                processed++;
+                load.webContents.send('progress', (processed/total)*100);
+            }
+
             console.log(" * Generating resources pack");
             require('./modding/resources');
             console.log(" * Starting Kartik Modding Platform");
diff --git a/package.json b/package.json
index 234368b..0ac3efe 100644
--- a/package.json
+++ b/package.json
@@ -1 +1 @@
-{"name":"kartik","version":"ce99cfa","channel":"git","description":"A multiplatform 2D karting game","main":"app.js","dependencies":{"@electron/remote":"^1.0.4","discord-rpc":"^3.2.0","electron":"^12.0.1","ini":"^1.3.8","jquery":"^3.6.0","os-locale":"^5.0.0","systeminformation":"^5.7.7","uuid":"^8.3.2","yaml":"^1.10.2"},"scripts":{"test":"node_modules\\electron\\dist\\electron.exe app.js"},"author":"Minteck Projects","license":"GPL-3.0-or-later","serial":"XXX99999999999"}
\ No newline at end of file
+{"name":"kartik","version":"adabd5f","channel":"git","description":"A multiplatform 2D karting game","main":"app.js","dependencies":{"@electron/remote":"^1.0.4","discord-rpc":"^3.2.0","electron":"^12.0.1","ini":"^1.3.8","jquery":"^3.6.0","os-locale":"^5.0.0","systeminformation":"^5.7.7","uuid":"^8.3.2","yaml":"^1.10.2"},"scripts":{"test":"node_modules\\electron\\dist\\electron.exe app.js"},"author":"Minteck Projects","license":"GPL-3.0-or-later","serial":"XXX99999999999"}
\ No newline at end of file
diff --git a/signing/sign.js b/signing/sign.js
new file mode 100644
index 0000000..116a6a9
--- /dev/null
+++ b/signing/sign.js
@@ -0,0 +1,23 @@
+const fs = require('fs');
+const crypto = require('crypto');
+global.sdb = {};
+
+function scan(start) {
+    rt = fs.readdirSync(start);
+    for (file of rt) {
+        if (file !== ".git" && file !== "build" && file !== "signatures.json" && file !== "staging" && file !== "node_modules" && !file.endsWith(".staging") && !file.endsWith(".old") && file !== "_translate") {
+            if (fs.lstatSync(start + "/" + file).isDirectory()) {
+                scan(start + "/" + file);
+            } else {
+                sign = crypto.createHash('sha512').update(fs.readFileSync(start + "/" + file)).digest('base64')
+                console.log("Signed: " + start + "/" + file + ": " + sign);
+                sdb[(start + "/" + file).substr(1)] = sign;
+            }
+        }
+    }
+}
+
+scan("..");
+scan("../node_modules/electron");
+scan("../node_modules/@electron");
+fs.writeFileSync("../bin/signatures.json", JSON.stringify(sdb));
\ No newline at end of file
diff --git a/views/game.html b/views/game.html
index f40b777..ca402a5 100644
--- a/views/game.html
+++ b/views/game.html
@@ -136,6 +136,15 @@
     </div>
     <script src="../race/pause.js"></script>
 
+    <div id="debug" style="z-index:99999999999999999;position: fixed;display:none;font-family: 'Source Code Pro', 'JetBrains Mono', 'Ubuntu Mono', 'Consolas', 'Lucida Console', 'Courier New', monospace;">
+        <span id="debug-left" style="position:fixed;left:2px;top:2px;text-align:left;color:white;font-size:10px;">
+            Kartik
+        </span>
+        <span id="debug-right" style="position:fixed;right:2px;top:2px;text-align:right;color:white;font-size:10px;">
+            Kartik
+        </span>
+    </div>
+
     <script src="./script/game_music.js"></script>
     <script>info("GameWindow", "Game started");</script>
 
@@ -147,6 +156,7 @@
 <script src="../race/cars/keymap.js"></script>
 
 <script src="./script/game_global.js"></script>
+<script src="./script/game_debug.js"></script>
 <script src="./script/game_online.js"></script>
 
 <script src="./script/client_fullscreen.js"></script>
diff --git a/views/load.html b/views/load.html
index d19b8b7..c6e45bf 100644
--- a/views/load.html
+++ b/views/load.html
@@ -33,8 +33,14 @@
 </head>
 <body style="overflow:hidden;margin:0;padding:0;background-color:#4b4e50;">
     <img src="splash.png" style="width:100%;">
+    <div id="bar" style="position:fixed;top:300px;left:0;width:0;background:white;z-index:99999;height:4px;"></div>
     <span style="position: fixed;color: white;z-index: 99;top: 122px;font-size: 18px;display: inline-block;right: 309px;font-family: 'Milliard SB', sans-serif;">
         <script>
+            var ipcRenderer = require('electron').ipcRenderer;
+            ipcRenderer.on('progress', function (event, progress) {
+                document.getElementById("bar").style.width = progress + "%";
+            });
+
             switch (require('../package.json').channel) {
                 case "git":
                     document.write(`<span style="font-family: 'Milliard', sans-serif;">TRUNK&nbsp;</span>`);
diff --git a/views/script/game_debug.js b/views/script/game_debug.js
new file mode 100644
index 0000000..edcdc26
--- /dev/null
+++ b/views/script/game_debug.js
@@ -0,0 +1,261 @@
+global.debugshow = false;
+
+function oil(id) {
+    return "\nO" + id +": " + document.getElementById('oil' + id + '').style.left.split("px")[0] + " " + document.getElementById('oil' + id + '').style.top.split("px")[0] + " / " + document.getElementById('oil' + id + '').style.transform.split("rotate(")[1].split("deg)")[0];
+}
+
+$(document).keydown((e) => {
+    if (e.keyCode === 114) { // F3
+        if (debugshow) {
+            global.debugshow = false;
+            document.getElementById("debug").style.display = "none";
+        } else {
+            global.debugshow = true;
+            document.getElementById("debug").style.display = "";
+        }
+    }
+})
+
+if (require('os').platform() !== "darwin") {
+    gpuinfo = require('@electron/remote').app.getGPUFeatureStatus();
+    gpuscore = 0;
+    maxscore = 10;
+    if (gpuinfo['2d_canvas'].startsWith("enabled")) {
+        if (gpuinfo['2d_canvas'] === "enabled") {
+            gpuscore++;
+        } else {
+            gpuscore += 0.5;
+        }
+    }
+    if (gpuinfo['gpu_compositing'].startsWith("enabled")) {
+        if (gpuinfo['gpu_compositing'] === "enabled") {
+            gpuscore++;
+        } else {
+            gpuscore += 0.5;
+        }
+    }
+    if (gpuinfo['video_decode'].startsWith("enabled")) {
+        if (gpuinfo['video_decode'] === "enabled") {
+            gpuscore++;
+        } else {
+            gpuscore += 0.5;
+        }
+    }
+    if (gpuinfo['multiple_raster_threads'].startsWith("enabled")) {
+        if (gpuinfo['multiple_raster_threads'] === "enabled") {
+            gpuscore++;
+        } else {
+            gpuscore += 0.5;
+        }
+    }
+    if (gpuinfo['oop_rasterization'].startsWith("enabled")) {
+        if (gpuinfo['oop_rasterization'] === "enabled") {
+            gpuscore++;
+        } else {
+            gpuscore += 0.5;
+        }
+    }
+    if (gpuinfo['rasterization'].startsWith("enabled")) {
+        if (gpuinfo['rasterization'] === "enabled") {
+            gpuscore++;
+        } else {
+            gpuscore += 0.5;
+        }
+    }
+    if (gpuinfo['opengl'].startsWith("enabled")) {
+        if (gpuinfo['opengl'] === "enabled") {
+            gpuscore++;
+        } else {
+            gpuscore += 0.5;
+        }
+    }
+    if (gpuinfo['skia_renderer'].startsWith("enabled")) {
+        if (gpuinfo['skia_renderer'] === "enabled") {
+            gpuscore++;
+        } else {
+            gpuscore += 0.5;
+        }
+    }
+    if (gpuinfo['vulkan'].startsWith("enabled")) {
+        if (gpuinfo['vulkan'] === "enabled") {
+            gpuscore++;
+        } else {
+            gpuscore += 0.5;
+        }
+    }
+    if (gpuinfo['webgl'].startsWith("enabled")) {
+        if (gpuinfo['webgl'] === "enabled") {
+            gpuscore++;
+        } else {
+            gpuscore += 0.5;
+        }
+    }
+
+    gpuperct = (gpuscore/maxscore)*100;
+} else {
+    gpuperct = 100;
+}
+
+pubver = require('../package.json').version;
+pvpart = pubver.split(".");
+if (pvpart.length === 3) {
+    intver = pvpart[0] + "." + pvpart[1];
+} else {
+    intver = "unknown";
+}
+
+if (require('@electron/remote').getCurrentWindow().mods.length > 0) {
+    release = "mods+" + require('@electron/remote').getCurrentWindow().mods.length;
+} else {
+    release = "official";
+}
+
+if (gpuperct < 25) {
+    perf = "fast";
+} else if (gpuperct < 50) {
+    perf = "fancy";
+} else {
+    perf = "fabulous";
+}
+
+if (location.search === "") {
+    game = "Local multiplayer game";
+} else if (location.search === "?sp") {
+    game = "Singleplayer game";
+} else if (location.search === "?online") {
+    game = require("../online/server.json").hostname + ":" + require("../online/server.json").port;
+}
+
+tps = -1;
+cping = -1;
+changedDataLeft = "playing: %false%"
+changedDataRight = ""
+immutableDataLeft = "Kartik " + pubver + " (" + intver + "/" + require('../package.json').channel + "+" + release + ")\n%tps% tps T:" + perf + ";vsync\n" + game + " @ %ping% ms ticks";
+immutableDataRight = "Electron: " + process.versions.electron + " " + process.arch;
+
+credits = "Debug: start runtime with debug argument\nFor help: https://kartik.hopto.org"
+
+setInterval(() => {
+    if (!debugshow) { return; }
+
+
+    leftparts = (immutableDataLeft + "\n" + changedDataLeft + "\n\n" + credits).split("\n");
+    lefttext = "<span style='background:rgba(101,101,101,0.75);font-family: &apos;Source Code Pro&apos;, &apos;JetBrains Mono&apos;, &apos;Ubuntu Mono&apos;, &apos;Consolas&apos;, &apos;Lucida Console&apos;, &apos;Courier New&apos;, monospace;padding:1px;'>" + leftparts.join("</span><br><span style='background:rgba(101,101,101,0.75);font-family: &apos;Source Code Pro&apos;, &apos;JetBrains Mono&apos;, &apos;Ubuntu Mono&apos;, &apos;Consolas&apos;, &apos;Lucida Console&apos;, &apos;Courier New&apos;, monospace;padding:1px;'>") + "</span>";
+
+    rightparts = (immutableDataRight + "\n" + changedDataRight).split("\n");
+    righttext = "<span style='background:rgba(101,101,101,0.75);font-family: &apos;Source Code Pro&apos;, &apos;JetBrains Mono&apos;, &apos;Ubuntu Mono&apos;, &apos;Consolas&apos;, &apos;Lucida Console&apos;, &apos;Courier New&apos;, monospace;padding:1px;'>" + rightparts.join("</span><br><span style='background:rgba(101,101,101,0.75);font-family: &apos;Source Code Pro&apos;, &apos;JetBrains Mono&apos;, &apos;Ubuntu Mono&apos;, &apos;Consolas&apos;, &apos;Lucida Console&apos;, &apos;Courier New&apos;, monospace;padding:1px;'>") + "</span>";
+
+    document.getElementById("debug-left").innerHTML = lefttext.replaceAll("%tps%", tps).replaceAll("%ping%", cping).replaceAll("%false%", "<span style='color:red;font-family: &apos;Source Code Pro&apos;, &apos;JetBrains Mono&apos;, &apos;Ubuntu Mono&apos;, &apos;Consolas&apos;, &apos;Lucida Console&apos;, &apos;Courier New&apos;, monospace;'>false</span>").replaceAll("%true%", "<span style='color:green;font-family: &apos;Source Code Pro&apos;, &apos;JetBrains Mono&apos;, &apos;Ubuntu Mono&apos;, &apos;Consolas&apos;, &apos;Lucida Console&apos;, &apos;Courier New&apos;, monospace;'>true</span>");
+    document.getElementById("debug-right").innerHTML = righttext;
+}, 100)
+
+var filterStrength = 20;
+var frameTime = 0, lastLoop = new Date, thisLoop;
+
+setInterval(() => {
+    if (!debugshow) { return; }
+
+    var thisFrameTime = (thisLoop=new Date) - lastLoop;
+    frameTime+= (thisFrameTime - frameTime) / filterStrength;
+    lastLoop = thisLoop;
+}, 50)
+
+require('systeminformation').graphics().then((data) => {
+    global.gpudata = data;
+});
+
+setInterval(() => {
+    if (!debugshow) { return; }
+
+    tps = (1000/frameTime).toFixed(1);
+
+    if (typeof ping === "number") {
+        cping = ping;
+    } else {
+        cping = 0;
+    }
+
+    if (started) {
+        changedDataLeft = "playing: %true%";
+        changedDataLeft += "\n\n0$: XY: " + document.getElementById('car0').style.left.split("px")[0] + " / " + document.getElementById('car0').style.top.split("px")[0]
+
+        c0rotate = document.getElementById('car0').style.transform.split("rotate(")[1].split("deg)")[0];
+        if (c0rotate === "90") {
+            changedDataLeft += "\n0$: Facing: south (Towards negative Y)";
+        } else if (c0rotate === "-90") {
+            changedDataLeft += "\n0$: Facing: north (Towards negative Y)";
+        } else if (c0rotate === "0") {
+            changedDataLeft += "\n0$: Facing: east (Towards positive X)";
+        } else if (c0rotate === "180") {
+            changedDataLeft += "\n0$: Facing: west (Towards negative X)";
+        }
+
+        changedDataLeft += "\n0$: Speed: A: " + car0cspeed.toFixed(2) + " R: " + (car0speed - car0cspeed).toFixed(2) + " M: " + car0speed.toFixed(2);
+
+        changedDataLeft += "\n0$: Laps: " + document.getElementById('laps-car0').innerText + "/5";
+        changedDataLeft += "\n0$: Model: " + selectedModel0;
+
+        changedDataLeft += "\n\n1$: XY: " + document.getElementById('car1').style.left.split("px")[0] + " / " + document.getElementById('car1').style.top.split("px")[0]
+
+        c0rotate = document.getElementById('car1').style.transform.split("rotate(")[1].split("deg)")[0];
+        if (c0rotate === "90") {
+            changedDataLeft += "\n1$: Facing: south (Towards negative Y)";
+        } else if (c0rotate === "-90") {
+            changedDataLeft += "\n1$: Facing: north (Towards negative Y)";
+        } else if (c0rotate === "0") {
+            changedDataLeft += "\n1$: Facing: east (Towards positive X)";
+        } else if (c0rotate === "180") {
+            changedDataLeft += "\n1$: Facing: west (Towards negative X)";
+        }
+
+        changedDataLeft += "\n1$: Speed: A: " + car1cspeed.toFixed(2) + " R: " + (car1speed - car1cspeed).toFixed(2) + " M: " + car1speed.toFixed(2);
+
+        changedDataLeft += "\n1$: Laps: " + document.getElementById('laps-car1').innerText + "/5";
+        changedDataLeft += "\n1$: Model: " + selectedModel1;
+        changedDataLeft += "\n" + oil(0) + oil(1) + oil(2) + oil(3) + oil(4);
+        changedDataLeft += "\n\nMusic: " + i;
+        changedDataLeft += "\nCircuit: " + rand;
+
+    } else {
+        changedDataLeft = "playing: %false%"
+    }
+
+    usedMem = (process.memoryUsage().heapUsed / 1000000).toFixed(2);
+    totalMem = (process.memoryUsage().heapTotal / 1000000).toFixed(2);
+    percMem = Math.round((process.memoryUsage().heapUsed / process.memoryUsage().heapTotal)*100);
+    allocateMem = (process.memoryUsage().rss / 1000000).toFixed(2);
+
+    changedDataRight = "Mem: " + percMem + "% " + usedMem + "/" + totalMem + "MB"
+    changedDataRight += "\nAllocated: " + allocateMem + "MB"
+    changedDataRight += "\n\nCPU: (" + process.getCPUUsage().percentCPUUsage.toFixed(2) + "%) " + require('os').cpus().length + "x " + require('os').cpus()[0].model.trim() + " @ " + (require('os').cpus()[0].speed/1000).toFixed(2) + "GHz"
+
+    try {
+        changedDataRight += "\n\nDisplay: " + window.innerWidth + "x" + window.innerHeight + " (" + gpudata.controllers[0].vendor + ")";
+        changedDataRight += "\n" + gpudata.controllers[0].model;
+
+        try {
+            if (gpudriverdata.gpuDevice[0].driverVendor !== undefined) {
+                dvendor = gpudriverdata.gpuDevice[0].driverVendor;
+            } else {
+                dvendor = "&lt;Unknown&gt;";
+            }
+            if (gpudriverdata.gpuDevice[0].driverVersion !== undefined) {
+                dversion = gpudriverdata.gpuDevice[0].driverVersion;
+            } else {
+                dversion = "&lt;Unknown&gt;";
+            }
+        } catch (e) {
+            dvendor = "&lt;Unknown&gt;";
+            dversion = "&lt;Unknown&gt;";
+        }
+        changedDataRight += "\n" + dvendor + " - " + dversion;
+    } catch (e) {
+        console.error(e);
+    }
+},1000);
+
+window.addEventListener("load", () => {
+    require('@electron/remote').app.getGPUInfo('complete').then((data) => {
+        global.gpudriverdata = data;
+    });
+})
\ No newline at end of file
diff --git a/views/splash.png b/views/splash.png
index 39a90ab..c11ea4d 100644
--- a/views/splash.png
+++ b/views/splash.png