new textures on home page

src/index/Canvas.tsx

@@ -1,10 +1,15 @@
 import "./canvas.sass";
 import {motion} from "framer-motion";
-import {Canvas as ThreeCanvas, useFrame} from "@react-three/fiber";
+import {Canvas as ThreeCanvas} from "@react-three/fiber";
-import {Vector3} from "three";
 import {Moon} from "./Moon";
-import {Stars} from "./Stars";
 import {AnimateSpin} from "../animations";
+import {Environment, OrbitControls, useTexture} from "@react-three/drei";
+import Jupiter from "../img/2k_jupiter.jpg";
+import Makemake from "../img/2k_makemake_fictional.jpg";
+import Ceres from "../img/2k_ceres_fictional.jpg";
+import Haumea from "../img/2k_haumea_fictional.jpg";
+import MilkyWay from "../img/2k_stars_milky_way.jpg";
+import {Suspense} from "react";
 
 export default function Canvas() {
 
@@ -12,12 +17,13 @@ export default function Canvas() {
     <main className="canvas">
       <section className="canvas-ctr">
         <ThreeCanvas shadows>
+          <Suspense fallback={null}>
+            <OrbitControls />
+            <Environment background={true} files={MilkyWay}/>
+            <Moons/>
             <Sphere/>
-          <Moon radius={8} color="pink" step={0.01}/>
-          <Moon radius={6} color="grey" step={0.02}/>
-          <Moon radius={4} color="green" step={0.03}/>
-          <Stars/>
             <directionalLight color="#E3A857" args={[1,10]} position={[100,10,100]} />
+          </Suspense>
         </ThreeCanvas>
       </section>
       <motion.h1 className="welcome" animate={AnimateSpin().animate}>
@@ -27,18 +33,23 @@ export default function Canvas() {
   )
 }
 
+function Moons() {
+  const makemake = useTexture(Makemake);
+  const haumea = useTexture(Haumea);
+  const ceres = useTexture(Ceres);
+
+  return <>
+    <Moon radius={8} color="pink" map={makemake} step={0.01}/>
+    <Moon radius={6} color="grey" map={haumea} step={0.02}/>
+    <Moon radius={4} color="green" map={ceres} step={0.03}/>
+  </>
+}
+
 function Sphere() {
-  useFrame(state => {
+  const colorMap = useTexture(Jupiter);
-    const { x, y } = state.pointer
-    // Smoothly interpolate the camera position
-    // We multiply by a factor (e.g., 5) to increase the range of movement
-    state.camera.position.lerp(new Vector3(x * 10, y * 10, 5), 0.1)
-    // Always keep the camera looking at the center
-    state.camera.lookAt(0, 0, 0)
-  })
 
   return <mesh position={[0,0,0]}>
     <sphereGeometry />
-    <meshPhysicalMaterial color="blue" iridescence={.5} />
+    <meshPhysicalMaterial map={colorMap} color="orange" iridescence={1} />
   </mesh>
 }

src/index/Moon.tsx

@@ -2,8 +2,8 @@ import {useRef, useState} from "react";
 import {Mesh} from "three";
 import {useFrame} from "@react-three/fiber";
 
-export function Moon(props: {radius: number, color: string, step: number}) {
+export function Moon(props: {radius: number, color: string, map: any, step: number}) {
-  const {radius, color, step} = props;
+  const {radius, color, map, step} = props;
   const moonRef = useRef<Mesh>(null);
   const [theta, setTheta] = useState(0);
 
@@ -22,7 +22,7 @@ export function Moon(props: {radius: number, color: string, step: number}) {
   return (
     <mesh ref={moonRef} position={[0,0,0]}>
       <sphereGeometry args={[.5]} />
-      <meshPhysicalMaterial color={color} iridescence={0.2} />
+      <meshPhysicalMaterial color={color} map={map} iridescence={0.2} />
     </mesh>
   )
 }

src/index/Stars.tsx

@@ -1,33 +0,0 @@
-import {useMemo} from "react";
-
-const RADIUS = 20;
-const COUNT = 100;
-type Coordinate = [number, number, number];
-export function Stars() {
-  const positions = useMemo(() => {
-    const positions: Coordinate[] = [];
-    for(let i = 0; i < COUNT; i++) {
-      const u = Math.random();
-      const v = Math.random();
-
-      const theta = 2 * Math.PI * u;
-      const phi = Math.acos(2 * v - 1);
-
-      // x = r*sin(theta)*cos(phi)
-      // x = r*sin(theta)*sin(phi)
-      // z = r*cos(phi)
-      positions.push([
-        RADIUS * Math.sin(phi) * Math.cos(theta),
-        RADIUS * Math.sin(phi) * Math.sin(theta),
-        RADIUS * Math.cos(phi),
-      ])
-    }
-    return positions;
-  }, []);
-
-  return positions.map((coord, i) => <mesh key={i} position={coord}>
-      <sphereGeometry args={[.1]} />
-      <meshBasicMaterial />
-    </mesh>
-  )
-}