-
-
Notifications
You must be signed in to change notification settings - Fork 246
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* refactor: remove categorizedasset type * add prefab components from drag and drop * label for resource items * correct eslint error * double click to place prefab at origin * add drop on hierarchypanel * convert animated model to simple model * update packages * update for prefab asset and model component * add defult prefabs * update for asset load * update with ui and changes * implement dereference WIP. Add GLTF <-> SceneJSON conversion helpers * add uuid component * integrate model component into GLTFState * remove more SceneState references * remove PrefabComponents * remove old prefab conditional * fix child entity indexing apply parent transform before deletion * correctly manage transform component conversion to gltf * fix editor control functions test * re-add prefab type * ci/cd * more ci/cd --------- Co-authored-by: aditya-mitra <55396651+aditya-mitra@users.noreply.github.com> Co-authored-by: David Gordon <david@hyperconstruct.io> Co-authored-by: David Gordon <94419856+dinomut1@users.noreply.github.com>
- Loading branch information
4 people
committed
May 17, 2024
1 parent
b52f880
commit af6fb0b
Showing
21 changed files
with
607 additions
and
51 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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /* | ||
| CPAL-1.0 License | ||
| The contents of this file are subject to the Common Public Attribution License | ||
| Version 1.0. (the "License"); you may not use this file except in compliance | ||
| with the License. You may obtain a copy of the License at | ||
| https://github.com/EtherealEngine/etherealengine/blob/dev/LICENSE. | ||
| The License is based on the Mozilla Public License Version 1.1, but Sections 14 | ||
| and 15 have been added to cover use of software over a computer network and | ||
| provide for limited attribution for the Original Developer. In addition, | ||
| Exhibit A has been modified to be consistent with Exhibit B. | ||
| Software distributed under the License is distributed on an "AS IS" basis, | ||
| WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the | ||
| specific language governing rights and limitations under the License. | ||
| The Original Code is Ethereal Engine. | ||
| The Original Developer is the Initial Developer. The Initial Developer of the | ||
| Original Code is the Ethereal Engine team. | ||
| All portions of the code written by the Ethereal Engine team are Copyright © 2021-2023 | ||
| Ethereal Engine. All Rights Reserved. | ||
| */ | ||
| import config from '@etherealengine/common/src/config' | ||
| import { defineState } from '@etherealengine/hyperflux' | ||
|
|
||
| export const PrefabShelfCategories = defineState({ | ||
| name: 'ee.editor.PrefabShelfCategories', | ||
| initial: () => { | ||
| return { | ||
| //hardcode to test replace with parseStorageProviderURLs | ||
| 'Point Light Prefab': `${config.client.fileServer}/projects/default-project/assets/pointLight.prefab.gltf`, | ||
| 'Geometry Prefab': `${config.client.fileServer}/projects/default-project/assets/geo.prefab.gltf`, | ||
| 'Empty Prefab': 'empty' | ||
|
|
||
| //will continue to add more prefabs | ||
| } as Record<string, string> | ||
| } | ||
| }) |
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,154 @@ | ||
| /* | ||
| CPAL-1.0 License | ||
| The contents of this file are subject to the Common Public Attribution License | ||
| Version 1.0. (the "License"); you may not use this file except in compliance | ||
| with the License. You may obtain a copy of the License at | ||
| https://github.com/EtherealEngine/etherealengine/blob/dev/LICENSE. | ||
| The License is based on the Mozilla Public License Version 1.1, but Sections 14 | ||
| and 15 have been added to cover use of software over a computer network and | ||
| provide for limited attribution for the Original Developer. In addition, | ||
| Exhibit A has been modified to be consistent with Exhibit B. | ||
| Software distributed under the License is distributed on an "AS IS" basis, | ||
| WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the | ||
| specific language governing rights and limitations under the License. | ||
| The Original Code is Ethereal Engine. | ||
| The Original Developer is the Initial Developer. The Initial Developer of the | ||
| Original Code is the Ethereal Engine team. | ||
| All portions of the code written by the Ethereal Engine team are Copyright © 2021-2023 | ||
| Ethereal Engine. All Rights Reserved. | ||
| */ | ||
|
|
||
| import { startCase } from 'lodash' | ||
| import React, { useRef } from 'react' | ||
| import { useTranslation } from 'react-i18next' | ||
|
|
||
| import { getMutableState, getState, useHookstate } from '@etherealengine/hyperflux' | ||
|
|
||
| import PlaceHolderIcon from '@mui/icons-material/GroupAddOutlined' | ||
| import { List, ListItemButton, ListItemIcon, ListItemText } from '@mui/material' | ||
|
|
||
| import InputText from '@etherealengine/client-core/src/common/components/InputText' | ||
| import { ComponentJsonType } from '@etherealengine/engine/src/scene/types/SceneTypes' | ||
| import Typography from '@etherealengine/ui/src/primitives/mui/Typography' | ||
| import { ComponentEditorsState } from '../../functions/ComponentEditors' | ||
| import { EditorControlFunctions } from '../../functions/EditorControlFunctions' | ||
| import { addMediaNode } from '../../functions/addMediaNode' | ||
| import { usePopoverContextClose } from '../element/PopoverContext' | ||
| import { PrefabShelfCategories } from './PrefabEditors' | ||
|
|
||
| const PrefabListItem = ({ item }: { item: string }) => { | ||
| const { t } = useTranslation() | ||
| const Icon = getState(ComponentEditorsState)[item]?.iconComponent ?? PlaceHolderIcon | ||
| const handleClosePopover = usePopoverContextClose() | ||
|
|
||
| return ( | ||
| <ListItemButton | ||
| sx={{ pl: 4, bgcolor: 'var(--dockBackground)' }} | ||
| onClick={() => { | ||
| const PrefabNameShelfCategories = getState(PrefabShelfCategories) | ||
| const componentJsons: ComponentJsonType[] = [] | ||
| const url = PrefabNameShelfCategories[item] | ||
| // PrefabNameShelfCategories[item].forEach((component) => { | ||
| // componentJsons.push({ name: component.jsonID as string }) | ||
| // }) | ||
| //EditorControlFunctions.createObjectFromSceneElement(componentJsons) | ||
|
|
||
| //add prefab gltfs in the scene via add media node | ||
| if (url === 'empty') { | ||
| EditorControlFunctions.createObjectFromSceneElement() | ||
| } else { | ||
| //inside add media use dereference for model component | ||
| addMediaNode(url) | ||
| } | ||
|
|
||
| handleClosePopover() | ||
| }} | ||
| > | ||
| <ListItemIcon style={{ color: 'var(--textColor)' }}> | ||
| <Icon /> | ||
| </ListItemIcon> | ||
| <ListItemText | ||
| primary={ | ||
| <Typography variant="subtitle1" color={'var(--textColor)'}> | ||
| {startCase(item.replace('-', ' ').toLowerCase())} | ||
| </Typography> | ||
| } | ||
| secondary={ | ||
| <Typography variant="caption" color={'var(--textColor)'}> | ||
| {t(`editor:layout.assetGrid.component-detail.${item}`)} | ||
| </Typography> | ||
| } | ||
| /> | ||
| </ListItemButton> | ||
| ) | ||
| } | ||
| const ScenePrefabListItem = ({ categoryItems }: { categoryItems: string[]; isCollapsed: boolean }) => { | ||
| return ( | ||
| <> | ||
| <List component={'div'} sx={{ bgcolor: 'var(--dockBackground)', width: '100%' }} disablePadding> | ||
| {categoryItems.map((item) => ( | ||
| <PrefabListItem item={item} /> | ||
| ))} | ||
| </List> | ||
| </> | ||
| ) | ||
| } | ||
|
|
||
| const usePrefabShelfCategories = (search: string) => { | ||
| useHookstate(getMutableState(PrefabShelfCategories)).value | ||
|
|
||
| if (!search) { | ||
| return Object.entries(getState(PrefabShelfCategories)) | ||
| } | ||
|
|
||
| const searchRegExp = new RegExp(search, 'gi') | ||
|
|
||
| return Object.entries(getState(PrefabShelfCategories)) | ||
| .map(([category, items]) => { | ||
| const filteredcategory = category.match(searchRegExp)?.length ? category : '' | ||
| return [filteredcategory, items] as [string, string] | ||
| }) | ||
| .filter(([_, items]) => !!items.length) | ||
| } | ||
|
|
||
| export function PrefabList() { | ||
| const { t } = useTranslation() | ||
| const search = useHookstate({ local: '', query: '' }) | ||
| const searchTimeout = useRef<ReturnType<typeof setTimeout> | null>(null) | ||
| const shelves = usePrefabShelfCategories(search.query.value) | ||
| const shelveslist: string[] = [] | ||
| shelves.map(([category, items]) => { | ||
| shelveslist.push(category) | ||
| }) | ||
|
|
||
| const onSearch = (text: string) => { | ||
| search.local.set(text) | ||
| if (searchTimeout.current) clearTimeout(searchTimeout.current) | ||
| searchTimeout.current = setTimeout(() => { | ||
| search.query.set(text) | ||
| }, 50) | ||
| } | ||
|
|
||
| return ( | ||
| <List | ||
| sx={{ width: 300, height: 900, bgcolor: 'var(--dockBackground)' }} | ||
| subheader={ | ||
| <div style={{ padding: '0.5rem' }}> | ||
| <Typography style={{ color: 'var(--textColor)', textAlign: 'center', textTransform: 'uppercase' }}> | ||
| {t('editor:layout.assetGrid.prefab')} | ||
| </Typography> | ||
| <InputText | ||
| placeholder={t('editor:layout.assetGrid.prefab-search')} | ||
| value={search.local.value} | ||
| sx={{ mt: 1 }} | ||
| onChange={(e) => onSearch(e.target.value)} | ||
| /> | ||
| </div> | ||
| } | ||
| > | ||
| <ScenePrefabListItem categoryItems={shelveslist} isCollapsed={!!search.query.value} /> | ||
| </List> | ||
| ) | ||
| } | ||
|
|
||
| export default PrefabList |
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
Oops, something went wrong.