From 93d210ba561ec300923fef2f5ec56cdb96b72eb1 Mon Sep 17 00:00:00 2001
From: "hexx.one" <dominics.pc@gmail.com>
Date: Sun, 20 Aug 2023 18:27:36 +0200
Subject: [PATCH] chore: type refactoring

---
 src/{ => @types}/gles.d.ts             |  0
 src/{ => @types}/glsl.d.ts             |  0
 src/{ICUE.d.ts => @types/we-icue.d.ts} |  0
 src/FPSta.ts                           | 23 ++++++++++++--------
 src/three/EffectComposer.ts            |  1 +
 src/worker-loader-fork                 |  2 +-
 src/worker-loader.d.ts                 | 29 --------------------------
 7 files changed, 16 insertions(+), 39 deletions(-)
 rename src/{ => @types}/gles.d.ts (100%)
 rename src/{ => @types}/glsl.d.ts (100%)
 rename src/{ICUE.d.ts => @types/we-icue.d.ts} (100%)
 delete mode 100644 src/worker-loader.d.ts

diff --git a/src/gles.d.ts b/src/@types/gles.d.ts
similarity index 100%
rename from src/gles.d.ts
rename to src/@types/gles.d.ts
diff --git a/src/glsl.d.ts b/src/@types/glsl.d.ts
similarity index 100%
rename from src/glsl.d.ts
rename to src/@types/glsl.d.ts
diff --git a/src/ICUE.d.ts b/src/@types/we-icue.d.ts
similarity index 100%
rename from src/ICUE.d.ts
rename to src/@types/we-icue.d.ts
diff --git a/src/FPSta.ts b/src/FPSta.ts
index f5f3d2a..1832ad0 100644
--- a/src/FPSta.ts
+++ b/src/FPSta.ts
@@ -12,8 +12,8 @@ import { CSettings } from "./CSettings";
 import { waitReady } from "./Util";
 import { WEAS } from "./weas/WEAS";
 
-const Element_Id = "fpstats";
-const Mem_Update_Rate = 19;
+const ElementId = "fpstats";
+const MemUpdateRate = 19;
 
 
 /**
@@ -35,22 +35,27 @@ export class FPStats extends CComponent {
 	public settings: FPSettings = new FPSettings();
 
 	private container: HTMLElement;
+
 	// FPS
 	private fpsHolder: HTMLElement;
 	private lastUpdate: number = performance.now();
 	private frameCount = 1;
+
 	// usage
 	private useHolder: HTMLElement;
+
 	// cpu
 	private cpuHolder: HTMLElement;
 	private cpuBegin: number = performance.now();
 	private cpuEnd: number = performance.now();
 	private cpuMS = 1;
+
 	// gpu
 	private gpuHolder: HTMLElement;
 	private gpuBegin: number = performance.now();
 	private gpuEnd: number = performance.now();
 	private gpuMS = 1;
+
 	// audio
 	private auProvider: WEAS = null;
 	private audHolder: HTMLElement;
@@ -88,7 +93,7 @@ export class FPStats extends CComponent {
 	private injectCSS() {
 		const st = document.createElement("style");
 		st.innerHTML = `
-		#${Element_Id} {
+		#${ElementId} {
 			opacity: 0;
 			position: fixed;
 			top: 50vh;
@@ -99,7 +104,7 @@ export class FPStats extends CComponent {
 			text-align: left;
 			background: black;
 		}
-		#${Element_Id}.show {
+		#${ElementId}.show {
 			opacity: 0.8;
 		}
 		`;
@@ -113,17 +118,17 @@ export class FPStats extends CComponent {
 	private injectHTML() {
 		// root
 		this.container = document.createElement("div");
-		this.container.id = Element_Id;
+		this.container.id = ElementId;
 		document.body.append(this.container);
 		// fps
 		this.fpsHolder = document.createElement("div");
-		this.fpsHolder.innerText = "FPS: 0";
+		this.fpsHolder.innerText = "FPS: 0 / 60";
 		// cpu
 		this.cpuHolder = document.createElement("div");
-		this.cpuHolder.innerText = "CPU: 0.00 ms";
+		this.cpuHolder.innerText = "CPU: 0.00%";
 		// gpu
 		this.gpuHolder = document.createElement("div");
-		this.gpuHolder.innerText = "GPU: 0.00 ms";
+		this.gpuHolder.innerText = "GPU: 0.00%";
 		// usage
 		this.useHolder = document.createElement("div");
 		this.useHolder.innerText = "All: 0.00%";
@@ -231,7 +236,7 @@ export class FPStats extends CComponent {
 			this.bpmHolder.innerText = `BPM: ${bts.toFixed(2)} ~`;
 		}
 
-		if (this.memUpdate++ > Mem_Update_Rate) {
+		if (this.memUpdate++ > MemUpdateRate) {
 			this.memUpdate = 0;
 			this.updateMemory();
 		}
diff --git a/src/three/EffectComposer.ts b/src/three/EffectComposer.ts
index e13b172..f767d5a 100644
--- a/src/three/EffectComposer.ts
+++ b/src/three/EffectComposer.ts
@@ -16,6 +16,7 @@ import { RenderPass } from "./pass/RenderPass";
 
 /**
  * render shader chain
+ * // TODO move to three.ts ??
  * @public
  */
 export class EffectComposer {
diff --git a/src/worker-loader-fork b/src/worker-loader-fork
index 0985906..208889e 160000
--- a/src/worker-loader-fork
+++ b/src/worker-loader-fork
@@ -1 +1 @@
-Subproject commit 0985906b8af3b97b5232e2daf11c7b3935d77e15
+Subproject commit 208889e6f1467e25923f0f966bbc12597cf38901
diff --git a/src/worker-loader.d.ts b/src/worker-loader.d.ts
deleted file mode 100644
index 55e1a29..0000000
--- a/src/worker-loader.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * @author hexxone / https://hexx.one
- *
- * @license
- * Copyright (c) 2023 hexxone All rights reserved.
- * Licensed under the GNU GENERAL PUBLIC LICENSE.
- * See LICENSE file in the project root for full license information.
- */
-
-/**
- * This is just a definition wrapper.
- *
- * @see https://github.com/webpack-contrib/worker-loader
- */
-declare module "worker-loader!*" {
-	/**
-	 * You need to change `Worker`, if:
-	 * you specified a different value for the `workerType` option
-	 */
-	class WebpackWorker extends Worker {
-		constructor(options?: any);
-	}
-
-	/**
-	 * Change this if you set the `esModule` option to `false`
-	 * // export = WebpackWorker;
-	 */
-	export default WebpackWorker;
-}
\ No newline at end of file