From a95942ebd1d420902fafeb26b0885e6150990b95 Mon Sep 17 00:00:00 2001
From: 8BitBiscotti <camilla.biscotti@gmail.com>
Date: Thu, 12 Dec 2024 14:26:08 +0100
Subject: [PATCH] made nav bar pixel positioned & improved synthwave generation

---
 globalStyle.css    |  1 +
 navBar.css         |  7 +++---
 pxDensity.js       |  3 ++-
 synthwaveEffect.js | 53 +++++++++++++++++++++++++++-------------------
 4 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/globalStyle.css b/globalStyle.css
index 09fd1b9..410c5c4 100644
--- a/globalStyle.css
+++ b/globalStyle.css
@@ -5,6 +5,7 @@
   --navBarBtn_Border: #232323;
   --pxDensity: 1;
   --pxDensityPx: 1px;
+  --bottomPxMargin: 1px;
 }
 
 html {
diff --git a/navBar.css b/navBar.css
index a66dfa7..5eafeb3 100644
--- a/navBar.css
+++ b/navBar.css
@@ -15,11 +15,10 @@ li {
   filter: drop-shadow(0px calc(2px * var(--pxDensity)) rgba(0, 0, 0, 0.5));
   padding: 0%;
   display: inline-block;
-  margin-bottom: calc(4px * var(--pxDensity));
   position: absolute;
-  bottom: 0%;
-  left: 50%;
-  transform: translateX(-50%);
+  top: round(calc(100% - calc(5px * var(--pxDensity))), var(--pxDensityPx));
+  left: round(50%, var(--pxDensityPx));
+  transform: translate(-50%, -100%);
   font-size: 0px;
   width: max-content;
 }
diff --git a/pxDensity.js b/pxDensity.js
index 23ef0c4..99f1398 100644
--- a/pxDensity.js
+++ b/pxDensity.js
@@ -8,8 +8,9 @@ function calcPixelDensity() {
 
   document.documentElement.style.setProperty("--pxDensity", Math.max(densityWidth, densityHeight))
   document.documentElement.style.setProperty("--pxDensityPx", `${Math.max(densityWidth, densityHeight)}px`)
+
   pxDensity = parseFloat(getComputedStyle(document.body).getPropertyValue("--pxDensity"))
-  pxDensityDefined = true
 
   console.log("pxDensity: " + getComputedStyle(document.body).getPropertyValue("--pxDensity"))
+  pxDensityDefined = true
 }
\ No newline at end of file
diff --git a/synthwaveEffect.js b/synthwaveEffect.js
index 83730e0..aa8d537 100644
--- a/synthwaveEffect.js
+++ b/synthwaveEffect.js
@@ -101,20 +101,19 @@ function drawPixelLine(fromX, fromY, toX, toY) {
 
 
 class Hill {
-  constructor(x, y, color, xRandom, width, frameCount) {
+  constructor(x, y, color, width, frameCount) {
     this.color = color
     this.i = 0
     this.points = []
     this.x = x
     this.y = y
-    this.xRandom = xRandom
     this.frameCount = frameCount
     this.stepSize = 1
     this.width = width
     this.widthMul = 0.2
   }
 
-  generate(iterCount, maxHeight, heightOffset) {
+  generate(iterCount, maxHeight, heightOffset, xRandom) {
     let offset = 0
     let stepSize = this.width / iterCount
   
@@ -124,7 +123,7 @@ class Hill {
       let randomXOffset = undefined
 
       if (i == 0 || i == iterCount) { randomXOffset = 0 }
-      else { randomXOffset = randomInt(-this.xRandom, this.xRandom) }
+      else { randomXOffset = randomInt(-xRandom, xRandom) }
 
       this.points.push([offset + randomXOffset, randomHeight])
   
@@ -184,29 +183,39 @@ class Hill {
 }
 
 
-function connectHills(hill, previousHill, idx) {
-  if (previousHill && idx != 0) {
-    for (idx in previousHill.points) {
-      let startX = (previousHill.points[idx][0] * previousHill.widthMul) + ((-previousHill.width * previousHill.widthMul) / 2) + previousHill.x
-      let startY = (previousHill.points[idx][1] * previousHill.widthMul) + previousHill.y
-      let endX = (hill.points[idx][0] * hill.widthMul) + ((-hill.width * hill.widthMul) / 2) + hill.x
-      let endY = (hill.points[idx][1] * hill.widthMul) + hill.y
+function connectHills(hill, previousHill, idx, debug) {
+  let pHill = previousHill
+
+  if (pHill && idx != 0) {
+    for (idx in pHill.points) {
+      let startX = ((pHill.points[idx][0] * pHill.widthMul) + ((-pHill.width * pHill.widthMul) / 2) + pHill.x) / pxDensity
+      let startY = ((pHill.points[idx][1] * pHill.widthMul) + pHill.y) / pxDensity
+
+      let endX = ((hill.points[idx][0] * hill.widthMul) + ((-hill.width * hill.widthMul) / 2) + hill.x) / pxDensity
+      let endY = ((hill.points[idx][1] * hill.widthMul) + hill.y) / pxDensity
 
       let grad = ctx.createLinearGradient(startX, startY, endX, endY)
       let col = hill.color
-      let pCol = previousHill.color
+      let pCol = pHill.color
       
       grad.addColorStop(0, `rgb(${pCol[0]}, ${pCol[1]}, ${pCol[2]})`)
       grad.addColorStop(1, `rgb(${col[0]}, ${col[1]}, ${col[2]})`)
 
-      ctx.strokeStyle = grad
-      ctx.strokeStyle = "#ff0000"
-      ctx.lineWidth = pxDensity
-
       ctx.beginPath()
-      ctx.moveTo(startX, startY)
-      ctx.lineTo(endX, endY)
-      ctx.stroke()
+
+      if (debug) {
+        ctx.strokeStyle = grad
+
+        ctx.moveTo(startX * pxDensity, startY * pxDensity)
+        ctx.lineTo(endX * pxDensity, endY * pxDensity)
+        ctx.stroke()
+      }
+      else {
+        ctx.fillStyle = grad
+
+        drawPixelLine(startX, startY, endX, endY)
+        ctx.fill()
+      }
     }
   }
 }
@@ -222,8 +231,8 @@ function animateSynthWave() {
   ctx.clearRect(0, 0, canvas.width, canvas.height)
 
   if (iters >= iterToNewHill) {
-    let hillInstance = new Hill(canvas.width / 2, canvas.height / 3 * 2, [0, 180, 240], 25, canvas.width, 325)
-    hillInstance.generate(25, canvas.height / 24, 100)
+    let hillInstance = new Hill(canvas.width / 2, canvas.height / 3 * 2, [0, 180, 240], canvas.width, 325)
+    hillInstance.generate(25, canvas.height / 24, 100, 15)
     hills.unshift(hillInstance)
     iters = 0
   }
@@ -236,7 +245,7 @@ function animateSynthWave() {
     hill.stepSize = -0.005
     hill.widthMul *= 1.01
 
-    //connectHills(hill, previousHill, idx)
+    connectHills(hill, previousHill, idx, false)
 
     previousHill = hill
   }