From fc6cded59e5ce3909a5a55d0c49a2238fad7f1b9 Mon Sep 17 00:00:00 2001
From: Frank Johnson <frankjohnson1993@gmail.com>
Date: Sun, 12 Sep 2021 17:47:59 -0400
Subject: [PATCH] Merge issues trying to look at a stashed commit

---
 app/web/src/components/Hero/AssetWithGooey.tsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/web/src/components/Hero/AssetWithGooey.tsx b/app/web/src/components/Hero/AssetWithGooey.tsx
index 8a45ce7..dc8f83f 100644
--- a/app/web/src/components/Hero/AssetWithGooey.tsx
+++ b/app/web/src/components/Hero/AssetWithGooey.tsx
@@ -43,8 +43,7 @@ export default function AssetWithGooey({
       <group ref={coffeeRef}>
         <mesh ref={mesh} scale={scaleArr} geometry={geo}>
           <meshPhysicalMaterial
-            envMapIntensity={2}
-            color="#F472B6"
+            color="#FF6EBD"
             map={colorMap}
             clearcoat={0.5}
             clearcoatRoughness={0.01}
@@ -59,6 +58,7 @@ export default function AssetWithGooey({
       </group>
       <ambientLight intensity={2} />
       <Gooey />
+      <ambientLight intensity={1.8} />
     </group>
   )
 }
@@ -73,22 +73,22 @@ function Gooey() {
       const dist = Math.random() * 3 + 2.5
       const x = randomSign(Math.random() * dist)
       const y = randomSign(Math.sqrt(dist * dist - x * x))
-      const z = randomSign(Math.random() * 3)
+      const z = randomSign(Math.random() * 2)
       const position: [number, number, number] = [x, z, y]
       const size = Math.random() * 0.8 + 0.1
-      const distort = Math.random() * 0.8 + 0.1
-      const speed = (Math.random() * 0.8) / size / size + 0.1
+      const distort = (size > .1) ? Math.random() * .6 * size + 0.2 : 0
+      const speed = (size > .1) ? (Math.random() * 0.8) / size / size + 0.1 : 0
       return { position, size, distort, speed }
     })
     const secondSet = Array.from({ length: 5 }).map((_, index) => {
       const dist = Math.random() * 3 + 1.5
       const x = randomSign(Math.random() * dist)
       const y = randomSign(Math.sqrt(dist * dist - x * x))
-      const z = randomSign(Math.random() * 3)
+      const z = randomSign(Math.random() * 2)
       const position: [number, number, number] = [x, z, y]
       const size = Math.random() * 0.2 + 0.05
-      const distort = Math.random() * 0.8 + 0.1
-      const speed = (Math.random() * 0.5) / size / size + 0.1
+      const distort = (size > .1) ? Math.random() * .8 * size + 0.2 : 0
+      const speed = (size > .1) ? (Math.random() * 0.5) / size / size + 0.1 : 0
       return { position, size, distort, speed }
     })
     return [...firstSet, ...secondSet]