@react-three/drei 9.55.0 → 9.56.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/core/CameraControls.cjs.js +1 -1
- package/core/CameraControls.d.ts +11 -0
- package/core/CameraControls.js +44 -1
- package/core/MeshTransmissionMaterial.cjs.js +1 -1
- package/core/MeshTransmissionMaterial.js +2 -6
- package/core/OrbitControls.cjs.js +1 -1
- package/core/OrbitControls.d.ts +1 -0
- package/core/OrbitControls.js +27 -5
- package/index.cjs.js +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),t=require("three"),r=require("react"),n=require("@react-three/fiber"),o=require("camera-controls");function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function s(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(r){if("default"!==r){var n=Object.getOwnPropertyDescriptor(e,r);Object.defineProperty(t,r,n.get?n:{enumerable:!0,get:function(){return e[r]}})}})),t.default=e,Object.freeze(t)}var u=a(e),c=s(t),l=s(r),d=a(o);const i=r.forwardRef(((e,t)=>{r.useMemo((()=>{d.default.install({THREE:c}),n.extend({CameraControlsImpl:d.default})}),[]);const{camera:o,domElement:a,onStart:s,onEnd:i,onChange:f,events:m,regress:v,...b}=e,E=n.useThree((e=>e.camera)),p=n.useThree((e=>e.gl)),h=n.useThree((e=>e.invalidate)),j=n.useThree((e=>e.events)),g=n.useThree((e=>e.setEvents)),O=n.useThree((e=>e.performance)),T=o||E,L=a||j.connected||p.domElement,q=r.useMemo((()=>new d.default(T)),[T]);return n.useFrame(((e,t)=>{q.enabled&&q.update(t)}),-1),r.useEffect((()=>(q.connect(L),()=>{q.disconnect()})),[L,q]),l.useEffect((()=>{m&&g({enabled:!0});const e=e=>{h(),v&&O.regress(),f&&f(e)},t=e=>{s&&s(e),m||g({enabled:!1})},r=e=>{i&&i(e),m||g({enabled:!0})};return q.addEventListener("control",e),q.addEventListener("controlstart",t),q.addEventListener("controlend",r),()=>{q.removeEventListener("control",e),q.removeEventListener("controlstart",t),q.removeEventListener("controlend",r)}}),[q,m,s,i,h,g,v,f]),l.createElement("primitive",u.default({ref:t,object:q},b))}));exports.CameraControls=i;
|
package/core/CameraControls.d.ts
CHANGED
|
@@ -5,6 +5,17 @@ import CameraControlsImpl from 'camera-controls';
|
|
|
5
5
|
export declare type CameraControlsProps = Omit<ReactThreeFiber.Overwrite<ReactThreeFiber.Node<CameraControlsImpl, typeof CameraControlsImpl>, {
|
|
6
6
|
camera?: PerspectiveCamera | OrthographicCamera;
|
|
7
7
|
domElement?: HTMLElement;
|
|
8
|
+
onStart?: (e?: {
|
|
9
|
+
type: 'controlstart';
|
|
10
|
+
}) => void;
|
|
11
|
+
onEnd?: (e?: {
|
|
12
|
+
type: 'controlend';
|
|
13
|
+
}) => void;
|
|
14
|
+
onChange?: (e?: {
|
|
15
|
+
type: 'control';
|
|
16
|
+
}) => void;
|
|
17
|
+
events?: boolean;
|
|
18
|
+
regress?: boolean;
|
|
8
19
|
}>, 'ref'>;
|
|
9
20
|
export declare const CameraControls: React.ForwardRefExoticComponent<CameraControlsProps & React.RefAttributes<CameraControlsImpl>>;
|
|
10
21
|
export declare type CameraControls = CameraControlsImpl;
|
package/core/CameraControls.js
CHANGED
|
@@ -17,12 +17,19 @@ const CameraControls = /*#__PURE__*/forwardRef((props, ref) => {
|
|
|
17
17
|
const {
|
|
18
18
|
camera,
|
|
19
19
|
domElement,
|
|
20
|
+
onStart,
|
|
21
|
+
onEnd,
|
|
22
|
+
onChange,
|
|
23
|
+
events: enableEvents,
|
|
24
|
+
regress,
|
|
20
25
|
...restProps
|
|
21
26
|
} = props;
|
|
22
27
|
const defaultCamera = useThree(state => state.camera);
|
|
23
28
|
const gl = useThree(state => state.gl);
|
|
24
29
|
const invalidate = useThree(state => state.invalidate);
|
|
25
30
|
const events = useThree(state => state.events);
|
|
31
|
+
const setEvents = useThree(state => state.setEvents);
|
|
32
|
+
const performance = useThree(state => state.performance);
|
|
26
33
|
const explCamera = camera || defaultCamera;
|
|
27
34
|
const explDomElement = domElement || events.connected || gl.domElement;
|
|
28
35
|
const cameraControls = useMemo(() => new CameraControlsImpl(explCamera), [explCamera]);
|
|
@@ -32,7 +39,43 @@ const CameraControls = /*#__PURE__*/forwardRef((props, ref) => {
|
|
|
32
39
|
useEffect(() => {
|
|
33
40
|
cameraControls.connect(explDomElement);
|
|
34
41
|
return () => void cameraControls.disconnect();
|
|
35
|
-
}, [explDomElement, cameraControls
|
|
42
|
+
}, [explDomElement, cameraControls]);
|
|
43
|
+
React.useEffect(() => {
|
|
44
|
+
if (enableEvents) {
|
|
45
|
+
setEvents({
|
|
46
|
+
enabled: true
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
const callback = e => {
|
|
51
|
+
invalidate();
|
|
52
|
+
if (regress) performance.regress();
|
|
53
|
+
if (onChange) onChange(e);
|
|
54
|
+
};
|
|
55
|
+
|
|
56
|
+
const onStartCb = e => {
|
|
57
|
+
if (onStart) onStart(e);
|
|
58
|
+
if (!enableEvents) setEvents({
|
|
59
|
+
enabled: false
|
|
60
|
+
});
|
|
61
|
+
};
|
|
62
|
+
|
|
63
|
+
const onEndCb = e => {
|
|
64
|
+
if (onEnd) onEnd(e);
|
|
65
|
+
if (!enableEvents) setEvents({
|
|
66
|
+
enabled: true
|
|
67
|
+
});
|
|
68
|
+
};
|
|
69
|
+
|
|
70
|
+
cameraControls.addEventListener('control', callback);
|
|
71
|
+
cameraControls.addEventListener('controlstart', onStartCb);
|
|
72
|
+
cameraControls.addEventListener('controlend', onEndCb);
|
|
73
|
+
return () => {
|
|
74
|
+
cameraControls.removeEventListener('control', callback);
|
|
75
|
+
cameraControls.removeEventListener('controlstart', onStartCb);
|
|
76
|
+
cameraControls.removeEventListener('controlend', onEndCb);
|
|
77
|
+
};
|
|
78
|
+
}, [cameraControls, enableEvents, onStart, onEnd, invalidate, setEvents, regress, onChange]);
|
|
36
79
|
return /*#__PURE__*/React.createElement("primitive", _extends({
|
|
37
80
|
ref: ref,
|
|
38
81
|
object: cameraControls
|
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var n=require("@babel/runtime/helpers/extends"),e=require("three"),t=require("react"),a=require("@react-three/fiber"),r=require("./useFBO.cjs.js"),o=require("../materials/DiscardMaterial.cjs.js");function i(n){return n&&"object"==typeof n&&"default"in n?n:{default:n}}function s(n){if(n&&n.__esModule)return n;var e=Object.create(null);return n&&Object.keys(n).forEach((function(t){if("default"!==t){var a=Object.getOwnPropertyDescriptor(n,t);Object.defineProperty(e,t,a.get?a:{enumerable:!0,get:function(){return n[t]}})}})),e.default=n,Object.freeze(e)}require("./shaderMaterial.cjs.js");var l=i(n),c=s(e),m=s(t);class u extends c.MeshPhysicalMaterial{constructor(n=6,e=!1){super(),this.uniforms={chromaticAberration:{value:.05},transmission:{value:0},_transmission:{value:1},transmissionMap:{value:null},roughness:{value:0},thickness:{value:0},thicknessMap:{value:null},attenuationDistance:{value:1/0},attenuationColor:{value:new c.Color("white")},anisotropy:{value:.1},time:{value:0},distortion:{value:0},distortionScale:{value:.5},temporalDistortion:{value:0},buffer:{value:null}},this.onBeforeCompile=t=>{t.uniforms={...t.uniforms,...this.uniforms},e?t.defines.USE_SAMPLER="":t.defines.USE_TRANSMISSION="",t.fragmentShader="\n uniform float chromaticAberration; \n uniform float anisotropy; \n uniform float time;\n uniform float distortion;\n uniform float distortionScale;\n uniform float temporalDistortion;\n uniform sampler2D buffer;\n\n vec3 random3(vec3 c) {\n float j = 4096.0*sin(dot(c,vec3(17.0, 59.4, 15.0)));\n vec3 r;\n r.z = fract(512.0*j);\n j *= .125;\n r.x = fract(512.0*j);\n j *= .125;\n r.y = fract(512.0*j);\n return r-0.5;\n }\n\n float seed = 0.0;\n uint hash( uint x ) {\n x += ( x << 10u );\n x ^= ( x >> 6u );\n x += ( x << 3u );\n x ^= ( x >> 11u );\n x += ( x << 15u );\n return x;\n }\n\n // Compound versions of the hashing algorithm I whipped together.\n uint hash( uvec2 v ) { return hash( v.x ^ hash(v.y) ); }\n uint hash( uvec3 v ) { return hash( v.x ^ hash(v.y) ^ hash(v.z) ); }\n uint hash( uvec4 v ) { return hash( v.x ^ hash(v.y) ^ hash(v.z) ^ hash(v.w) ); }\n\n // Construct a float with half-open range [0:1] using low 23 bits.\n // All zeroes yields 0.0, all ones yields the next smallest representable value below 1.0.\n float floatConstruct( uint m ) {\n const uint ieeeMantissa = 0x007FFFFFu; // binary32 mantissa bitmask\n const uint ieeeOne = 0x3F800000u; // 1.0 in IEEE binary32\n m &= ieeeMantissa; // Keep only mantissa bits (fractional part)\n m |= ieeeOne; // Add fractional part to 1.0\n float f = uintBitsToFloat( m ); // Range [1:2]\n return f - 1.0; // Range [0:1]\n }\n\n // Pseudo-random value in half-open range [0:1].\n float random( float x ) { return floatConstruct(hash(floatBitsToUint(x))); }\n float random( vec2 v ) { return floatConstruct(hash(floatBitsToUint(v))); }\n float random( vec3 v ) { return floatConstruct(hash(floatBitsToUint(v))); }\n float random( vec4 v ) { return floatConstruct(hash(floatBitsToUint(v))); }\n\n float rand() {\n float result = random(vec3(gl_FragCoord.xy, seed));\n seed += 1.0;\n return result;\n }\n\n const float F3 = 0.3333333;\n const float G3 = 0.1666667;\n\n float snoise(vec3 p) {\n vec3 s = floor(p + dot(p, vec3(F3)));\n vec3 x = p - s + dot(s, vec3(G3));\n vec3 e = step(vec3(0.0), x - x.yzx);\n vec3 i1 = e*(1.0 - e.zxy);\n vec3 i2 = 1.0 - e.zxy*(1.0 - e);\n vec3 x1 = x - i1 + G3;\n vec3 x2 = x - i2 + 2.0*G3;\n vec3 x3 = x - 1.0 + 3.0*G3;\n vec4 w, d;\n w.x = dot(x, x);\n w.y = dot(x1, x1);\n w.z = dot(x2, x2);\n w.w = dot(x3, x3);\n w = max(0.6 - w, 0.0);\n d.x = dot(random3(s), x);\n d.y = dot(random3(s + i1), x1);\n d.z = dot(random3(s + i2), x2);\n d.w = dot(random3(s + 1.0), x3);\n w *= w;\n w *= w;\n d *= w;\n return dot(d, vec4(52.0));\n }\n\n float snoiseFractal(vec3 m) {\n return 0.5333333* snoise(m)\n +0.2666667* snoise(2.0*m)\n +0.1333333* snoise(4.0*m)\n +0.0666667* snoise(8.0*m);\n }\n"+t.fragmentShader,t.fragmentShader=t.fragmentShader.replace("#include <transmission_pars_fragment>","\n #ifdef USE_TRANSMISSION\n // Transmission code is based on glTF-Sampler-Viewer\n // https://github.com/KhronosGroup/glTF-Sample-Viewer\n uniform float _transmission;\n uniform float thickness;\n uniform float attenuationDistance;\n uniform vec3 attenuationColor;\n #ifdef USE_TRANSMISSIONMAP\n uniform sampler2D transmissionMap;\n #endif\n #ifdef USE_THICKNESSMAP\n uniform sampler2D thicknessMap;\n #endif\n uniform vec2 transmissionSamplerSize;\n uniform sampler2D transmissionSamplerMap;\n uniform mat4 modelMatrix;\n uniform mat4 projectionMatrix;\n varying vec3 vWorldPosition;\n vec3 getVolumeTransmissionRay( const in vec3 n, const in vec3 v, const in float thickness, const in float ior, const in mat4 modelMatrix ) {\n // Direction of refracted light.\n vec3 refractionVector = refract( - v, normalize( n ), 1.0 / ior );\n // Compute rotation-independant scaling of the model matrix.\n vec3 modelScale;\n modelScale.x = length( vec3( modelMatrix[ 0 ].xyz ) );\n modelScale.y = length( vec3( modelMatrix[ 1 ].xyz ) );\n modelScale.z = length( vec3( modelMatrix[ 2 ].xyz ) );\n // The thickness is specified in local space.\n return normalize( refractionVector ) * thickness * modelScale;\n }\n float applyIorToRoughness( const in float roughness, const in float ior ) {\n // Scale roughness with IOR so that an IOR of 1.0 results in no microfacet refraction and\n // an IOR of 1.5 results in the default amount of microfacet refraction.\n return roughness * clamp( ior * 2.0 - 2.0, 0.0, 1.0 );\n }\n vec4 getTransmissionSample( const in vec2 fragCoord, const in float roughness, const in float ior ) {\n float framebufferLod = log2( transmissionSamplerSize.x ) * applyIorToRoughness( roughness, ior ); \n #ifdef USE_SAMPLER\n #ifdef texture2DLodEXT\n return texture2DLodEXT(transmissionSamplerMap, fragCoord.xy, framebufferLod);\n #else\n return texture2D(transmissionSamplerMap, fragCoord.xy, framebufferLod);\n #endif\n #else\n return texture2D(buffer, fragCoord.xy);\n #endif\n }\n vec3 applyVolumeAttenuation( const in vec3 radiance, const in float transmissionDistance, const in vec3 attenuationColor, const in float attenuationDistance ) {\n if ( isinf( attenuationDistance ) ) {\n // Attenuation distance is +∞, i.e. the transmitted color is not attenuated at all.\n return radiance;\n } else {\n // Compute light attenuation using Beer's law.\n vec3 attenuationCoefficient = -log( attenuationColor ) / attenuationDistance;\n vec3 transmittance = exp( - attenuationCoefficient * transmissionDistance ); // Beer's law\n return transmittance * radiance;\n }\n }\n vec4 getIBLVolumeRefraction( const in vec3 n, const in vec3 v, const in float roughness, const in vec3 diffuseColor,\n const in vec3 specularColor, const in float specularF90, const in vec3 position, const in mat4 modelMatrix,\n const in mat4 viewMatrix, const in mat4 projMatrix, const in float ior, const in float thickness,\n const in vec3 attenuationColor, const in float attenuationDistance ) {\n vec3 transmissionRay = getVolumeTransmissionRay( n, v, thickness, ior, modelMatrix );\n vec3 refractedRayExit = position + transmissionRay;\n // Project refracted vector on the framebuffer, while mapping to normalized device coordinates.\n vec4 ndcPos = projMatrix * viewMatrix * vec4( refractedRayExit, 1.0 );\n vec2 refractionCoords = ndcPos.xy / ndcPos.w;\n refractionCoords += 1.0;\n refractionCoords /= 2.0;\n // Sample framebuffer to get pixel the refracted ray hits.\n vec4 transmittedLight = getTransmissionSample( refractionCoords, roughness, ior );\n vec3 attenuatedColor = applyVolumeAttenuation( transmittedLight.rgb, length( transmissionRay ), attenuationColor, attenuationDistance );\n // Get the specular component.\n vec3 F = EnvironmentBRDF( n, v, specularColor, specularF90, roughness );\n return vec4( ( 1.0 - F ) * attenuatedColor * diffuseColor, transmittedLight.a );\n }\n #endif\n"),t.fragmentShader=t.fragmentShader.replace("#include <transmission_fragment>",` \n // Improve the refraction to use the world pos\n material.transmission = _transmission;\n material.transmissionAlpha = 1.0;\n material.thickness = thickness;\n material.attenuationDistance = attenuationDistance;\n material.attenuationColor = attenuationColor;\n #ifdef USE_TRANSMISSIONMAP\n material.transmission *= texture2D( transmissionMap, vUv ).r;\n #endif\n #ifdef USE_THICKNESSMAP\n material.thickness *= texture2D( thicknessMap, vUv ).g;\n #endif\n \n vec3 pos = vWorldPosition;\n vec3 v = normalize( cameraPosition - pos );\n vec3 n = inverseTransformDirection( normal, viewMatrix );\n vec3 transmission = vec3(0.0);\n float transmissionR, transmissionB, transmissionG;\n float randomCoords = rand();\n float thickness_smear = thickness * max(pow(roughness, 0.33), anisotropy);\n vec3 distortionNormal = vec3(0.0);\n vec3 temporalOffset = vec3(time, -time, -time) * temporalDistortion;\n if (distortion > 0.0) {\n distortionNormal = distortion * vec3(snoiseFractal(vec3((pos * distortionScale + temporalOffset))), snoiseFractal(vec3(pos.zxy * distortionScale - temporalOffset)), snoiseFractal(vec3(pos.yxz * distortionScale + temporalOffset)));\n }\n for (float i = 0.0; i < ${n}.0; i ++) {\n vec3 sampleNorm = normalize(n + roughness * roughness * 2.0 * normalize(vec3(rand() - 0.5, rand() - 0.5, rand() - 0.5)) * pow(rand(), 0.33) + distortionNormal);\n transmissionR = getIBLVolumeRefraction(\n sampleNorm, v, material.roughness, material.diffuseColor, material.specularColor, material.specularF90,\n pos, modelMatrix, viewMatrix, projectionMatrix, material.ior, material.thickness + thickness_smear * (i + randomCoords) / float(${n}),\n material.attenuationColor, material.attenuationDistance\n ).r;\n transmissionG = getIBLVolumeRefraction(\n sampleNorm, v, material.roughness, material.diffuseColor, material.specularColor, material.specularF90,\n pos, modelMatrix, viewMatrix, projectionMatrix, material.ior * (1.0 + chromaticAberration * (i + randomCoords) / float(${n})) , material.thickness + thickness_smear * (i + randomCoords) / float(${n}),\n material.attenuationColor, material.attenuationDistance\n ).g;\n transmissionB = getIBLVolumeRefraction(\n sampleNorm, v, material.roughness, material.diffuseColor, material.specularColor, material.specularF90,\n pos, modelMatrix, viewMatrix, projectionMatrix, material.ior * (1.0 + 2.0 * chromaticAberration * (i + randomCoords) / float(${n})), material.thickness + thickness_smear * (i + randomCoords) / float(${n}),\n material.attenuationColor, material.attenuationDistance\n ).b;\n transmission.r += transmissionR;\n transmission.g += transmissionG;\n transmission.b += transmissionB;\n }\n transmission /= ${n}.0;\n totalDiffuse = mix( totalDiffuse, transmission.rgb, material.transmission );\n`)},Object.keys(this.uniforms).forEach((n=>Object.defineProperty(this,n,{get:()=>this.uniforms[n].value,set:e=>this.uniforms[n].value=e})))}}const f=m.forwardRef((({buffer:n,transmissionSampler:e=!1,backside:t=!1,transmission:i=1,thickness:s=0,ior:f=1.5,samples:d=10,resolution:v,backsideResolution:h,background:p,...x},g)=>{a.extend({MeshTransmissionMaterial:u});const M=m.useRef(null),[S]=m.useState((()=>new o.DiscardMaterial)),C=r.useFBO(h||v),y=r.useFBO(v);let b,w,k;return a.useFrame((a=>{M.current.time=a.clock.getElapsedTime(),n||e||(k=M.current.__r3f.parent,k&&(w=a.gl.toneMapping,b=a.scene.background,a.gl.toneMapping=c.NoToneMapping,p&&(a.scene.background=p),k.material=S,t&&(a.gl.setRenderTarget(C),a.gl.render(a.scene,a.camera),k.material=M.current,k.material.buffer=C.texture,k.material.thickness=0,k.material.ior=1,k.material.side=c.BackSide),a.gl.setRenderTarget(y),a.gl.render(a.scene,a.camera),k.material=M.current,k.material.thickness=s,k.material.ior=f,k.material.side=c.FrontSide,k.material.buffer=y.texture,a.scene.background=b,a.gl.setRenderTarget(null),k.material=M.current,a.gl.toneMapping=w))})),m.useImperativeHandle(g,(()=>M.current),[]),m.createElement("meshTransmissionMaterial",l.default({args:[d,e],ref:M},x,{buffer:n||y.texture,_transmission:i,transmission:e?i:0,thickness:s,ior:f}))}));exports.MeshTransmissionMaterial=f;
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var n=require("@babel/runtime/helpers/extends"),e=require("three"),t=require("react"),a=require("@react-three/fiber"),r=require("./useFBO.cjs.js"),o=require("../materials/DiscardMaterial.cjs.js");function i(n){return n&&"object"==typeof n&&"default"in n?n:{default:n}}function s(n){if(n&&n.__esModule)return n;var e=Object.create(null);return n&&Object.keys(n).forEach((function(t){if("default"!==t){var a=Object.getOwnPropertyDescriptor(n,t);Object.defineProperty(e,t,a.get?a:{enumerable:!0,get:function(){return n[t]}})}})),e.default=n,Object.freeze(e)}require("./shaderMaterial.cjs.js");var l=i(n),c=s(e),m=s(t);class u extends c.MeshPhysicalMaterial{constructor(n=6,e=!1){super(),this.uniforms={chromaticAberration:{value:.05},transmission:{value:0},_transmission:{value:1},transmissionMap:{value:null},roughness:{value:0},thickness:{value:0},thicknessMap:{value:null},attenuationDistance:{value:1/0},attenuationColor:{value:new c.Color("white")},anisotropy:{value:.1},time:{value:0},distortion:{value:0},distortionScale:{value:.5},temporalDistortion:{value:0},buffer:{value:null}},this.onBeforeCompile=t=>{t.uniforms={...t.uniforms,...this.uniforms},e?t.defines.USE_SAMPLER="":t.defines.USE_TRANSMISSION="",t.fragmentShader="\n uniform float chromaticAberration; \n uniform float anisotropy; \n uniform float time;\n uniform float distortion;\n uniform float distortionScale;\n uniform float temporalDistortion;\n uniform sampler2D buffer;\n\n vec3 random3(vec3 c) {\n float j = 4096.0*sin(dot(c,vec3(17.0, 59.4, 15.0)));\n vec3 r;\n r.z = fract(512.0*j);\n j *= .125;\n r.x = fract(512.0*j);\n j *= .125;\n r.y = fract(512.0*j);\n return r-0.5;\n }\n\n float seed = 0.0;\n uint hash( uint x ) {\n x += ( x << 10u );\n x ^= ( x >> 6u );\n x += ( x << 3u );\n x ^= ( x >> 11u );\n x += ( x << 15u );\n return x;\n }\n\n // Compound versions of the hashing algorithm I whipped together.\n uint hash( uvec2 v ) { return hash( v.x ^ hash(v.y) ); }\n uint hash( uvec3 v ) { return hash( v.x ^ hash(v.y) ^ hash(v.z) ); }\n uint hash( uvec4 v ) { return hash( v.x ^ hash(v.y) ^ hash(v.z) ^ hash(v.w) ); }\n\n // Construct a float with half-open range [0:1] using low 23 bits.\n // All zeroes yields 0.0, all ones yields the next smallest representable value below 1.0.\n float floatConstruct( uint m ) {\n const uint ieeeMantissa = 0x007FFFFFu; // binary32 mantissa bitmask\n const uint ieeeOne = 0x3F800000u; // 1.0 in IEEE binary32\n m &= ieeeMantissa; // Keep only mantissa bits (fractional part)\n m |= ieeeOne; // Add fractional part to 1.0\n float f = uintBitsToFloat( m ); // Range [1:2]\n return f - 1.0; // Range [0:1]\n }\n\n // Pseudo-random value in half-open range [0:1].\n float random( float x ) { return floatConstruct(hash(floatBitsToUint(x))); }\n float random( vec2 v ) { return floatConstruct(hash(floatBitsToUint(v))); }\n float random( vec3 v ) { return floatConstruct(hash(floatBitsToUint(v))); }\n float random( vec4 v ) { return floatConstruct(hash(floatBitsToUint(v))); }\n\n float rand() {\n float result = random(vec3(gl_FragCoord.xy, seed));\n seed += 1.0;\n return result;\n }\n\n const float F3 = 0.3333333;\n const float G3 = 0.1666667;\n\n float snoise(vec3 p) {\n vec3 s = floor(p + dot(p, vec3(F3)));\n vec3 x = p - s + dot(s, vec3(G3));\n vec3 e = step(vec3(0.0), x - x.yzx);\n vec3 i1 = e*(1.0 - e.zxy);\n vec3 i2 = 1.0 - e.zxy*(1.0 - e);\n vec3 x1 = x - i1 + G3;\n vec3 x2 = x - i2 + 2.0*G3;\n vec3 x3 = x - 1.0 + 3.0*G3;\n vec4 w, d;\n w.x = dot(x, x);\n w.y = dot(x1, x1);\n w.z = dot(x2, x2);\n w.w = dot(x3, x3);\n w = max(0.6 - w, 0.0);\n d.x = dot(random3(s), x);\n d.y = dot(random3(s + i1), x1);\n d.z = dot(random3(s + i2), x2);\n d.w = dot(random3(s + 1.0), x3);\n w *= w;\n w *= w;\n d *= w;\n return dot(d, vec4(52.0));\n }\n\n float snoiseFractal(vec3 m) {\n return 0.5333333* snoise(m)\n +0.2666667* snoise(2.0*m)\n +0.1333333* snoise(4.0*m)\n +0.0666667* snoise(8.0*m);\n }\n"+t.fragmentShader,t.fragmentShader=t.fragmentShader.replace("#include <transmission_pars_fragment>","\n #ifdef USE_TRANSMISSION\n // Transmission code is based on glTF-Sampler-Viewer\n // https://github.com/KhronosGroup/glTF-Sample-Viewer\n uniform float _transmission;\n uniform float thickness;\n uniform float attenuationDistance;\n uniform vec3 attenuationColor;\n #ifdef USE_TRANSMISSIONMAP\n uniform sampler2D transmissionMap;\n #endif\n #ifdef USE_THICKNESSMAP\n uniform sampler2D thicknessMap;\n #endif\n uniform vec2 transmissionSamplerSize;\n uniform sampler2D transmissionSamplerMap;\n uniform mat4 modelMatrix;\n uniform mat4 projectionMatrix;\n varying vec3 vWorldPosition;\n vec3 getVolumeTransmissionRay( const in vec3 n, const in vec3 v, const in float thickness, const in float ior, const in mat4 modelMatrix ) {\n // Direction of refracted light.\n vec3 refractionVector = refract( - v, normalize( n ), 1.0 / ior );\n // Compute rotation-independant scaling of the model matrix.\n vec3 modelScale;\n modelScale.x = length( vec3( modelMatrix[ 0 ].xyz ) );\n modelScale.y = length( vec3( modelMatrix[ 1 ].xyz ) );\n modelScale.z = length( vec3( modelMatrix[ 2 ].xyz ) );\n // The thickness is specified in local space.\n return normalize( refractionVector ) * thickness * modelScale;\n }\n float applyIorToRoughness( const in float roughness, const in float ior ) {\n // Scale roughness with IOR so that an IOR of 1.0 results in no microfacet refraction and\n // an IOR of 1.5 results in the default amount of microfacet refraction.\n return roughness * clamp( ior * 2.0 - 2.0, 0.0, 1.0 );\n }\n vec4 getTransmissionSample( const in vec2 fragCoord, const in float roughness, const in float ior ) {\n float framebufferLod = log2( transmissionSamplerSize.x ) * applyIorToRoughness( roughness, ior ); \n #ifdef USE_SAMPLER\n #ifdef texture2DLodEXT\n return texture2DLodEXT(transmissionSamplerMap, fragCoord.xy, framebufferLod);\n #else\n return texture2D(transmissionSamplerMap, fragCoord.xy, framebufferLod);\n #endif\n #else\n return texture2D(buffer, fragCoord.xy);\n #endif\n }\n vec3 applyVolumeAttenuation( const in vec3 radiance, const in float transmissionDistance, const in vec3 attenuationColor, const in float attenuationDistance ) {\n if ( isinf( attenuationDistance ) ) {\n // Attenuation distance is +∞, i.e. the transmitted color is not attenuated at all.\n return radiance;\n } else {\n // Compute light attenuation using Beer's law.\n vec3 attenuationCoefficient = -log( attenuationColor ) / attenuationDistance;\n vec3 transmittance = exp( - attenuationCoefficient * transmissionDistance ); // Beer's law\n return transmittance * radiance;\n }\n }\n vec4 getIBLVolumeRefraction( const in vec3 n, const in vec3 v, const in float roughness, const in vec3 diffuseColor,\n const in vec3 specularColor, const in float specularF90, const in vec3 position, const in mat4 modelMatrix,\n const in mat4 viewMatrix, const in mat4 projMatrix, const in float ior, const in float thickness,\n const in vec3 attenuationColor, const in float attenuationDistance ) {\n vec3 transmissionRay = getVolumeTransmissionRay( n, v, thickness, ior, modelMatrix );\n vec3 refractedRayExit = position + transmissionRay;\n // Project refracted vector on the framebuffer, while mapping to normalized device coordinates.\n vec4 ndcPos = projMatrix * viewMatrix * vec4( refractedRayExit, 1.0 );\n vec2 refractionCoords = ndcPos.xy / ndcPos.w;\n refractionCoords += 1.0;\n refractionCoords /= 2.0;\n // Sample framebuffer to get pixel the refracted ray hits.\n vec4 transmittedLight = getTransmissionSample( refractionCoords, roughness, ior );\n vec3 attenuatedColor = applyVolumeAttenuation( transmittedLight.rgb, length( transmissionRay ), attenuationColor, attenuationDistance );\n // Get the specular component.\n vec3 F = EnvironmentBRDF( n, v, specularColor, specularF90, roughness );\n return vec4( ( 1.0 - F ) * attenuatedColor * diffuseColor, transmittedLight.a );\n }\n #endif\n"),t.fragmentShader=t.fragmentShader.replace("#include <transmission_fragment>",` \n // Improve the refraction to use the world pos\n material.transmission = _transmission;\n material.transmissionAlpha = 1.0;\n material.thickness = thickness;\n material.attenuationDistance = attenuationDistance;\n material.attenuationColor = attenuationColor;\n #ifdef USE_TRANSMISSIONMAP\n material.transmission *= texture2D( transmissionMap, vUv ).r;\n #endif\n #ifdef USE_THICKNESSMAP\n material.thickness *= texture2D( thicknessMap, vUv ).g;\n #endif\n \n vec3 pos = vWorldPosition;\n vec3 v = normalize( cameraPosition - pos );\n vec3 n = inverseTransformDirection( normal, viewMatrix );\n vec3 transmission = vec3(0.0);\n float transmissionR, transmissionB, transmissionG;\n float randomCoords = rand();\n float thickness_smear = thickness * max(pow(roughness, 0.33), anisotropy);\n vec3 distortionNormal = vec3(0.0);\n vec3 temporalOffset = vec3(time, -time, -time) * temporalDistortion;\n if (distortion > 0.0) {\n distortionNormal = distortion * vec3(snoiseFractal(vec3((pos * distortionScale + temporalOffset))), snoiseFractal(vec3(pos.zxy * distortionScale - temporalOffset)), snoiseFractal(vec3(pos.yxz * distortionScale + temporalOffset)));\n }\n for (float i = 0.0; i < ${n}.0; i ++) {\n vec3 sampleNorm = normalize(n + roughness * roughness * 2.0 * normalize(vec3(rand() - 0.5, rand() - 0.5, rand() - 0.5)) * pow(rand(), 0.33) + distortionNormal);\n transmissionR = getIBLVolumeRefraction(\n sampleNorm, v, material.roughness, material.diffuseColor, material.specularColor, material.specularF90,\n pos, modelMatrix, viewMatrix, projectionMatrix, material.ior, material.thickness + thickness_smear * (i + randomCoords) / float(${n}),\n material.attenuationColor, material.attenuationDistance\n ).r;\n transmissionG = getIBLVolumeRefraction(\n sampleNorm, v, material.roughness, material.diffuseColor, material.specularColor, material.specularF90,\n pos, modelMatrix, viewMatrix, projectionMatrix, material.ior * (1.0 + chromaticAberration * (i + randomCoords) / float(${n})) , material.thickness + thickness_smear * (i + randomCoords) / float(${n}),\n material.attenuationColor, material.attenuationDistance\n ).g;\n transmissionB = getIBLVolumeRefraction(\n sampleNorm, v, material.roughness, material.diffuseColor, material.specularColor, material.specularF90,\n pos, modelMatrix, viewMatrix, projectionMatrix, material.ior * (1.0 + 2.0 * chromaticAberration * (i + randomCoords) / float(${n})), material.thickness + thickness_smear * (i + randomCoords) / float(${n}),\n material.attenuationColor, material.attenuationDistance\n ).b;\n transmission.r += transmissionR;\n transmission.g += transmissionG;\n transmission.b += transmissionB;\n }\n transmission /= ${n}.0;\n totalDiffuse = mix( totalDiffuse, transmission.rgb, material.transmission );\n`)},Object.keys(this.uniforms).forEach((n=>Object.defineProperty(this,n,{get:()=>this.uniforms[n].value,set:e=>this.uniforms[n].value=e})))}}const f=m.forwardRef((({buffer:n,transmissionSampler:e=!1,backside:t=!1,transmission:i=1,thickness:s=0,samples:f=10,resolution:d,backsideResolution:v,background:h,...p},x)=>{a.extend({MeshTransmissionMaterial:u});const g=m.useRef(null),[M]=m.useState((()=>new o.DiscardMaterial)),S=r.useFBO(v||d),C=r.useFBO(d);let y,b,w;return a.useFrame((a=>{g.current.time=a.clock.getElapsedTime(),n||e||(w=g.current.__r3f.parent,w&&(b=a.gl.toneMapping,y=a.scene.background,a.gl.toneMapping=c.NoToneMapping,h&&(a.scene.background=h),w.material=M,t&&(a.gl.setRenderTarget(S),a.gl.render(a.scene,a.camera),w.material=g.current,w.material.buffer=S.texture,w.material.thickness=1/(s+.01),w.material.side=c.BackSide),a.gl.setRenderTarget(C),a.gl.render(a.scene,a.camera),w.material=g.current,w.material.thickness=s,w.material.side=c.FrontSide,w.material.buffer=C.texture,a.scene.background=y,a.gl.setRenderTarget(null),w.material=g.current,a.gl.toneMapping=b))})),m.useImperativeHandle(x,(()=>g.current),[]),m.createElement("meshTransmissionMaterial",l.default({args:[f,e],ref:g},p,{buffer:n||C.texture,_transmission:i,transmission:e?i:0,thickness:s}))}));exports.MeshTransmissionMaterial=f;
|
|
@@ -310,7 +310,6 @@ const MeshTransmissionMaterial = /*#__PURE__*/React.forwardRef(({
|
|
|
310
310
|
backside = false,
|
|
311
311
|
transmission = 1,
|
|
312
312
|
thickness = 0,
|
|
313
|
-
ior = 1.5,
|
|
314
313
|
samples = 10,
|
|
315
314
|
resolution,
|
|
316
315
|
backsideResolution,
|
|
@@ -351,8 +350,7 @@ const MeshTransmissionMaterial = /*#__PURE__*/React.forwardRef(({
|
|
|
351
350
|
|
|
352
351
|
parent.material = ref.current;
|
|
353
352
|
parent.material.buffer = fboBack.texture;
|
|
354
|
-
parent.material.thickness = 0;
|
|
355
|
-
parent.material.ior = 1.0;
|
|
353
|
+
parent.material.thickness = 1.0 / (thickness + 0.01);
|
|
356
354
|
parent.material.side = THREE.BackSide;
|
|
357
355
|
} // Render into the main buffer
|
|
358
356
|
|
|
@@ -361,7 +359,6 @@ const MeshTransmissionMaterial = /*#__PURE__*/React.forwardRef(({
|
|
|
361
359
|
state.gl.render(state.scene, state.camera);
|
|
362
360
|
parent.material = ref.current;
|
|
363
361
|
parent.material.thickness = thickness;
|
|
364
|
-
parent.material.ior = ior;
|
|
365
362
|
parent.material.side = THREE.FrontSide;
|
|
366
363
|
parent.material.buffer = fboMain.texture; // Set old state back
|
|
367
364
|
|
|
@@ -386,8 +383,7 @@ const MeshTransmissionMaterial = /*#__PURE__*/React.forwardRef(({
|
|
|
386
383
|
// The exception is when transmissionSampler is set, in which case we are using three's built in sampler.
|
|
387
384
|
,
|
|
388
385
|
transmission: transmissionSampler ? transmission : 0,
|
|
389
|
-
thickness: thickness
|
|
390
|
-
ior: ior
|
|
386
|
+
thickness: thickness
|
|
391
387
|
}));
|
|
392
388
|
});
|
|
393
389
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),t=require("@react-three/fiber"),r=require("react"),n=require("three-stdlib");function s(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),t=require("@react-three/fiber"),r=require("react"),n=require("three-stdlib");function s(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function a(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(r){if("default"!==r){var n=Object.getOwnPropertyDescriptor(e,r);Object.defineProperty(t,r,n.get?n:{enumerable:!0,get:function(){return e[r]}})}})),t.default=e,Object.freeze(t)}var o=s(e),u=a(r);const c=u.forwardRef((({makeDefault:e,events:r,camera:s,regress:a,domElement:c,enableDamping:i=!0,onChange:d,onStart:l,onEnd:f,...b},m)=>{const v=t.useThree((e=>e.invalidate)),h=t.useThree((e=>e.camera)),E=t.useThree((e=>e.gl)),p=t.useThree((e=>e.events)),g=t.useThree((e=>e.setEvents)),O=t.useThree((e=>e.set)),j=t.useThree((e=>e.get)),T=t.useThree((e=>e.performance)),L=s||h,y=c||p.connected||E.domElement,q=u.useMemo((()=>new n.OrbitControls(L)),[L]);return t.useFrame((()=>{q.enabled&&q.update()}),-1),u.useEffect((()=>(q.connect(y),()=>{q.dispose()})),[y,a,q,v]),u.useEffect((()=>{r&&g({enabled:!0});const e=e=>{v(),a&&T.regress(),d&&d(e)},t=e=>{l&&l(e),r||g({enabled:!1})},n=e=>{f&&f(e),r||g({enabled:!0})};return q.addEventListener("change",e),q.addEventListener("start",t),q.addEventListener("end",n),()=>{q.removeEventListener("start",t),q.removeEventListener("end",n),q.removeEventListener("change",e)}}),[d,l,f,q,v,r,g]),u.useEffect((()=>{if(e){const e=j().controls;return O({controls:q}),()=>O({controls:e})}}),[e,q]),u.createElement("primitive",o.default({ref:m,object:q,enableDamping:i},b))}));exports.OrbitControls=c;
|
package/core/OrbitControls.d.ts
CHANGED
|
@@ -17,5 +17,6 @@ export declare type OrbitControlsProps = Omit<ReactThreeFiber.Overwrite<ReactThr
|
|
|
17
17
|
onStart?: (e?: Event) => void;
|
|
18
18
|
regress?: boolean;
|
|
19
19
|
target?: ReactThreeFiber.Vector3;
|
|
20
|
+
events?: boolean;
|
|
20
21
|
}>, 'ref'>;
|
|
21
22
|
export declare const OrbitControls: React.ForwardRefExoticComponent<OrbitControlsProps & React.RefAttributes<OrbitControlsImpl>>;
|
package/core/OrbitControls.js
CHANGED
|
@@ -5,6 +5,7 @@ import { OrbitControls as OrbitControls$1 } from 'three-stdlib';
|
|
|
5
5
|
|
|
6
6
|
const OrbitControls = /*#__PURE__*/React.forwardRef(({
|
|
7
7
|
makeDefault,
|
|
8
|
+
events: enableEvents,
|
|
8
9
|
camera,
|
|
9
10
|
regress,
|
|
10
11
|
domElement,
|
|
@@ -18,6 +19,7 @@ const OrbitControls = /*#__PURE__*/React.forwardRef(({
|
|
|
18
19
|
const defaultCamera = useThree(state => state.camera);
|
|
19
20
|
const gl = useThree(state => state.gl);
|
|
20
21
|
const events = useThree(state => state.events);
|
|
22
|
+
const setEvents = useThree(state => state.setEvents);
|
|
21
23
|
const set = useThree(state => state.set);
|
|
22
24
|
const get = useThree(state => state.get);
|
|
23
25
|
const performance = useThree(state => state.performance);
|
|
@@ -32,21 +34,41 @@ const OrbitControls = /*#__PURE__*/React.forwardRef(({
|
|
|
32
34
|
return () => void controls.dispose();
|
|
33
35
|
}, [explDomElement, regress, controls, invalidate]);
|
|
34
36
|
React.useEffect(() => {
|
|
37
|
+
if (enableEvents) {
|
|
38
|
+
setEvents({
|
|
39
|
+
enabled: true
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
|
|
35
43
|
const callback = e => {
|
|
36
44
|
invalidate();
|
|
37
45
|
if (regress) performance.regress();
|
|
38
46
|
if (onChange) onChange(e);
|
|
39
47
|
};
|
|
40
48
|
|
|
49
|
+
const onStartCb = e => {
|
|
50
|
+
if (onStart) onStart(e);
|
|
51
|
+
if (!enableEvents) setEvents({
|
|
52
|
+
enabled: false
|
|
53
|
+
});
|
|
54
|
+
};
|
|
55
|
+
|
|
56
|
+
const onEndCb = e => {
|
|
57
|
+
if (onEnd) onEnd(e);
|
|
58
|
+
if (!enableEvents) setEvents({
|
|
59
|
+
enabled: true
|
|
60
|
+
});
|
|
61
|
+
};
|
|
62
|
+
|
|
41
63
|
controls.addEventListener('change', callback);
|
|
42
|
-
|
|
43
|
-
|
|
64
|
+
controls.addEventListener('start', onStartCb);
|
|
65
|
+
controls.addEventListener('end', onEndCb);
|
|
44
66
|
return () => {
|
|
45
|
-
|
|
46
|
-
|
|
67
|
+
controls.removeEventListener('start', onStartCb);
|
|
68
|
+
controls.removeEventListener('end', onEndCb);
|
|
47
69
|
controls.removeEventListener('change', callback);
|
|
48
70
|
};
|
|
49
|
-
}, [onChange, onStart, onEnd, controls, invalidate]);
|
|
71
|
+
}, [onChange, onStart, onEnd, controls, invalidate, enableEvents, setEvents]);
|
|
50
72
|
React.useEffect(() => {
|
|
51
73
|
if (makeDefault) {
|
|
52
74
|
const old = get().controls;
|