Skip to content

Commit 8a64fb7

Browse files
authoredOct 12, 2023
fix: add annotations for tree-shaking (#1684)
1 parent 675c30f commit 8a64fb7

File tree

94 files changed

+1419
-1371
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+1419
-1371
lines changed
 

‎src/core/AccumulativeShadows.tsx

+10-7
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { extend, ReactThreeFiber, useFrame, useThree } from '@react-three/fiber'
44
import { shaderMaterial } from './shaderMaterial'
55
import { DiscardMaterial } from '../materials/DiscardMaterial'
66
import { ForwardRefComponent } from '../helpers/ts-utils'
7+
import { version } from '../helpers/constants'
78

89
function isLight(object: any): object is THREE.Light {
910
return object.isLight
@@ -72,11 +73,13 @@ declare global {
7273
}
7374
}
7475

75-
export const accumulativeContext = React.createContext<AccumulativeContext>(null as unknown as AccumulativeContext)
76+
export const accumulativeContext = /* @__PURE__ */ React.createContext<AccumulativeContext>(
77+
null as unknown as AccumulativeContext
78+
)
7679

77-
const SoftShadowMaterial = shaderMaterial(
80+
const SoftShadowMaterial = /* @__PURE__ */ shaderMaterial(
7881
{
79-
color: new THREE.Color(),
82+
color: /* @__PURE__ */ new THREE.Color(),
8083
blend: 2.0,
8184
alphaTest: 0.75,
8285
opacity: 0,
@@ -97,14 +100,14 @@ const SoftShadowMaterial = shaderMaterial(
97100
vec4 sampledDiffuseColor = texture2D(map, vUv);
98101
gl_FragColor = vec4(color * sampledDiffuseColor.r * blend, max(0.0, (1.0 - (sampledDiffuseColor.r + sampledDiffuseColor.g + sampledDiffuseColor.b) / alphaTest)) * opacity);
99102
#include <tonemapping_fragment>
100-
#include <${parseInt(THREE.REVISION.replace(/\D+/g, '')) >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
103+
#include <${version >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
101104
}`
102105
)
103106

104107
export const AccumulativeShadows: ForwardRefComponent<
105108
JSX.IntrinsicElements['group'] & AccumulativeShadowsProps,
106109
AccumulativeContext
107-
> = React.forwardRef(
110+
> = /* @__PURE__ */ React.forwardRef(
108111
(
109112
{
110113
children,
@@ -253,7 +256,7 @@ export type RandomizedLightProps = {
253256
export const RandomizedLight: ForwardRefComponent<
254257
JSX.IntrinsicElements['group'] & RandomizedLightProps,
255258
AccumulativeLightContext
256-
> = React.forwardRef(
259+
> = /* @__PURE__ */ React.forwardRef(
257260
(
258261
{
259262
castShadow = true,
@@ -266,7 +269,7 @@ export const RandomizedLight: ForwardRefComponent<
266269
position = [0, 0, 0],
267270
radius = 1,
268271
amount = 8,
269-
intensity = parseInt(THREE.REVISION.replace(/\D+/g, '')) >= 155 ? Math.PI : 1,
272+
intensity = version >= 155 ? Math.PI : 1,
270273
ambient = 0.5,
271274
...props
272275
}: JSX.IntrinsicElements['group'] & RandomizedLightProps,

‎src/core/ArcballControls.tsx

+45-45
Original file line numberDiff line numberDiff line change
@@ -23,55 +23,55 @@ export type ArcballControlsProps = Omit<
2323
'ref'
2424
>
2525

26-
export const ArcballControls: ForwardRefComponent<ArcballControlsProps, ArcballControlsImpl> = forwardRef<
27-
ArcballControlsImpl,
28-
ArcballControlsProps
29-
>(({ camera, makeDefault, regress, domElement, onChange, onStart, onEnd, ...restProps }, ref) => {
30-
const invalidate = useThree((state) => state.invalidate)
31-
const defaultCamera = useThree((state) => state.camera)
32-
const gl = useThree((state) => state.gl)
33-
const events = useThree((state) => state.events) as EventManager<HTMLElement>
34-
const set = useThree((state) => state.set)
35-
const get = useThree((state) => state.get)
36-
const performance = useThree((state) => state.performance)
37-
const explCamera = camera || defaultCamera
38-
const explDomElement = (domElement || events.connected || gl.domElement) as HTMLElement
39-
const controls = useMemo(() => new ArcballControlsImpl(explCamera), [explCamera])
26+
export const ArcballControls: ForwardRefComponent<ArcballControlsProps, ArcballControlsImpl> =
27+
/* @__PURE__ */ forwardRef<ArcballControlsImpl, ArcballControlsProps>(
28+
({ camera, makeDefault, regress, domElement, onChange, onStart, onEnd, ...restProps }, ref) => {
29+
const invalidate = useThree((state) => state.invalidate)
30+
const defaultCamera = useThree((state) => state.camera)
31+
const gl = useThree((state) => state.gl)
32+
const events = useThree((state) => state.events) as EventManager<HTMLElement>
33+
const set = useThree((state) => state.set)
34+
const get = useThree((state) => state.get)
35+
const performance = useThree((state) => state.performance)
36+
const explCamera = camera || defaultCamera
37+
const explDomElement = (domElement || events.connected || gl.domElement) as HTMLElement
38+
const controls = useMemo(() => new ArcballControlsImpl(explCamera), [explCamera])
4039

41-
useFrame(() => {
42-
if (controls.enabled) controls.update()
43-
}, -1)
40+
useFrame(() => {
41+
if (controls.enabled) controls.update()
42+
}, -1)
4443

45-
useEffect(() => {
46-
controls.connect(explDomElement)
47-
return () => void controls.dispose()
48-
}, [explDomElement, regress, controls, invalidate])
44+
useEffect(() => {
45+
controls.connect(explDomElement)
46+
return () => void controls.dispose()
47+
}, [explDomElement, regress, controls, invalidate])
4948

50-
useEffect(() => {
51-
const callback = (e: Event) => {
52-
invalidate()
53-
if (regress) performance.regress()
54-
if (onChange) onChange(e)
55-
}
49+
useEffect(() => {
50+
const callback = (e: Event) => {
51+
invalidate()
52+
if (regress) performance.regress()
53+
if (onChange) onChange(e)
54+
}
5655

57-
controls.addEventListener('change', callback)
58-
if (onStart) controls.addEventListener('start', onStart)
59-
if (onEnd) controls.addEventListener('end', onEnd)
56+
controls.addEventListener('change', callback)
57+
if (onStart) controls.addEventListener('start', onStart)
58+
if (onEnd) controls.addEventListener('end', onEnd)
6059

61-
return () => {
62-
controls.removeEventListener('change', callback)
63-
if (onStart) controls.removeEventListener('start', onStart)
64-
if (onEnd) controls.removeEventListener('end', onEnd)
65-
}
66-
}, [onChange, onStart, onEnd])
60+
return () => {
61+
controls.removeEventListener('change', callback)
62+
if (onStart) controls.removeEventListener('start', onStart)
63+
if (onEnd) controls.removeEventListener('end', onEnd)
64+
}
65+
}, [onChange, onStart, onEnd])
6766

68-
useEffect(() => {
69-
if (makeDefault) {
70-
const old = get().controls
71-
set({ controls })
72-
return () => set({ controls: old })
73-
}
74-
}, [makeDefault, controls])
67+
useEffect(() => {
68+
if (makeDefault) {
69+
const old = get().controls
70+
set({ controls })
71+
return () => set({ controls: old })
72+
}
73+
}, [makeDefault, controls])
7574

76-
return <primitive ref={ref} object={controls} {...restProps} />
77-
})
75+
return <primitive ref={ref} object={controls} {...restProps} />
76+
}
77+
)

1 commit comments

Comments
 (1)

vercel[bot] commented on Oct 12, 2023

@vercel[bot]
Please sign in to comment.