-
Notifications
You must be signed in to change notification settings - Fork 0
Components #3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Components #3
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
0617096
PlanetCamera component
pavletto b797b30
extend layer base component with handlers
pavletto 8f8b557
pass lon lat alt into entity when create
pavletto 3c426f0
add layer to xyz
pavletto 6f0d670
add layer to xyz
pavletto db0aac6
bump versions
pavletto File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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,38 @@ | ||
| import React from 'react'; | ||
| import type {Meta, StoryObj} from '@storybook/react'; | ||
|
|
||
| import {Globe, GlobeContextProvider} from "@/Globe"; | ||
| import {PlanetCamera, PlanetCameraParams} from "@/camera/PlanetCamera/PlanetCamera"; | ||
|
|
||
| /** | ||
| * This story about Billboard component. Billboard is a component that represents a 2d object which always faced to camera. | ||
| */ | ||
| const meta = { | ||
| component: PlanetCamera, | ||
| title: 'Components/Camera/PlanetCamera', | ||
| } satisfies Meta<typeof PlanetCamera>; | ||
|
|
||
| export default meta; | ||
|
|
||
| type Story = StoryObj<typeof meta>; | ||
|
|
||
| export const Default: { | ||
| args: PlanetCameraParams | ||
| render: (args: PlanetCameraParams) => React.JSX.Element | ||
| } = { | ||
|
|
||
| args: { | ||
| lon: 0, | ||
| lat: 0, | ||
| alt: 100000, | ||
| lookLon: 10, | ||
| lookLat: 10, | ||
| lookAlt: 100000, | ||
| viewAngle:47 | ||
| }, | ||
| render: (args: PlanetCameraParams) => <GlobeContextProvider> | ||
| <Globe> | ||
| <PlanetCamera {...args} /> | ||
| </Globe> | ||
| </GlobeContextProvider> | ||
| }; |
This file contains hidden or 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,46 @@ | ||
| import * as React from "react"; | ||
| import {useEffect} from "react"; | ||
| import {LonLat} from "@openglobus/og"; | ||
| import {IPlanetCameraParams} from "@openglobus/og/lib/js/camera/PlanetCamera"; | ||
| import {useGlobeContext} from "@/Globe"; | ||
|
|
||
| export interface PlanetCameraParams extends IPlanetCameraParams { | ||
| lon?: number; | ||
| lat?: number; | ||
| alt?: number; | ||
| yaw?: number; | ||
| viewAngle?: number; | ||
| lookLon?: number; | ||
| lookLat?: number; | ||
| lookAlt?: number; | ||
| } | ||
|
|
||
| const PlanetCamera: React.FC<PlanetCameraParams> = ({ | ||
| lon, | ||
| lat, | ||
| alt, | ||
| lookLon, | ||
| lookLat, | ||
| lookAlt, | ||
| viewAngle, | ||
| ...params | ||
| }) => { | ||
| const {globe} = useGlobeContext(); | ||
|
|
||
|
|
||
| useEffect(() => { | ||
| if (globe && typeof lon === "number" && typeof lat === "number" && typeof alt === "number") { | ||
| globe.planet.flyLonLat(new LonLat(lon, lat, alt), new LonLat(lookLon, lookLat, lookAlt)) | ||
| } | ||
| }, [lon, lat, alt, lookLon, lookLat, lookAlt, globe]); | ||
|
|
||
| useEffect(() => { | ||
| if (globe && typeof viewAngle === "number") { | ||
| globe.planet.camera.setViewAngle(viewAngle) | ||
| } | ||
| }, [viewAngle, globe]); | ||
|
|
||
| return null; | ||
| }; | ||
|
|
||
| export {PlanetCamera}; |
This file contains hidden or 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 hidden or 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,76 @@ | ||
| import type {Meta, StoryObj} from '@storybook/react'; | ||
|
|
||
| import {Billboard, Entity} from "@/entity"; | ||
| import {Globe, GlobeContextProvider} from "@/Globe"; | ||
| import {action} from '@storybook/addon-actions'; | ||
| import React from "react"; | ||
| import {Layer, Vector, VectorProps} from "@/layer"; | ||
|
|
||
| const meta = { | ||
| title: 'Components/Layer/Layer', | ||
| component: Layer, | ||
| } satisfies Meta<typeof Layer>; | ||
|
|
||
| export default meta; | ||
|
|
||
| type Story = StoryObj<typeof meta>; | ||
|
|
||
|
|
||
| export const Default: Story = { | ||
| parameters: { | ||
| actions: {depth: 1, maxDepth: 1}, | ||
| }, | ||
| argTypes: { | ||
| onVisibilityChange: {table: {disable: true}}, | ||
| onAdd: {table: {disable: true}}, | ||
| onRemove: {table: {disable: true}}, | ||
| onMouseMove: {table: {disable: true}}, | ||
| onMouseEnter: {table: {disable: true}}, | ||
| onMouseLeave: {table: {disable: true}}, | ||
| onLclick: {table: {disable: true}}, | ||
| onRclick: {table: {disable: true}}, | ||
| onMclick: {table: {disable: true}}, | ||
| onLdblclick: {table: {disable: true}}, | ||
| onRdblclick: {table: {disable: true}}, | ||
| onMdblclick: {table: {disable: true}}, | ||
| onLup: {table: {disable: true}}, | ||
| onRup: {table: {disable: true}}, | ||
| onMup: {table: {disable: true}}, | ||
| onLdown: {table: {disable: true}}, | ||
| onRdown: {table: {disable: true}}, | ||
| onMdown: {table: {disable: true}}, | ||
| onLhold: {table: {disable: true}}, | ||
| onRhold: {table: {disable: true}}, | ||
| onMhold: {table: {disable: true}}, | ||
| onMouseWheel: {table: {disable: true}}, | ||
| onTouchMove: {table: {disable: true}}, | ||
| onTouchStart: {table: {disable: true}}, | ||
| onTouchEnd: {table: {disable: true}}, | ||
| onDoubleTouch: {table: {disable: true}}, | ||
| onTouchLeave: {table: {disable: true}}, | ||
| onTouchEnter: {table: {disable: true}}, | ||
| }, | ||
| args: { | ||
| name: 'test', | ||
| onMouseEnter: action('onMouseEnter', {depth: 1, maxDepth: 1}), | ||
| onLclick: action('onLclick', {depth: 1, maxDepth: 1}), | ||
| onMouseLeave: action('onMouseLeave', {depth: 1, maxDepth: 1}), | ||
| onMouseMove: action('onMouseMove', {depth: 1, maxDepth: 1}), | ||
| onLdblclick: action('onLdblclick', {depth: 1, maxDepth: 1}), | ||
| // onDraw: action('onDraw', {depth: 1, maxDepth: 1}), | ||
| }, | ||
| render: (args: VectorProps) => <GlobeContextProvider> | ||
| <Globe> | ||
| <Vector {...args}> | ||
| <Entity name="Custom Entity" lon={0} lat={0} alt={0}> | ||
| <Billboard | ||
| size={[96, 96]} | ||
| color={"#ff5959"} | ||
| src={'https://openglobus.org/examples/examples/billboards/carrot.png'} | ||
| /> | ||
| </Entity> | ||
| </Vector> | ||
| </Globe> | ||
| </GlobeContextProvider> | ||
| }; | ||
|
|
This file contains hidden or 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 |
|---|---|---|
| @@ -1,23 +1,93 @@ | ||
| import * as React from 'react'; | ||
| import {useEffect} from 'react'; | ||
| import {useGlobeContext} from '@/Globe'; | ||
| import {ILayerParams, Layer as GlobusLayer} from '@openglobus/og'; | ||
| import {EventCallback} from '@openglobus/og/lib/js/Events'; | ||
|
|
||
| const Layer = ({props, name}: { props: ILayerParams, name: string }) => { | ||
| const {globe} = useGlobeContext(); | ||
| export interface LayerProps extends ILayerParams { | ||
| name: string | ||
| layerRef?: React.MutableRefObject<GlobusLayer | null>, | ||
| children?: React.ReactNode; | ||
| onVisibilityChange?: EventCallback; | ||
| onAdd?: EventCallback; | ||
| onRemove?: EventCallback; | ||
| onMouseMove?: EventCallback; | ||
| onMouseEnter?: EventCallback; | ||
| onMouseLeave?: EventCallback; | ||
| onLclick?: EventCallback; | ||
| onRclick?: EventCallback; | ||
| onMclick?: EventCallback; | ||
| onLdblclick?: EventCallback; | ||
| onRdblclick?: EventCallback; | ||
| onMdblclick?: EventCallback; | ||
| onLup?: EventCallback; | ||
| onRup?: EventCallback; | ||
| onMup?: EventCallback; | ||
| onLdown?: EventCallback; | ||
| onRdown?: EventCallback; | ||
| onMdown?: EventCallback; | ||
| onLhold?: EventCallback; | ||
| onRhold?: EventCallback; | ||
| onMhold?: EventCallback; | ||
| onMouseWheel?: EventCallback; | ||
| onTouchMove?: EventCallback; | ||
| onTouchStart?: EventCallback; | ||
| onTouchEnd?: EventCallback; | ||
| onDoubleTouch?: EventCallback; | ||
| onTouchLeave?: EventCallback; | ||
| onTouchEnter?: EventCallback; | ||
| } | ||
|
|
||
| const Layer: React.FC<LayerProps> = ({opacity, children, name, layerRef, ...params}) => { | ||
| const [refPassed, setRefPassed] = React.useState(false); | ||
| useEffect(() => { | ||
| if (globe) { | ||
| const newLayer = new GlobusLayer(name, props); | ||
| globe.planet.addLayer(newLayer); | ||
|
|
||
| return () => { | ||
| globe.planet.removeLayer(newLayer); | ||
| }; | ||
| if (layerRef) { | ||
| if (layerRef.current && typeof opacity === 'number' && refPassed) { | ||
| layerRef.current.opacity = opacity; | ||
| } | ||
| } | ||
| }, [globe]); | ||
|
|
||
| return null; | ||
| }, [opacity]); | ||
| useEffect(() => { | ||
| if (refPassed && layerRef && layerRef.current) { | ||
| if (params.onVisibilityChange) layerRef.current?.events.on("visibilitychange", params.onVisibilityChange) | ||
| if (params.onAdd) layerRef.current?.events.on("add", params.onAdd) | ||
| if (params.onRemove) layerRef.current?.events.on("remove", params.onRemove) | ||
| if (params.onMouseMove) layerRef.current?.events.on("mousemove", params.onMouseMove) | ||
| if (params.onMouseEnter) layerRef.current?.events.on("mouseenter", params.onMouseEnter) | ||
| if (params.onMouseLeave) layerRef.current?.events.on("mouseleave", params.onMouseLeave) | ||
| if (params.onLclick) layerRef.current?.events.on("lclick", params.onLclick) | ||
| if (params.onRclick) layerRef.current?.events.on("rclick", params.onRclick) | ||
| if (params.onMclick) layerRef.current?.events.on("mclick", params.onMclick) | ||
| if (params.onLdblclick) layerRef.current?.events.on("ldblclick", params.onLdblclick) | ||
| if (params.onRdblclick) layerRef.current?.events.on("rdblclick", params.onRdblclick) | ||
| if (params.onMdblclick) layerRef.current?.events.on("mdblclick", params.onMdblclick) | ||
| if (params.onLup) layerRef.current?.events.on("lup", params.onLup) | ||
| if (params.onRup) layerRef.current?.events.on("rup", params.onRup) | ||
| if (params.onMup) layerRef.current?.events.on("mup", params.onMup) | ||
| if (params.onLdown) layerRef.current?.events.on("ldown", params.onLdown) | ||
| if (params.onRdown) layerRef.current?.events.on("rdown", params.onRdown) | ||
| if (params.onMdown) layerRef.current?.events.on("mdown", params.onMdown) | ||
| if (params.onLhold) layerRef.current?.events.on("lhold", params.onLhold) | ||
| if (params.onRhold) layerRef.current?.events.on("rhold", params.onRhold) | ||
| if (params.onMhold) layerRef.current?.events.on("mhold", params.onMhold) | ||
| if (params.onMouseWheel) layerRef.current?.events.on("mousewheel", params.onMouseWheel) | ||
| if (params.onTouchMove) layerRef.current?.events.on("touchmove", params.onTouchMove) | ||
| if (params.onTouchStart) layerRef.current?.events.on("touchstart", params.onTouchStart) | ||
| if (params.onTouchEnd) layerRef.current?.events.on("touchend", params.onTouchEnd) | ||
| if (params.onDoubleTouch) layerRef.current?.events.on("doubletouch", params.onDoubleTouch) | ||
| } | ||
| return () => { | ||
| if (params.onLclick) layerRef?.current?.events.off('lclick', params.onLclick) | ||
| setRefPassed(false) | ||
| } | ||
| }, [refPassed]); | ||
| if (layerRef?.current && !refPassed) { | ||
| setRefPassed(true) | ||
| } | ||
| return ( | ||
| <> | ||
| {children} | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export {Layer}; | ||
|
|
||
This file contains hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No need ? here Already checked
layerRef.currentabove