fix: improve math utility name to avoid naming conflicts with JavaScr…

…ipt native class [#1]
d3p1 · Oct 14, 2024 · 0ec2d3d · 0ec2d3d
1 parent ba30b11
commit 0ec2d3d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/docs/js/app.js b/docs/js/app.js
@@ -112,9 +112,14 @@ export default class App {
    * @returns {void}
    */
   #initCar() {
-    this.car = new Car(0, 0, 50, 100, 500, this.carControl)
-    this.car.centerX = this.canvas.width / 2
-    this.car.centerY = this.canvas.height / 2
+    this.car = new Car(
+      this.road.getLaneCenterFromLaneIndex(2),
+      this.canvas.height / 2,
+      50,
+      100,
+      500,
+      this.carControl,
+    )
   }
 
   /**

diff --git a/docs/js/core/road.js b/docs/js/core/road.js
@@ -2,7 +2,7 @@
  * @description Road
  * @author      C. M. de Picciotto <d3p1@d3p1.dev> (https://d3p1.dev/)
  */
-import Math from '../utils/math.js'
+import Mathy from '../utils/mathy.js'
 
 /**
  * @const {number} INFINITY
@@ -103,6 +103,22 @@ export default class Road {
     this.#initRoadParameters()
   }
 
+  /**
+   * Get the lane center
+   *
+   * @param   {number} laneIndex Index that defines lane position
+   *                             (starting at `0` from left to right)
+   * @returns {number}
+   */
+  getLaneCenterFromLaneIndex(laneIndex) {
+    return Mathy.lerp(
+      this.left,
+      this.right,
+      (Math.min(laneIndex, this.laneCount - 1) + 1) / this.laneCount -
+        (1 / this.laneCount) * 0.5,
+    )
+  }
+
   /**
    * Draw the road
    *
@@ -152,7 +168,7 @@ export default class Road {
   #drawLanes(context) {
     context.setLineDash([this.laneDelimiterHeight, this.laneDelimiterGap])
     for (let i = 1; i < this.laneCount; i++) {
-      const x = Math.lerp(this.left, this.right, i / this.laneCount)
+      const x = Mathy.lerp(this.left, this.right, i / this.laneCount)
       this.#drawLine(
         context,
         {

diff --git a/docs/js/utils/math.js → docs/js/utils/mathy.js b/docs/js/utils/math.js → docs/js/utils/mathy.js
@@ -2,7 +2,7 @@
  * @description Math utility
  * @author      C. M. de Picciotto <d3p1@d3p1.dev> (https://d3p1.dev/)
  */
-export default class Math {
+export default class Mathy {
   /**
    * Linear interpolation between two points
    *