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

8133 studio should have render settings exposed #8263

Merged
merged 11 commits into from
Jul 13, 2023
Merged

8133 studio should have render settings exposed #8263

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5af689c
move use shadows and postprocessing to render settings editor
SYBIOTE Jul 11, 2023
dbf5871
Merge branch 'dev' into 8133-studio-should-have-render-settings-exposed
SYBIOTE Jul 11, 2023
ef37b28
Merge branch 'dev' of https://github.com/EtherealEngine/etherealengin…
HexaField Jul 12, 2023
f01464c
create render settings modal
SYBIOTE Jul 12, 2023
a435da0
Merge branch '8133-studio-should-have-render-settings-exposed' of htt…
SYBIOTE Jul 12, 2023
c6fdbd6
Merge branch 'dev' into 8133-studio-should-have-render-settings-exposed
SYBIOTE Jul 12, 2023
2f905dc
swicth reolution to shadowmap resolution
SYBIOTE Jul 12, 2023
d46780f
update csm reactor and impl
HexaField Jul 13, 2023
d356044
license
HexaField Jul 13, 2023
e9540d5
Merge branch 'dev' of https://github.com/EtherealEngine/etherealengin…
HexaField Jul 13, 2023
ef99c4c
Merge branch '8133-studio-should-have-render-settings-exposed' of htt…
HexaField Jul 13, 2023
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
4 changes: 4 additions & 0 deletions packages/client-core/i18n/en/editor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,10 @@
"lbl-lods": "LODs",
"info-lods": "Sets the distances at which levels of detail change.",
"lbl-rendererSettings": "Override Renderer Settings",
"lbl-usePostProcessing": "Use Post Processing",
"info-usePostProcessing": "Enables post processing",
"lbl-useShadows": "Use Shadows",
"info-useShadows": "Enables shadows",
"lbl-csm": "Cascading Shadow Maps",
"info-csm": "Enables cascading shadow maps.",
"lbl-toneMapping": "Tone Mapping",
Expand Down
37 changes: 29 additions & 8 deletions packages/editor/src/components/properties/RenderSettingsEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ All portions of the code written by the Ethereal Engine team are Copyright © 20
Ethereal Engine. All Rights Reserved.
*/

import { useHookstate } from '@hookstate/core'
import React from 'react'
import { useTranslation } from 'react-i18next'
import {
Expand All @@ -40,7 +41,9 @@ import {
} from 'three'

import { useComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions'
import { RendererState } from '@etherealengine/engine/src/renderer/RendererState'
import { RenderSettingsComponent } from '@etherealengine/engine/src/scene/components/RenderSettingsComponent'
import { getMutableState } from '@etherealengine/hyperflux'

import BooleanInput from '../inputs/BooleanInput'
import CompoundNumericInput from '../inputs/CompoundNumericInput'
Expand Down Expand Up @@ -107,19 +110,37 @@ const ShadowTypeOptions = [

export const RenderSettingsEditor: EditorComponentType = (props) => {
const { t } = useTranslation()
const rendererState = useComponent(props.entity, RenderSettingsComponent)
const rendererSettingsState = useComponent(props.entity, RenderSettingsComponent)
const rendererState = useHookstate(getMutableState(RendererState))

return (
<PropertyGroup
name={t('editor:properties.renderSettings.name')}
description={t('editor:properties.renderSettings.description')}
>
<InputGroup
name="Use Post Processing"
HexaField marked this conversation as resolved.
Show resolved Hide resolved
label={t('editor:properties.renderSettings.lbl-usePostProcessing')}
info={t('editor:properties.renderSettings.info-usePostProcessing')}
>
<BooleanInput
value={rendererState.usePostProcessing.value}
onChange={(val) => rendererState.usePostProcessing.set(val)}
/>
</InputGroup>
<InputGroup
name="Use Shadows"
label={t('editor:properties.renderSettings.lbl-useShadows')}
info={t('editor:properties.renderSettings.info-useShadows')}
>
<BooleanInput value={rendererState.useShadows.value} onChange={(val) => rendererState.useShadows.set(val)} />
</InputGroup>
<InputGroup
name="Use Cascading Shadow Maps"
label={t('editor:properties.renderSettings.lbl-csm')}
info={t('editor:properties.renderSettings.info-csm')}
>
<BooleanInput value={rendererState.csm.value} onChange={(val) => rendererState.csm.set(val)} />
<BooleanInput value={rendererSettingsState.csm.value} onChange={(val) => rendererSettingsState.csm.set(val)} />
</InputGroup>
<InputGroup
name="Tone Mapping"
Expand All @@ -128,8 +149,8 @@ export const RenderSettingsEditor: EditorComponentType = (props) => {
>
<SelectInput
options={ToneMappingOptions}
value={rendererState.toneMapping.value}
onChange={(val: ToneMapping) => rendererState.toneMapping.set(val)}
value={rendererSettingsState.toneMapping.value}
onChange={(val: ToneMapping) => rendererSettingsState.toneMapping.set(val)}
/>
</InputGroup>
<InputGroup
Expand All @@ -141,8 +162,8 @@ export const RenderSettingsEditor: EditorComponentType = (props) => {
min={0}
max={10}
step={0.1}
value={rendererState.toneMappingExposure.value}
onChange={(val) => rendererState.toneMappingExposure.set(val)}
value={rendererSettingsState.toneMappingExposure.value}
onChange={(val) => rendererSettingsState.toneMappingExposure.set(val)}
/>
</InputGroup>
<InputGroup
Expand All @@ -152,8 +173,8 @@ export const RenderSettingsEditor: EditorComponentType = (props) => {
>
<SelectInput
options={ShadowTypeOptions}
value={rendererState.shadowMapType.value ?? -1}
onChange={(val: ShadowMapType) => rendererState.shadowMapType.set(val)}
value={rendererSettingsState.shadowMapType.value ?? -1}
onChange={(val: ShadowMapType) => rendererSettingsState.shadowMapType.set(val)}
/>
</InputGroup>
</PropertyGroup>
Expand Down