-
Notifications
You must be signed in to change notification settings - Fork 10
chore: update maps to latest version of ethereal engine #12
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
Draft
aditya-mitra
wants to merge
13
commits into
main
Choose a base branch
from
update-maps
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
fa4d148
update maps with the latest ethereal engine
aditya-mitra 4ad3fd0
fix: remove incorrect committed lines
aditya-mitra d0300e6
fix: incorporate corrections from reviews
aditya-mitra 2d04752
fix: .value after property
aditya-mitra 7e1381b
fix: mapfunctions and mapupdatesystems
aditya-mitra 667ba30
fix: errors in engine functions and phases
aditya-mitra cac2c48
feat: defineComponent
aditya-mitra b5d6a36
defineSystem and MapUpdateSystem
aditya-mitra 8c96b4f
mapupdatesystem and phasesfunctions
aditya-mitra a705e75
feat: update mapreceptor (as mapreceptor2) to use defineSystem
aditya-mitra c62f898
chore: rename mapreceptor2 to mapreceptor
aditya-mitra 7dc1709
chore: added debug statements in functions and phases
Legend101Zz a07815c
Merge pull request #13 from Legend101Zz/update-maps
aditya-mitra 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,13 @@ | ||
| import { prefabIcons } from '@etherealengine/editor/src/functions/PrefabEditors' | ||
| import { startSystem } from '@etherealengine/engine/src/ecs/functions/SystemFunctions' | ||
|
|
||
| import { EntityNodeEditor, prefabIcons } from '@etherealengine/editor/src/functions/PrefabEditors' | ||
| import { MapNodeEditor } from './MapNodeEditor' | ||
| import MapIcon from '@mui/icons-material/Map' | ||
| import { map } from '../worldInjection' | ||
| import { World } from '@etherealengine/engine/src/ecs/classes/World' | ||
|
|
||
| import MapUpdateSystem from '../engine/MapUpdateSystem' | ||
| import { GEO_MAP } from '../worldInjection' | ||
|
|
||
| EntityNodeEditor[map] = MapNodeEditor | ||
| prefabIcons[map] = MapIcon | ||
| export default async () => { | ||
| prefabIcons[GEO_MAP] = MapIcon | ||
|
|
||
| export default async (world: World) => { | ||
| return await MapUpdateSystem(world) | ||
| } | ||
| startSystem(MapUpdateSystem, {}) | ||
| } |
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,18 +1,69 @@ | ||
| import { createMappedComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' | ||
| import { useEffect } from 'react' | ||
| import { Vector3 } from 'three' | ||
|
|
||
| export type MapComponentType = { | ||
| apiKey: string | ||
| name?: string | ||
| scale?: Vector3 | ||
| style?: any | ||
| useTimeOfDay?: number | ||
| useDirectionalShadows?: boolean | ||
| useDeviceGeolocation?: boolean | ||
| startLatitude?: string | ||
| startLongitude?: string | ||
| showRasterTiles?: boolean | ||
| enableDebug?: boolean | ||
| } | ||
| import { isClient } from '@etherealengine/engine/src/common/functions/getEnvironment' | ||
| import { ComponentType, defineComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions' | ||
| import { useEntityContext } from '@etherealengine/engine/src/ecs/functions/EntityFunctions' | ||
|
|
||
| export const MapComponent = createMappedComponent<MapComponentType>('MapComponent') | ||
| import { _updateMap, deserializeMap, SCENE_COMPONENT_MAP } from './MapFunctions' | ||
|
|
||
| export const MapComponent = defineComponent({ | ||
| name: 'EE_maps_scene_component', | ||
| jsonID: SCENE_COMPONENT_MAP, | ||
| onInit: (entity) => { | ||
| return { | ||
| apiKey: '', | ||
| name: '', | ||
| scale: new Vector3(), | ||
| style: {}, | ||
| useTimeOfDay: 0, | ||
| useDirectionalShadows: false, | ||
| useDeviceGeolocation: false, | ||
| startLatitude: '', | ||
| startLongitude: '', | ||
| showRasterTiles: false, | ||
| enableDebug: false | ||
| } | ||
| }, | ||
| onSet: (entity, component, json) => { | ||
| if (!json) return | ||
| component.apiKey.set(json.apiKey!) | ||
| component.name.set(json.name!) | ||
| component.scale.set(json.scale!) | ||
| component.style.set(json.style!) | ||
| component.useTimeOfDay.set(json.useTimeOfDay!) | ||
| component.useDirectionalShadows.set(json.useDirectionalShadows!) | ||
| component.useDeviceGeolocation.set(json.useDeviceGeolocation!) | ||
| component.startLatitude.set(json.startLatitude!) | ||
| component.startLongitude.set(json.startLongitude!) | ||
| component.showRasterTiles.set(json.showRasterTiles!) | ||
| component.enableDebug.set(json.enableDebug!) | ||
| deserializeMap(entity, component.value) | ||
| }, | ||
| toJSON: (entity, component) => { | ||
| return { | ||
| apiKey: component.apiKey, | ||
| name: component.name, | ||
| scale: component.scale, | ||
| useTimeOfDay: component.useTimeOfDay, | ||
| useDirectionalShadows: component.useDirectionalShadows, | ||
| useDeviceGeolocation: component.useDeviceGeolocation, | ||
| startLatitude: component.startLatitude, | ||
| startLongitude: component.startLongitude, | ||
| showRasterTiles: component.showRasterTiles, | ||
| enableDebug: component.enableDebug | ||
| } | ||
| }, | ||
| reactor: () => { | ||
| if (!isClient) return null | ||
| const entity = useEntityContext() | ||
|
|
||
| useEffect(() => { | ||
| _updateMap(entity, {}) | ||
| }, [entity]) | ||
|
|
||
| return null | ||
| } | ||
| }) | ||
|
|
||
| export type MapComponentType = ComponentType<typeof MapComponent> |
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.
this should be refactored to use the
defineActionQueueAPI