Skip to content

add samples prop to <MeshPortalMaterial />, fix typing #2540

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

Open
jorgenbuilder wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add samples prop to <MeshPortalMaterial />, fix typing #2540

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions src/core/MeshPortalMaterial.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ const PortalMaterialImpl = /* @__PURE__ */ shaderMaterial(
declare module '@react-three/fiber' {
interface ThreeElements {
portalMaterialImpl: ThreeElements['shaderMaterial'] & {
resolution: ReactThreeFiber.Vector2
blur: number
blend: number
resolution?: ReactThreeFiber.Vector2
blur?: number
blend?: number
size?: number
sdf?: THREE.Texture
map?: THREE.Texture
Expand All @@ -77,6 +77,8 @@ export type PortalProps = Omit<ThreeElements['portalMaterialImpl'], 'ref' | 'ble
renderPriority?: number
/** Optionally diable events inside the portal, defaults to false */
events?: boolean
/** Optional samples, defaults to 8 */
samples?: number
}

export const MeshPortalMaterial: ForwardRefComponent<PortalProps, ThreeElements['portalMaterialImpl']> =
Expand All @@ -91,7 +93,7 @@ export const MeshPortalMaterial: ForwardRefComponent<PortalProps, ThreeElements[
worldUnits = false,
resolution = 512,
...props
},
}: PortalProps,
fref
) => {
extend({ PortalMaterialImpl })
Expand All @@ -103,7 +105,7 @@ export const MeshPortalMaterial: ForwardRefComponent<PortalProps, ThreeElements[
const [priority, setPriority] = React.useState(0)
useFrame(() => {
// If blend is > 0 then the portal is being entered, the render-priority must change
const p = ref.current.blend > 0 ? Math.max(1, renderPriority) : 0
const p = ref.current.blend && ref.current.blend > 0 ? Math.max(1, renderPriority) : 0
if (priority !== p) setPriority(p)
})

Expand Down Expand Up @@ -192,6 +194,7 @@ export const MeshPortalMaterial: ForwardRefComponent<PortalProps, ThreeElements[
eventPriority={eventPriority}
renderPriority={renderPriority}
compute={compute}
samples={props.samples}
>
{children}
<ManagePortalScene
Expand Down Expand Up @@ -280,7 +283,7 @@ function ManagePortalScene({
// This bit is only necessary if the portal is blended, now it has a render-priority
// and will take over the render loop
if (priority) {
if (material.current?.blend > 0 && material.current?.blend < 1) {
if (material.current?.blend && material.current.blend > 0 && material.current.blend < 1) {
// If blend is ongoing (> 0 and < 1) then we need to render both the root scene
// and the portal scene, both will then be mixed in the quad from above
blend.value = material.current.blend
Expand Down