From 777f2bb5a3225c9316f13d3b2377d0e945764572 Mon Sep 17 00:00:00 2001
From: Frank Delaguila <frankdelaguila@Franks-MacBook-Pro.local>
Date: Tue, 22 Mar 2022 23:49:55 -0600
Subject: [PATCH] Making slight changes. Working on room 3D model to place
 instead of images

---
 src/components/App.jsx | 15 ++++++++-------
 src/scripts/app.js     |  2 +-
 src/styles/styles.scss |  2 +-
 src/views/index.html   |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/components/App.jsx b/src/components/App.jsx
index 6c9fecb..b2c62a8 100644
--- a/src/components/App.jsx
+++ b/src/components/App.jsx
@@ -159,15 +159,16 @@ const App = () => {
       </mesh> */}
 
       <spotLight
-        shadow-mapSize-width={2048}
-        shadow-mapSize-height={2048}
+        shadow-mapSize-width={1024 * 4}
+        shadow-mapSize-height={1024 * 4}
+        // shadow={{ bias: 0 }}
         ref={spotlightRef}
         position={[-1.5, 0, 3]}
         penumbra={0.4}
         target={lightingTarget.current}
         distance={11}
         angle={0.4}
-        intensity={10}
+        intensity={3}
         castShadow />
       <directionalLight
         ref={directionalLightRef}
@@ -210,9 +211,9 @@ const App = () => {
 
       <group ref={lightingTarget}>
         <group ref={imageGroupRef} position={[0, 0, 0]}>
-          <Dog index={0} position={[1.5 * xW, -0.1, -3]} scale={[0.7, 2, 1]} />
+          {/* <Dog index={0} position={[1.5 * xW, -0.1, -3]} scale={[0.7, 2, 1]} />
           <Dog index={1} position={[2.5 * xW, -0.1, -3]} scale={[0.7, 2, 1]} />
-          <Dog index={2} position={[3.5 * xW, -0.1, -3]} scale={[0.7, 2, 1]} />
+          <Dog index={2} position={[3.5 * xW, -0.1, -3]} scale={[0.7, 2, 1]} /> */}
 
           {/* <group rotation={[Math.PI / 2, 0, 0]} position={[1.5, -1, -3]} scale={[0.01, 0.01, 0.01]}>
                 <mesh receiveShadow castShadow geometry={toyCar.nodes.ToyCar.geometry} />
@@ -233,7 +234,7 @@ const App = () => {
                           <div className="flex items-center">
                             <p className="mr-2">{!screenClicked ? 'Zoom In' : 'Zoom Out'}</p>
                             <div onMouseDown={() => setScreenClicked(!screenClicked)} className="cursor-pointer bg-zinc-800 py-2 px-4 rounded-sm hover:bg-zinc-700 transition-colors">
-                              {!screenClicked ? <i class="fa-solid fa-magnifying-glass-plus"></i> : <i class="fa-solid fa-magnifying-glass-minus"></i>}
+                              {!screenClicked ? <i className="fa-solid fa-magnifying-glass-plus"></i> : <i className="fa-solid fa-magnifying-glass-minus"></i>}
                             </div>
                           </div>
                         </nav>
@@ -242,7 +243,7 @@ const App = () => {
                           <a target="_blank" href="https://www.monumetric.com/">
                             <img className="w-16 mb-2" src={monumetricLogo} alt="Monumetric Logo - Graphic of the Pale Blue Dot from Caral Sagan with Monumetric below" />
                           </a>
-                          <p><span className="font-bold">Technologies Used:</span><br />Angular 3/7/13+, SCSS(Sass), AWS/Google Auth APIs, Social Media APIs, Figma, Adobe XD</p>
+                          <p><span className="font-bold">Technologies Used:</span><br />Angular 3/7/13+, Javascript, SCSS(Sass), Multiple Auth APIs, UX/UI Design, Figma, Adobe XD</p>
                         </div>
 
                         <div className="bg-zinc-800 w-full rounded p-4 mb-2">
diff --git a/src/scripts/app.js b/src/scripts/app.js
index 8e09e96..17a6b20 100644
--- a/src/scripts/app.js
+++ b/src/scripts/app.js
@@ -11,7 +11,7 @@ render(
   <>
     <Suspense fallback={null}>
       <MainContent />
-      <Canvas shadows mode='concurrent' devicePixelRatio={2}  gl={{ antialias: true }} camera={{position: [0, 0, 0]}} id="canvas-container" style={{position: 'absolute'}}>
+      <Canvas shadows mode='concurrent' dpr={Math.max(window.devicePixelRatio, 2)} gl={{ antialias: true }} camera={{position: [0, 0, 0]}} id="canvas-container" style={{position: 'absolute'}}>
         <ScrollControls damping={10} pages={10}>
           <Scroll>
             <App />
diff --git a/src/styles/styles.scss b/src/styles/styles.scss
index 99ba4e8..824f5b7 100644
--- a/src/styles/styles.scss
+++ b/src/styles/styles.scss
@@ -7,7 +7,7 @@ body {
   position: relative;
   margin: 0;
   padding: 0;
-  font-family: 'Museo Sans';
+  font-family: 'Museo Sans', 'Helvetica', sans-serif;
 }
 
 #root {
diff --git a/src/views/index.html b/src/views/index.html
index 95f546c..8cf1dcd 100644
--- a/src/views/index.html
+++ b/src/views/index.html
@@ -7,7 +7,7 @@
   <link rel="shortcut icon" type="image/jpg" href="../assets/logos/fd..svg"/>
   <title>Designer and Developer</title>
 
-  <link rel="stylesheet" href="https://use.typekit.net/bcf6wms.css">
+  <link rel="stylesheet" href="https://use.typekit.net/vkd2vwx.css">
 </head>
 <body>
   <div id="root"></div>