Camera save and restore; Camera Manager refactor

BlueAlien99 · Oct 30, 2021 · 6fc60f1 · 6fc60f1
1 parent 3ccb8d8
commit 6fc60f1
Show file tree

Hide file tree

Showing 6 changed files with 190 additions and 113 deletions.
diff --git a/TODO b/TODO
@@ -1,5 +1,4 @@
 - reactor model!
-- customize orbit controls
 - sidebar tabs
 - theming (alpha, save and load user themes)
 - customize camera (user), 
@@ -12,9 +11,7 @@
 - own Stats impl
 
 - slice for ss res + form
-- portal for settings for cameras
 - getUpdatedCamera refactor? (Camera type, setting aspect ratio etc., useCallback)
-- saving camera and restoring
 - combined ss; ss dl using redux-observable
 - camera slice - fov?
 - threeviews - camera naming and constructors
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,6 +35,7 @@
     "stats.js": "^0.17.0",
     "styled-components": "^5.3.1",
     "three": "^0.132.2",
+    "three-stdlib": "^2.5.4",
     "web-vitals": "^1.1.2"
   },
   "devDependencies": {

diff --git a/src/components/GenericView.tsx b/src/components/GenericView.tsx
@@ -1,35 +1,38 @@
 import { Canvas } from '@react-three/fiber';
-import { ComponentProps, ReactNode, useState } from 'react';
+import { ComponentProps, ReactNode, useRef, useState } from 'react';
 import styled from 'styled-components';
+import { OrbitControls as OrbitControlsImpl } from 'three-stdlib';
+import { OrbitControls } from '@react-three/drei';
 import { useAppSelector } from 'hooks/redux';
 import { selectCurrentStyle } from 'features/styles/stylesSlice';
 import TakeScreenshot from './three/TakeScreenshot';
-import CameraManager, { SupportedCameras } from './three/CameraManager';
+import CameraManager from './three/CameraManager';
 
 const ViewStyles = styled.div<{ textColor: string }>`
     position: relative;
     min-width: 0;
     min-height: 0;
 
-    .label {
+    .overlay {
         position: absolute;
-        left: 50%;
-        transform: translateX(-50%);
         color: ${props => props.textColor};
+        opacity: 0.17;
         z-index: 100;
+
+        &:hover {
+            opacity: 0.67;
+        }
+    }
+
+    .label {
+        left: 50%;
+        transform: translateX(-50%);
     }
 
     .actions {
         display: flex;
         flex-direction: column;
-        position: absolute;
         right: 0;
-        opacity: 0.17;
-        z-index: 100;
-
-        &:hover {
-            opacity: 0.67;
-        }
     }
 `;
 
@@ -45,12 +48,12 @@ const onCreated: CanvasProp<'onCreated'> = state => {
 
 interface Props {
     label: string;
-    camera: SupportedCameras;
+    controlsProps?: ComponentProps<typeof OrbitControls>;
     className?: string;
     children?: ReactNode;
 }
 
-function GenericView({ label, camera, className, children }: Props): JSX.Element {
+function GenericView({ label, controlsProps, className, children }: Props): JSX.Element {
     const [screenshot, setScreenshot] = useState({
         requested: false,
         variant: '' as ComponentProps<typeof TakeScreenshot>['variant'],
@@ -60,28 +63,22 @@ function GenericView({ label, camera, className, children }: Props): JSX.Element
     const requestSVGScreenshot = () => setScreenshot({ requested: true, variant: 'svg' });
     const screenshotTaken = () => setScreenshot(prevState => ({ ...prevState, requested: false }));
 
-    const [cameraAction, setCameraAction] = useState({
-        reset: false,
-    });
-
-    const requestCameraReset = () => setCameraAction({ reset: true });
-    const cameraReset = () => setCameraAction({ reset: false });
-
     const style = useAppSelector(selectCurrentStyle);
 
+    const cameraControlsRef = useRef<HTMLDivElement | null>(null);
+    const orbitControlsRef = useRef<OrbitControlsImpl | null>(null);
+
     return (
         <ViewStyles className={className} textColor={style.overlayColor}>
-            <span className="label">{label}</span>
-            <div className="actions">
+            <div className="overlay camera" ref={cameraControlsRef} />
+            <span className="overlay label">{label}</span>
+            <div className="overlay actions">
                 <button type="button" onClick={requestPNGScreenshot}>
                     Save as PNG
                 </button>
                 <button type="button" onClick={requestSVGScreenshot}>
                     Save as SVG
                 </button>
-                <button type="button" onClick={requestCameraReset}>
-                    Reset camera
-                </button>
             </div>
             <Canvas frameloop="demand" gl={rendererProps} onCreated={onCreated}>
                 <color attach="background" args={[style.clearColor]} />
@@ -91,11 +88,14 @@ function GenericView({ label, camera, className, children }: Props): JSX.Element
                     label={label}
                     done={screenshotTaken}
                 />
-                <CameraManager
-                    defaultCamera={camera}
-                    resetRequested={cameraAction.reset}
-                    resetDone={cameraReset}
-                />
+                {cameraControlsRef.current && orbitControlsRef.current && (
+                    <CameraManager
+                        cameraControlsContainer={cameraControlsRef.current}
+                        orbitControls={orbitControlsRef.current}
+                    />
+                )}
+                {/* eslint-disable-next-line react/jsx-props-no-spreading */}
+                <OrbitControls ref={orbitControlsRef} {...controlsProps} />
                 {children}
             </Canvas>
         </ViewStyles>

diff --git a/src/components/ThreeViews.tsx b/src/components/ThreeViews.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
-import { OrbitControls } from '@react-three/drei';
-import { OrthographicCamera, PerspectiveCamera, Vector3 } from 'three';
+import { Vector3 } from 'three';
+import { OrthographicCamera, PerspectiveCamera } from '@react-three/drei';
 import { useAppSelector } from 'hooks/redux';
 import { selectAliceData } from 'features/aliceData/aliceDataSlice';
 import { selectCurrentStyle } from 'features/styles/stylesSlice';
@@ -39,35 +39,29 @@ function ThreeViews(): JSX.Element {
             <GenericView
                 label="3D View"
                 className="main-view"
-                camera={(() => {
-                    const camera = new PerspectiveCamera(60, 1, 1, 5000);
-                    camera.position.set(1000, 1000, 1000);
-                    return camera;
-                })()}
+                controlsProps={{ dampingFactor: 0.1 }}
             >
-                <OrbitControls />
+                <PerspectiveCamera
+                    fov={60}
+                    near={1}
+                    far={5000}
+                    position={[1000, 1000, 1000]}
+                    makeDefault
+                />
                 {scene}
             </GenericView>
             <GenericView
                 label="R-Phi View"
-                camera={(() => {
-                    const camera = new OrthographicCamera(0, 0, 0, 0, 1, 5000);
-                    camera.position.set(0, 0, 1000);
-                    return camera;
-                })()}
+                controlsProps={{ enableRotate: false, enableDamping: false }}
             >
-                <OrbitControls enableRotate={false} enableDamping={false} />
+                <OrthographicCamera near={1} far={5000} position={[0, 0, 1000]} makeDefault />
                 {scene}
             </GenericView>
             <GenericView
                 label="Rho-Z View"
-                camera={(() => {
-                    const camera = new OrthographicCamera(0, 0, 0, 0, 1, 5000);
-                    camera.position.set(1000, 0, 0);
-                    return camera;
-                })()}
+                controlsProps={{ enableRotate: false, enableDamping: false }}
             >
-                <OrbitControls enableRotate={false} enableDamping={false} />
+                <OrthographicCamera near={1} far={5000} position={[1000, 0, 0]} makeDefault />
                 {scene}
             </GenericView>
         </ThreeViewsStyles>