Merge pull request #480 from EarthyScience/jp/keyframe-time

keyframe Time

Author: TheJeran

src/components/LandingHome.tsx

@@ -78,9 +78,9 @@ export function LandingHome() {
     return () => { isMounted = false; };
   }, [currentStore, setZMeta, setVariables, setTitleDescription])
 
-  // useEffect(()=>{
-  //   sendPing()
-  // },[])
+  useEffect(()=>{
+    sendPing()
+  },[])
 
   return (
     <>

src/components/plots/KeyFramePreviewer.tsx

@@ -43,8 +43,11 @@ export const KeyFramePreviewer = () => {
     const KeyFrameLerper = (startState: Record<string,any>, endState:Record<string,any>, alpha:number, useCamera=true) => {
         const startVizState = startState["visual"]
         const endVizState = endState["visual"]
+        const startTime = startState["time"]
+        const endTime = endState["time"]
         const lerpedVizState: Record<string, any> = {};
         const lerpedCamState: Record<string, any> = {};   
+
         Object.keys(startVizState).forEach(key => {
             const sourceValue = startVizState[key];
             const targetValue = endVizState[key];
@@ -69,6 +72,10 @@ export const KeyFramePreviewer = () => {
             }
         });
         usePlotStore.setState(lerpedVizState)
+        if (!useTime){
+            const newTime = lerp(startTime, endTime, alpha)
+            usePlotStore.setState({animProg: newTime})
+        }
 
         if (useCamera){ // Don't lerp camera if orbiting
             const startCamState = startState["camera"]

src/components/ui/KeyFrames.tsx

@@ -56,7 +56,8 @@ const SetKeyFrame = (frame: number) =>{
     }
     const thisState = {
         visual : keyState,
-        camera: cameraState
+        camera: cameraState,
+        time: usePlotStore.getState().animProg
     }
     addKeyFrame(frame, thisState)
 }
@@ -102,16 +103,25 @@ const KeyFrames = () => {
 
     {/* Information */}
     useEffect(() => {
-    if (orbit || useTime) {
-      toast.warning("Warning!", {
-        description: "Camera Motion overwritten by orbit!",
-        action: {
-          label: "close",
-          onClick: () => console.log("close"),
-        },
-      });
-    }
-  }, [orbit, useTime]);
+        if (orbit) {
+            toast.warning("Warning!", {
+                description: "Camera Motion overwritten by Orbit!",
+                action: {
+                    label: "close",
+                    onClick: () => null,
+                },
+            });
+        }
+        if (useTime) {
+            toast.warning("Warning!", {
+                description: "Time changes overwritten by Animate Time!",
+                action: {
+                    label: "close",
+                    onClick: () => null,
+                },
+            });
+        }
+    }, [orbit, useTime]);
 
   useEffect(() => {
     if ((orbit || useTime) && !keyFrames) {