-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Vertical scaling for section view (#1933)
Adds `verticalScale` factor to `ViewportType` to control vertical scaling in `OrthographicView`.
- Loading branch information
Showing
6 changed files
with
182 additions
and
21 deletions.
There are no files selected for viewing
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
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
Binary file added
BIN
+14.2 KB
...book/examples/__image_snapshots__/subsurfaceviewer-examples-camera--scale-y.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
69 changes: 69 additions & 0 deletions
69
typescript/packages/subsurface-viewer/src/utils/camera.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,69 @@ | ||
| import "jest"; | ||
|
|
||
| import { getZoom, useLateralZoom } from "./camera"; | ||
| import type { ViewStateType, ViewportType } from "../components/Map"; | ||
| import { renderHook } from "@testing-library/react"; | ||
|
|
||
| describe("Test zoom", () => { | ||
| const defaultZoom = 3; | ||
|
|
||
| it("Test default zoom", () => { | ||
| const viewport: ViewportType = { id: "" }; | ||
| const zoom = getZoom(viewport, defaultZoom); | ||
| expect(zoom).toEqual(defaultZoom); | ||
| }); | ||
|
|
||
| it("Test zoom override", () => { | ||
| const viewport: ViewportType = { id: "", zoom: 10 }; | ||
| const zoom = getZoom(viewport, defaultZoom); | ||
| expect(zoom).toEqual(viewport.zoom); | ||
| }); | ||
|
|
||
| it("Test vertical scale", () => { | ||
| const viewport: ViewportType = { id: "", zoom: 10, verticalScale: 4 }; | ||
| const zoom = getZoom(viewport, defaultZoom); | ||
| expect(zoom).toEqual([viewport.zoom, 5]); | ||
| }); | ||
|
|
||
| it("Test zero scale", () => { | ||
| const viewport: ViewportType = { id: "", zoom: 10, verticalScale: 0 }; | ||
| const zoom = getZoom(viewport, defaultZoom); | ||
| expect(zoom).toEqual(viewport.zoom); | ||
| }); | ||
|
|
||
| it("Test negative scale", () => { | ||
| const viewport: ViewportType = { id: "", zoom: 10, verticalScale: -1 }; | ||
| const zoom = getZoom(viewport, defaultZoom); | ||
| expect(zoom).toEqual([viewport.zoom, 10]); | ||
| }); | ||
| }); | ||
|
|
||
| describe("Test lateral zoom hook", () => { | ||
| it("Test no zoom", () => { | ||
| const viewState: Record<string, ViewStateType> = {}; | ||
|
|
||
| const { result } = renderHook(() => useLateralZoom(viewState)); | ||
|
|
||
| expect(result.current).toEqual(-5); | ||
| }); | ||
|
|
||
| it("Test zero zoom", () => { | ||
| const viewState: Record<string, ViewStateType> = { | ||
| a: { zoom: 0, target: [0, 0], rotationX: 0, rotationOrbit: 0 }, | ||
| }; | ||
|
|
||
| const { result } = renderHook(() => useLateralZoom(viewState)); | ||
|
|
||
| expect(result.current).toEqual(viewState["a"].zoom); | ||
| }); | ||
|
|
||
| it("Test scaled zoom", () => { | ||
| const viewState: Record<string, ViewStateType> = { | ||
| a: { zoom: [5, 6], target: [0, 0], rotationX: 0, rotationOrbit: 0 }, | ||
| }; | ||
|
|
||
| const { result } = renderHook(() => useLateralZoom(viewState)); | ||
|
|
||
| expect(result.current).toEqual(5); | ||
| }); | ||
| }); |
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,25 @@ | ||
| import React from "react"; | ||
| import type { ViewStateType, ViewportType } from "../components/Map"; | ||
| import _ from "lodash"; | ||
|
|
||
| export const getZoom = (viewport: ViewportType, fb_zoom: number) => { | ||
| const zoom = viewport.zoom ?? fb_zoom; | ||
| const scaledZoom: [number, number] = [ | ||
| zoom, | ||
| zoom / Math.sqrt(Math.max(viewport.verticalScale || 0, 0) || 1), | ||
| ]; | ||
|
|
||
| return viewport.verticalScale ? scaledZoom : zoom; | ||
| }; | ||
|
|
||
| export const useLateralZoom = (viewState: Record<string, ViewStateType>) => { | ||
| return React.useMemo(() => { | ||
| const zoom = _.find(viewState)?.zoom; | ||
|
|
||
| if (_.isArray(zoom)) { | ||
| return zoom[0]; | ||
| } else { | ||
| return zoom ?? -5; | ||
| } | ||
| }, [viewState]); | ||
| }; |