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.

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

wip: make MaterialInstance params configurable #252

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Changes from all commits
Commits
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
48 changes: 46 additions & 2 deletions package/src/react/EntitySelector.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useContext, useMemo } from 'react'
import { ParentInstancesContext } from './ParentInstancesContext'
import { Entity, extractTransformationProps, TextureFlags, TransformationProps } from '../types'
import { Entity, extractTransformationProps, Float3, Float4, Mat3f, TextureFlags, TransformationProps } from '../types'
import { useFilamentContext } from '../hooks/useFilamentContext'
import React from 'react'
import { useApplyTransformations } from '../hooks/internal/useApplyTransformations'
Expand All @@ -21,8 +21,31 @@ export type TextureMap = {
textureFlags?: TextureFlags
}

export type ParameterType =
| {
type: 'Float3'
value: Float3
}
| {
type: 'Float4'
value: Float4
}
| {
type: 'Float'
value: number
}
| {
type: 'Int'
value: number
}
| {
type: 'Mat3f'
value: Mat3f
}

export type ModifierProps = TransformationProps & {
textureMap?: TextureMap
parameters?: Record<string, ParameterType>
}

export type EntitySelectorProps = SelectorProps & ModifierProps
Expand Down Expand Up @@ -77,9 +100,30 @@ type ImplProps = {
* @private
*/
function EntitySelectorImpl(props: ImplProps) {
const [transformProps, { entity, textureMap }] = extractTransformationProps(props)
const [transformProps, { entity, textureMap, parameters }] = extractTransformationProps(props)
useApplyTransformations({ to: entity, transformProps })

useWorkletEffect(() => {
'worklet'

// TODO: oh, this operates on a material instance, we'd need ot have a "MaterialSelector"
// The material selector probably should be addable as a child component to an entity selector.
// However, often times a material is used for multiple entities, and it would also be nice to have it apply to all?
Object.entries(parameters ?? {}).forEach(([name, { type, value }]) => {
if (type === 'Float3') {
entity.setFloat3Parameter(name, value)
} else if (type === 'Float4') {
entity.setFloat4Parameter(name, value)
} else if (type === 'Float') {
entity.setFloatParameter(name, value)
} else if (type === 'Int') {
entity.setIntParameter(name, value)
} else if (type === 'Mat3f') {
entity.setMat3fParameter(name, value)
}
})
})

return <>{textureMap != null && <TextureModifier entity={entity} {...textureMap} />}</>
}

Expand Down