-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(react-components): Move global camera controls to Reveal context (…
…#4745) * feat(react-components): Move global camera controls to Reveal context
- Loading branch information
1 parent
e751fbb
commit bcb8cff
Showing
9 changed files
with
315 additions
and
87 deletions.
There are no files selected for viewing
21 changes: 0 additions & 21 deletions
21
react-components/src/components/RevealCanvas/ViewerContext.ts
This file was deleted.
Oops, something went wrong.
54 changes: 54 additions & 0 deletions
54
react-components/src/components/RevealCanvas/ViewerContext.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
/*! | ||
* Copyright 2023 Cognite AS | ||
*/ | ||
import { type Cognite3DViewer } from '@cognite/reveal'; | ||
import { createContext, type ReactElement, type ReactNode, useContext } from 'react'; | ||
import { type RevealRenderTarget } from '../../architecture/base/renderTarget/RevealRenderTarget'; | ||
import { type CameraStateParameters, useCameraStateControl } from './hooks/useCameraStateControl'; | ||
|
||
const ViewerContext = createContext<RevealRenderTarget | null>(null); | ||
|
||
export type ViewerContextProviderProps = { | ||
cameraState?: CameraStateParameters; | ||
setCameraState?: (cameraState?: CameraStateParameters) => void; | ||
value: RevealRenderTarget | null; | ||
children: ReactNode; | ||
}; | ||
|
||
export const ViewerContextProvider = ({ | ||
cameraState, | ||
setCameraState, | ||
value, | ||
children | ||
}: ViewerContextProviderProps): ReactElement => { | ||
return ( | ||
<ViewerContext.Provider value={value}> | ||
<ViewerControls cameraState={cameraState} setCameraState={setCameraState} /> | ||
{children} | ||
</ViewerContext.Provider> | ||
); | ||
}; | ||
|
||
const ViewerControls = ({ | ||
cameraState, | ||
setCameraState | ||
}: { | ||
cameraState?: CameraStateParameters; | ||
setCameraState?: (cameraState?: CameraStateParameters) => void; | ||
}): ReactNode => { | ||
useCameraStateControl(cameraState, setCameraState); | ||
return null; | ||
}; | ||
|
||
export const useReveal = (): Cognite3DViewer => { | ||
const renderTarget = useRenderTarget(); | ||
return renderTarget.viewer; | ||
}; | ||
|
||
export const useRenderTarget = (): RevealRenderTarget => { | ||
const renderTarget = useContext(ViewerContext); | ||
if (renderTarget === null) { | ||
throw new Error('useRenderTarget must be used within a ViewerProvider'); | ||
} | ||
return renderTarget; | ||
}; |
98 changes: 98 additions & 0 deletions
98
react-components/src/components/RevealCanvas/hooks/useCameraStateControl.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,98 @@ | ||
/*! | ||
* Copyright 2023 Cognite AS | ||
*/ | ||
|
||
import { type MutableRefObject, useEffect, useRef } from 'react'; | ||
import { useReveal } from '../ViewerContext'; | ||
import { type CameraState } from '@cognite/reveal'; | ||
|
||
export type CameraStateParameters = Omit<Required<CameraState>, 'rotation'>; | ||
|
||
export const useCameraStateControl = ( | ||
externalCameraState?: CameraStateParameters, | ||
setCameraState?: (cameraState?: CameraStateParameters) => void | ||
): void => { | ||
const lastSetExternalState = useRef<CameraStateParameters | undefined>( | ||
externalCameraState === undefined | ||
? undefined | ||
: { | ||
position: externalCameraState.position.clone(), | ||
target: externalCameraState.target.clone() | ||
} | ||
); | ||
|
||
useSetInternalCameraStateOnExternalUpdate(externalCameraState, lastSetExternalState); | ||
|
||
useSetExternalCameraStateOnCameraMove(setCameraState, externalCameraState, lastSetExternalState); | ||
}; | ||
|
||
const useSetInternalCameraStateOnExternalUpdate = ( | ||
externalCameraState: CameraStateParameters | undefined, | ||
lastSetExternalState: MutableRefObject<CameraStateParameters | undefined> | ||
): void => { | ||
const reveal = useReveal(); | ||
|
||
useEffect(() => { | ||
if ( | ||
externalCameraState === undefined || | ||
isCameraStatesEqual(externalCameraState, lastSetExternalState.current) | ||
) { | ||
return; | ||
} | ||
|
||
reveal.cameraManager.setCameraState(externalCameraState); | ||
}, [externalCameraState]); | ||
}; | ||
|
||
const useSetExternalCameraStateOnCameraMove = ( | ||
setCameraState: ((cameraState?: CameraStateParameters) => void) | undefined, | ||
externalCameraState: CameraStateParameters | undefined, | ||
lastSetExternalState: MutableRefObject<CameraStateParameters | undefined> | ||
): void => { | ||
const reveal = useReveal(); | ||
useEffect(() => { | ||
const updateStateOnCameraStop = (): void => { | ||
const currentCameraManagerState = reveal.cameraManager.getCameraState(); | ||
|
||
if ( | ||
externalCameraState !== undefined && | ||
isCameraStatesEqual(externalCameraState, currentCameraManagerState) | ||
) { | ||
return; | ||
} | ||
|
||
lastSetExternalState.current = { | ||
position: currentCameraManagerState.position.clone(), | ||
target: currentCameraManagerState.target.clone() | ||
}; | ||
|
||
setCameraState?.(currentCameraManagerState); | ||
}; | ||
|
||
reveal.cameraManager.on('cameraStop', updateStateOnCameraStop); | ||
return () => { | ||
reveal.cameraManager.off('cameraStop', updateStateOnCameraStop); | ||
}; | ||
}, [externalCameraState, setCameraState, lastSetExternalState]); | ||
}; | ||
|
||
function isCameraStatesEqual( | ||
previous: CameraStateParameters | undefined, | ||
current: CameraStateParameters | undefined | ||
): boolean { | ||
if (previous === undefined && current === undefined) { | ||
return true; | ||
} | ||
|
||
if (previous === undefined || current === undefined) { | ||
return false; | ||
} | ||
|
||
const epsilon = 0.001; | ||
const { position: previousPosition, target: previousTarget } = previous; | ||
const { position: currentPosition, target: currentTarget } = current; | ||
return ( | ||
previousPosition.distanceToSquared(currentPosition) <= epsilon && | ||
previousTarget.distanceToSquared(currentTarget) <= epsilon | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 0 additions & 56 deletions
56
react-components/src/higher-order-components/withCameraStateUrlParam.tsx
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 97 additions & 0 deletions
97
...t-components/tests/unit-tests/components/RevealCanvas/hooks/useCameraStateControl.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,97 @@ | ||
import { describe, expect, test, vi, beforeEach, beforeAll, afterAll } from 'vitest'; | ||
|
||
import { renderHook } from '@testing-library/react'; | ||
|
||
import { viewerMock } from '../../../fixtures/viewer'; | ||
import { | ||
CameraStateParameters, | ||
useCameraStateControl | ||
} from '../../../../../src/components/RevealCanvas/hooks/useCameraStateControl'; | ||
import { Vector3 } from 'three'; | ||
import { cameraManagerGlobalCameraEvents } from '../../../fixtures/cameraManager'; | ||
|
||
vi.mock('../../../../../src/components/RevealCanvas/ViewerContext', () => ({ | ||
useReveal: () => viewerMock | ||
})); | ||
|
||
describe(useCameraStateControl.name, () => { | ||
beforeEach(() => { | ||
vi.resetAllMocks(); | ||
}); | ||
|
||
beforeAll(() => { | ||
vi.useFakeTimers(); | ||
}); | ||
|
||
afterAll(() => { | ||
vi.useRealTimers(); | ||
}); | ||
|
||
test('does nothing when inputs are undefined', () => { | ||
const { rerender } = renderHook(() => useCameraStateControl()); | ||
|
||
vi.runAllTimers(); | ||
rerender(); | ||
vi.runAllTimers(); | ||
|
||
cameraManagerGlobalCameraEvents.cameraStop.forEach((mockCallback) => | ||
expect(mockCallback).not.toBeCalled() | ||
); | ||
}); | ||
|
||
test('does nothing if external camera state is undefined', () => { | ||
const setter = vi.fn(); | ||
const { rerender } = renderHook(() => useCameraStateControl(undefined, setter)); | ||
|
||
vi.runAllTimers(); | ||
rerender(); | ||
vi.runAllTimers(); | ||
|
||
expect(setter).not.toBeCalled(); | ||
}); | ||
|
||
test('calls internal cameraStop delegates but not external setter on applying external camera state', () => { | ||
const setter = vi.fn<[CameraStateParameters | undefined], void>(); | ||
|
||
const { rerender } = renderHook( | ||
({ position }: { position: Vector3 }) => | ||
useCameraStateControl({ position: position.clone(), target: new Vector3(1, 1, 1) }, setter), | ||
{ initialProps: { position: new Vector3(0, 0, 0) } } | ||
); | ||
|
||
vi.runAllTimers(); | ||
rerender({ position: new Vector3(1, 0, 0) }); | ||
|
||
vi.runAllTimers(); | ||
expect(setter).not.toBeCalled(); | ||
|
||
cameraManagerGlobalCameraEvents.cameraStop.forEach((mockCallback) => | ||
expect(mockCallback).toBeCalledTimes(1) | ||
); | ||
}); | ||
|
||
test('provided setter is called after updating camera state internally', () => { | ||
const setter = vi.fn<[CameraStateParameters | undefined], void>(); | ||
|
||
const { rerender } = renderHook(() => | ||
useCameraStateControl( | ||
{ position: new Vector3(0, 0, 0), target: new Vector3(1, 1, 1) }, | ||
setter | ||
) | ||
); | ||
|
||
vi.runAllTimers(); | ||
|
||
viewerMock.cameraManager.setCameraState({ | ||
position: new Vector3(1, 0, 0), | ||
target: new Vector3(1, 1, 1) | ||
}); | ||
|
||
vi.runAllTimers(); | ||
|
||
rerender(); | ||
vi.runAllTimers(); | ||
|
||
expect(setter).toHaveBeenCalled(); | ||
}); | ||
}); |
Oops, something went wrong.