Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Introduce Prefab System #10047

Draft
wants to merge 10 commits into
base: dev
Choose a base branch
from
Draft

Introduce Prefab System #10047

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a0422c3
add prefab ui and popup list
JT00y Apr 8, 2024
aeed25c
Merge branch 'dev' of https://github.com/EtherealEngine/etherealengin…
JT00y Apr 9, 2024
f7d04c3
Merge branch 'dev' of https://github.com/EtherealEngine/etherealengin…
JT00y Apr 15, 2024
8bcfd8e
update prefab list and add studio mode toggle
JT00y Apr 15, 2024
807cf84
Merge branch 'dev' into 10034-introduce-prefab-system
HexaField Apr 17, 2024
0b07cae
Merge branch 'dev' of https://github.com/EtherealEngine/etherealengin…
JT00y Apr 18, 2024
96f3aa9
Merge branch '10034-introduce-prefab-system' of https://github.com/Et…
JT00y Apr 18, 2024
abe8404
Merge branch 'dev' of https://github.com/EtherealEngine/etherealengin…
JT00y Apr 22, 2024
842489c
update for front end
JT00y Apr 22, 2024
e94e3dc
fix conditional statement
JT00y Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions packages/editor/src/components/element/PropertiesPanelContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import { EntityUUID } from '@etherealengine/ecs'
import { MaterialSelectionState } from '@etherealengine/engine/src/scene/materials/MaterialLibraryState'
import { Popover } from '@mui/material'
import { ComponentEditorsState } from '../../functions/ComponentEditors'
import { EditorHelperState } from '../../services/EditorHelperState'
import { EditorState } from '../../services/EditorServices'
import { SelectionState } from '../../services/SelectionServices'
import { PropertiesPanelButton } from '../inputs/Button'
Expand Down Expand Up @@ -62,7 +63,7 @@ const EntityEditor = (props: { entityUUID: EntityUUID; multiEdit: boolean }) =>
const entity = UUIDComponent.getEntityByUUID(entityUUID)
useHookstate(getMutableState(ComponentEditorsState).keys).value
const components = useAllComponents(entity).filter((c) => !!getState(ComponentEditorsState)[c.name])

const studioMode = useHookstate(getMutableState(EditorHelperState).studioMode)
const open = !!anchorEl.value

return (
Expand All @@ -74,13 +75,16 @@ const EntityEditor = (props: { entityUUID: EntityUUID; multiEdit: boolean }) =>
}}
>
<div style={{ display: 'flex', justifyContent: 'center', marginTop: '0.5rem' }}>
<PropertiesPanelButton onClick={(event) => anchorEl.set(event.currentTarget)}>
<PropertiesPanelButton
onClick={(event) => anchorEl.set(event.currentTarget)}
style={{ display: studioMode.value === 'Simple' ? 'none' : 'block' }}
>
{t('editor:properties.lbl-addComponent')}
</PropertiesPanelButton>
</div>
<Popover
id={open ? 'add-component-popover' : undefined}
open={open}
open={open && studioMode.value == 'Advanced'}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should use === instead of ==

anchorEl={anchorEl.value}
onClose={() => anchorEl.set(null)}
anchorOrigin={{
Expand Down
5 changes: 3 additions & 2 deletions packages/editor/src/components/hierarchy/HierarchyPanelContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ function HierarchyPanelContents({ rootEntityUUID }: { rootEntityUUID: EntityUUID
const rootEntity = UUIDComponent.useEntityByUUID(rootEntityUUID)
const sceneID = useHookstate(getMutableState(EditorState).sceneID)
const index = SceneSnapshotState.useSnapshotIndex(sceneID.value!)
const studioMode = useHookstate(getMutableState(EditorHelperState).studioMode)

const MemoTreeNode = useCallback(
(props: HierarchyTreeNodeProps) => (
Expand Down Expand Up @@ -490,7 +491,7 @@ function HierarchyPanelContents({ rootEntityUUID }: { rootEntityUUID: EntityUUID
}}
onClick={(event) => {
anchorElement.set(event.currentTarget)
if (getMutableState(EditorHelperState).studioMode.value == 'Advanced') {
if (studioMode.value == 'Advanced') {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should use === instead of ==

EditorControlFunctions.createObjectFromSceneElement()
}
}}
Expand All @@ -507,7 +508,7 @@ function HierarchyPanelContents({ rootEntityUUID }: { rootEntityUUID: EntityUUID
>
<Popover
id={open ? 'add-component-popover' : undefined}
open={open && getMutableState(EditorHelperState).studioMode.value == 'Simple'}
open={open && studioMode.value == 'Simple'}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should use === instead of ==

anchorEl={anchorElement.value}
onClose={() => anchorElement.set(null)}
anchorOrigin={{
Expand Down
Loading