Rename velocity multiplier

Sopiro · Jul 27, 2024 · 153b5c6 · 153b5c6
1 parent 5e3e7f8
commit 153b5c6
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/index.html b/index.html
@@ -49,7 +49,7 @@ <h5 class="modal-title" id="exampleModalLabel">How to use</h5>
                                     - Drag to create box
                                 </div>
                                 <div class="row">
-                                    - Drag the box to move
+                                    - Drag box to move
                                 </div>
                                 <div class="row">
                                     - Right click or wheel drag to remove box
@@ -95,7 +95,7 @@ <h5 class="modal-title" id="exampleModalLabel">How to use</h5>
                 </div>
 
                 <div class="row">
-                    <label for="margin" class="form-label col-9 p-0 m-0">AABB multiplier</label>
+                    <label for="margin" class="form-label col-9 p-0 m-0">Velocity multiplier</label>
                     <div class="col text-end p-0 m-0" id="multiplier_label">0</div>
                     <input type="range" class="form-range " id="multiplier">
                 </div>

diff --git a/out/aabbtree.js b/out/aabbtree.js
@@ -40,7 +40,7 @@ export class AABBTree {
             return false;
         }
         let enlargedAABB = newAABB.copy();
-        let d = displacement.mul(Settings.aabbMultiplier);
+        let d = displacement.mul(Settings.velocityMultiplier);
         if (d.x > 0.0) {
             enlargedAABB.max.x += d.x;
         }

diff --git a/out/game.js b/out/game.js
@@ -98,9 +98,9 @@ export class Game {
         let nSquared = (this.entityCount * this.entityCount - this.entityCount) / 2.0;
         let bvh = nSquared / debugCount;
         this.efficiencyCheckLabel.innerHTML = "Box count: " + this.entityCount + "<br>"
-            + "BruteForce: " + nSquared + "<br>"
-            + "Dynamic BVH: " + debugCount + "<br>"
-            + "Dynamic BVH is " + (isNaN(bvh) ? "0" : bvh.toFixed(2)) + " times more efficient";
+            + "- BruteForce: " + nSquared + "<br>"
+            + "- Dynamic BVH: " + debugCount + "<br>"
+            + "Dynamic BVH is " + (isNaN(bvh) ? "0" : bvh.toFixed(2)) + "\n times more efficient";
     }
     handleInput(delta) {
         const mx = Input.isKeyDown("ArrowLeft") ? -1 : Input.isKeyDown("ArrowRight") ? 1 : 0;

diff --git a/out/settings.js b/out/settings.js
@@ -26,9 +26,9 @@ export const Settings = {
     genSpeed: 50,
     colorize: true,
     applyRotation: true,
-    // These two options are actually tree member variables..
+    // These two options are actually a tree member variables..
     aabbMargin: 0.1,
-    aabbMultiplier: 4.0,
+    velocityMultiplier: 3.0,
 };
 // Remove the default pop-up context menu
 let cvs = document.querySelector("#canvas");
@@ -66,9 +66,9 @@ margin.addEventListener("input", () => {
     updateSetting("margin", mappedValue);
 });
 const multiplier = document.querySelector("#multiplier");
-multiplier.value = String(Util.map(Settings.aabbMultiplier, multiplierRange.p1, multiplierRange.p2, 0, 100));
+multiplier.value = String(Util.map(Settings.velocityMultiplier, multiplierRange.p1, multiplierRange.p2, 0, 100));
 const multiplierLabel = document.querySelector("#multiplier_label");
-multiplierLabel.innerHTML = String(Settings.aabbMultiplier);
+multiplierLabel.innerHTML = String(Settings.velocityMultiplier);
 multiplier.addEventListener("input", () => {
     let mappedValue = Util.map(Number(multiplier.value), 0, 100, multiplierRange.p1, multiplierRange.p2);
     mappedValue = Math.trunc(mappedValue);
@@ -95,7 +95,7 @@ export function updateSetting(id, content) {
         case "margin":
             Settings.aabbMargin = content;
         case "multiplier":
-            Settings.aabbMultiplier = content;
+            Settings.velocityMultiplier = content;
         default:
             break;
     }

diff --git a/src/aabbtree.ts b/src/aabbtree.ts
@@ -68,7 +68,7 @@ export class AABBTree
         }
 
         let enlargedAABB = newAABB.copy();
-        let d = displacement.mul(Settings.aabbMultiplier);
+        let d = displacement.mul(Settings.velocityMultiplier);
 
         if (d.x > 0.0)
         {

diff --git a/src/game.ts b/src/game.ts
@@ -156,9 +156,9 @@ export class Game
         let bvh = nSquared / debugCount;
 
         this.efficiencyCheckLabel.innerHTML = "Box count: " + this.entityCount + "<br>"
-            + "BruteForce: " + nSquared + "<br>"
-            + "Dynamic BVH: " + debugCount + "<br>"
-            + "Dynamic BVH is " + (isNaN(bvh) ? "0" : bvh.toFixed(2)) + " times more efficient";
+            + "- BruteForce: " + nSquared + "<br>"
+            + "- Dynamic BVH: " + debugCount + "<br>"
+            + "Dynamic BVH is " + (isNaN(bvh) ? "0" : bvh.toFixed(2)) + "\n times more efficient";
     }
 
     private handleInput(delta: number): void

diff --git a/src/settings.ts b/src/settings.ts
@@ -30,9 +30,9 @@ export const Settings = {
     genSpeed: 50,
     colorize: true,
     applyRotation: true,
-    // These two options are actually tree member variables..
+    // These two options are actually a tree member variables..
     aabbMargin: 0.1,
-    aabbMultiplier: 4.0,
+    velocityMultiplier: 3.0,
 }
 
 // Remove the default pop-up context menu
@@ -82,9 +82,9 @@ margin.addEventListener("input", () =>
 });
 
 const multiplier = document.querySelector("#multiplier")! as HTMLInputElement;
-multiplier.value = String(Util.map(Settings.aabbMultiplier, multiplierRange.p1, multiplierRange.p2, 0, 100));
+multiplier.value = String(Util.map(Settings.velocityMultiplier, multiplierRange.p1, multiplierRange.p2, 0, 100));
 const multiplierLabel = document.querySelector("#multiplier_label")! as HTMLLabelElement;
-multiplierLabel.innerHTML = String(Settings.aabbMultiplier);
+multiplierLabel.innerHTML = String(Settings.velocityMultiplier);
 multiplier.addEventListener("input", () =>
 {
     let mappedValue = Util.map(Number(multiplier.value), 0, 100, multiplierRange.p1, multiplierRange.p2);
@@ -118,7 +118,7 @@ export function updateSetting(id: string, content?: any)
         case "margin":
             Settings.aabbMargin = content!;
         case "multiplier":
-            Settings.aabbMultiplier = content!;
+            Settings.velocityMultiplier = content!;
         default:
             break;
     }