@react-three/drei 9.121.6-rc.1 → 9.122.0

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.
Files changed (201) hide show
  1. package/core/AccumulativeShadows.d.ts +10 -8
  2. package/core/ArcballControls.d.ts +4 -4
  3. package/core/AsciiRenderer.d.ts +2 -1
  4. package/core/BBAnchor.d.ts +3 -3
  5. package/core/Backdrop.d.ts +1 -2
  6. package/core/Billboard.cjs.js +1 -1
  7. package/core/Billboard.d.ts +2 -3
  8. package/core/Billboard.js +1 -1
  9. package/core/Bounds.d.ts +1 -2
  10. package/core/Bvh.d.ts +2 -3
  11. package/core/CameraControls.d.ts +4 -4
  12. package/core/CatmullRomLine.d.ts +3 -2
  13. package/core/Caustics.d.ts +17 -14
  14. package/core/Center.d.ts +2 -3
  15. package/core/Clone.d.ts +4 -4
  16. package/core/Cloud.cjs.js +1 -1
  17. package/core/Cloud.d.ts +12 -50
  18. package/core/Cloud.js +3 -3
  19. package/core/ComputedAttribute.cjs.js +1 -1
  20. package/core/ComputedAttribute.d.ts +4 -3
  21. package/core/ComputedAttribute.js +1 -1
  22. package/core/ContactShadows.d.ts +2 -3
  23. package/core/CubeCamera.d.ts +3 -3
  24. package/core/CubeTexture.d.ts +6 -5
  25. package/core/CubeTexture.js +7 -2
  26. package/core/CubicBezierLine.d.ts +3 -2
  27. package/core/CurveModifier.d.ts +1 -2
  28. package/core/Decal.d.ts +2 -2
  29. package/core/Detailed.d.ts +3 -3
  30. package/core/DetectGPU.d.ts +2 -1
  31. package/core/DeviceOrientationControls.d.ts +2 -2
  32. package/core/Edges.cjs.js +1 -1
  33. package/core/Edges.d.ts +2 -2
  34. package/core/Edges.js +2 -2
  35. package/core/Effects.cjs.js +1 -1
  36. package/core/Effects.d.ts +13 -9
  37. package/core/Effects.js +3 -3
  38. package/core/Environment.cjs.js +1 -1
  39. package/core/Environment.d.ts +7 -5
  40. package/core/Fbo.d.ts +4 -1
  41. package/core/Fbo.js +2 -0
  42. package/core/Fbx.d.ts +1 -1
  43. package/core/FirstPersonControls.d.ts +2 -2
  44. package/core/Fisheye.d.ts +1 -2
  45. package/core/Float.d.ts +1 -2
  46. package/core/FlyControls.d.ts +2 -2
  47. package/core/GizmoHelper.d.ts +1 -2
  48. package/core/GizmoViewport.d.ts +2 -2
  49. package/core/Gltf.d.ts +5 -9
  50. package/core/GradientTexture.d.ts +4 -4
  51. package/core/GradientTexture.js +2 -0
  52. package/core/Grid.d.ts +7 -6
  53. package/core/Helper.cjs.js +1 -1
  54. package/core/Helper.d.ts +1 -1
  55. package/core/Helper.js +1 -1
  56. package/core/Hud.d.ts +2 -1
  57. package/core/Image.d.ts +8 -6
  58. package/core/Instances.cjs.js +1 -1
  59. package/core/Instances.d.ts +35 -27
  60. package/core/Instances.js +30 -35
  61. package/core/Ktx2.d.ts +1 -1
  62. package/core/Lightformer.d.ts +3 -3
  63. package/core/Line.d.ts +4 -4
  64. package/core/MapControls.d.ts +4 -4
  65. package/core/MarchingCubes.d.ts +6 -6
  66. package/core/Mask.d.ts +3 -3
  67. package/core/MeshDiscardMaterial.d.ts +7 -6
  68. package/core/MeshDistortMaterial.d.ts +17 -15
  69. package/core/MeshPortalMaterial.cjs.js +1 -1
  70. package/core/MeshPortalMaterial.d.ts +17 -14
  71. package/core/MeshPortalMaterial.js +2 -2
  72. package/core/MeshReflectorMaterial.cjs.js +1 -1
  73. package/core/MeshReflectorMaterial.d.ts +22 -9
  74. package/core/MeshReflectorMaterial.js +4 -2
  75. package/core/MeshRefractionMaterial.cjs.js +1 -1
  76. package/core/MeshRefractionMaterial.d.ts +8 -5
  77. package/core/MeshRefractionMaterial.js +2 -2
  78. package/core/MeshTransmissionMaterial.cjs.js +1 -1
  79. package/core/MeshTransmissionMaterial.d.ts +8 -7
  80. package/core/MeshTransmissionMaterial.js +1 -2
  81. package/core/MeshWobbleMaterial.d.ts +17 -15
  82. package/core/MotionPathControls.cjs.js +1 -1
  83. package/core/MotionPathControls.d.ts +11 -18
  84. package/core/MotionPathControls.js +32 -24
  85. package/core/MultiMaterial.cjs.js +1 -1
  86. package/core/MultiMaterial.d.ts +1 -3
  87. package/core/MultiMaterial.js +3 -2
  88. package/core/OrbitControls.d.ts +4 -4
  89. package/core/OrthographicCamera.d.ts +3 -3
  90. package/core/Outlines.cjs.js +1 -1
  91. package/core/Outlines.d.ts +3 -2
  92. package/core/Outlines.js +2 -2
  93. package/core/PerformanceMonitor.d.ts +2 -2
  94. package/core/PerspectiveCamera.d.ts +3 -3
  95. package/core/PointMaterial.d.ts +11 -3
  96. package/core/PointerLockControls.d.ts +2 -2
  97. package/core/Points.cjs.js +1 -1
  98. package/core/Points.d.ts +13 -10
  99. package/core/Points.js +16 -6
  100. package/core/PositionalAudio.d.ts +3 -3
  101. package/core/Preload.d.ts +3 -2
  102. package/core/QuadraticBezierLine.d.ts +7 -5
  103. package/core/Reflector.cjs.js +1 -0
  104. package/core/Reflector.d.ts +30 -0
  105. package/core/Reflector.js +180 -0
  106. package/core/RenderCubeTexture.d.ts +2 -2
  107. package/core/RenderTexture.cjs.js +1 -1
  108. package/core/RenderTexture.d.ts +3 -3
  109. package/core/RenderTexture.js +2 -3
  110. package/core/Resize.d.ts +2 -9
  111. package/core/RoundedBox.d.ts +4 -4
  112. package/core/Sampler.d.ts +4 -4
  113. package/core/ScreenQuad.d.ts +3 -3
  114. package/core/ScreenSizer.d.ts +3 -3
  115. package/core/ScreenSpace.d.ts +2 -3
  116. package/core/Segments.d.ts +8 -6
  117. package/core/Shadow.d.ts +3 -3
  118. package/core/ShadowAlpha.cjs.js +1 -1
  119. package/core/ShadowAlpha.d.ts +2 -1
  120. package/core/ShadowAlpha.js +1 -1
  121. package/core/Sky.d.ts +3 -2
  122. package/core/Sparkles.d.ts +16 -14
  123. package/core/Splat.d.ts +8 -6
  124. package/core/SpotLight.d.ts +1 -2
  125. package/core/SpriteAnimator.cjs.js +1 -1
  126. package/core/SpriteAnimator.d.ts +3 -36
  127. package/core/Stage.cjs.js +1 -1
  128. package/core/Stage.d.ts +2 -3
  129. package/core/Stars.cjs.js +1 -1
  130. package/core/Stars.d.ts +8 -6
  131. package/core/Stars.js +1 -1
  132. package/core/Stats.d.ts +3 -2
  133. package/core/StatsGl.d.ts +2 -2
  134. package/core/Svg.d.ts +6 -6
  135. package/core/Text.d.ts +4 -3
  136. package/core/Text3D.d.ts +10 -7
  137. package/core/Texture.d.ts +1 -1
  138. package/core/TrackballControls.d.ts +4 -4
  139. package/core/Trail.cjs.js +1 -1
  140. package/core/Trail.d.ts +3 -3
  141. package/core/Trail.js +3 -3
  142. package/core/TrailTexture.d.ts +2 -3
  143. package/core/TransformControls.cjs.js +1 -1
  144. package/core/TransformControls.d.ts +3 -3
  145. package/core/TransformControls.js +5 -4
  146. package/core/VideoTexture.cjs.js +1 -1
  147. package/core/VideoTexture.js +1 -1
  148. package/core/Wireframe.d.ts +7 -5
  149. package/core/index.cjs.js +1 -1
  150. package/core/index.d.ts +1 -0
  151. package/core/index.js +3 -1
  152. package/core/shapes.d.ts +20 -21
  153. package/core/softShadows.d.ts +2 -1
  154. package/core/useAnimations.cjs.js +1 -1
  155. package/core/useAnimations.d.ts +2 -2
  156. package/core/useAnimations.js +1 -1
  157. package/core/useBoxProjectedEnv.d.ts +1 -1
  158. package/core/useCamera.cjs.js +1 -1
  159. package/core/useCamera.d.ts +1 -1
  160. package/core/useCamera.js +8 -1
  161. package/core/useContextBridge.d.ts +1 -1
  162. package/core/useEnvironment.cjs.js +1 -1
  163. package/core/useEnvironment.d.ts +4 -3
  164. package/core/useEnvironment.js +19 -11
  165. package/core/useIntersect.d.ts +1 -1
  166. package/core/useSpriteLoader.d.ts +1 -1
  167. package/helpers/deprecated.cjs.js +1 -1
  168. package/helpers/deprecated.d.ts +4 -1
  169. package/helpers/deprecated.js +14 -2
  170. package/helpers/ts-utils.d.ts +0 -4
  171. package/helpers/useEffectfulState.d.ts +1 -1
  172. package/index.cjs.js +1 -1
  173. package/index.js +1 -0
  174. package/materials/BlurPass.js +1 -0
  175. package/materials/MeshReflectorMaterial.d.ts +16 -0
  176. package/native/index.cjs.js +1 -1
  177. package/native/index.js +3 -1
  178. package/package.json +8 -7
  179. package/web/CycleRaycast.d.ts +1 -1
  180. package/web/FaceLandmarker.d.ts +2 -1
  181. package/web/Facemesh.d.ts +2 -3
  182. package/web/Html.cjs.js +1 -1
  183. package/web/Html.d.ts +4 -4
  184. package/web/Html.js +1 -1
  185. package/web/KeyboardControls.d.ts +1 -1
  186. package/web/PresentationControls.cjs.js +1 -1
  187. package/web/PresentationControls.d.ts +4 -3
  188. package/web/PresentationControls.js +28 -20
  189. package/web/ScrollControls.d.ts +1 -1
  190. package/web/Select.d.ts +3 -3
  191. package/web/Select.js +2 -6
  192. package/web/View.cjs.js +1 -1
  193. package/web/View.d.ts +10 -8
  194. package/web/View.js +34 -4
  195. package/web/index.cjs.js +1 -1
  196. package/web/index.js +3 -0
  197. package/web/pivotControls/AxisArrow.js +2 -0
  198. package/web/pivotControls/AxisRotator.js +2 -0
  199. package/web/pivotControls/PlaneSlider.js +2 -0
  200. package/web/pivotControls/ScalingSphere.js +1 -0
  201. package/web/pivotControls/index.d.ts +2 -1
@@ -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("./Fbo.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")},anisotropicBlur:{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},this.anisotropy>0&&(t.defines.USE_ANISOTROPY=""),e?t.defines.USE_SAMPLER="":t.defines.USE_TRANSMISSION="",t.fragmentShader="\n uniform float chromaticAberration; \n uniform float anisotropicBlur; \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 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 randomBase( float x ) { return floatConstruct(hash(floatBitsToUint(x))); }\n float randomBase( vec2 v ) { return floatConstruct(hash(floatBitsToUint(v))); }\n float randomBase( vec3 v ) { return floatConstruct(hash(floatBitsToUint(v))); }\n float randomBase( vec4 v ) { return floatConstruct(hash(floatBitsToUint(v))); }\n float rand(float seed) {\n float result = randomBase(vec3(gl_FragCoord.xy, seed));\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 float runningSeed = 0.0;\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(runningSeed++);\n float thickness_smear = thickness * max(pow(roughnessFactor, 0.33), anisotropicBlur);\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 + roughnessFactor * roughnessFactor * 2.0 * normalize(vec3(rand(runningSeed++) - 0.5, rand(runningSeed++) - 0.5, rand(runningSeed++) - 0.5)) * pow(rand(runningSeed++), 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,side:i=c.FrontSide,transmission:s=1,thickness:f=0,backsideThickness:d=0,backsideEnvMapIntensity:v=1,samples:h=10,resolution:p,backsideResolution:x,background:g,anisotropy:S,anisotropicBlur:M,...b},C)=>{a.extend({MeshTransmissionMaterial:u});const y=m.useRef(null),[w]=m.useState((()=>new o.DiscardMaterial)),k=r.useFBO(x||p),D=r.useFBO(p);let R,T,F,j;return a.useFrame((n=>{var a;(y.current.time=n.clock.elapsedTime,y.current.buffer!==D.texture||e)||(j=null==(a=y.current.__r3f.parent)?void 0:a.object,j&&(F=n.gl.toneMapping,R=n.scene.background,T=y.current.envMapIntensity,n.gl.toneMapping=c.NoToneMapping,g&&(n.scene.background=g),j.material=w,t&&(n.gl.setRenderTarget(k),n.gl.render(n.scene,n.camera),j.material=y.current,j.material.buffer=k.texture,j.material.thickness=d,j.material.side=c.BackSide,j.material.envMapIntensity=v),n.gl.setRenderTarget(D),n.gl.render(n.scene,n.camera),j.material=y.current,j.material.thickness=f,j.material.side=i,j.material.buffer=D.texture,j.material.envMapIntensity=T,n.scene.background=R,n.gl.setRenderTarget(null),n.gl.toneMapping=F))})),m.useImperativeHandle(C,(()=>y.current),[]),m.createElement("meshTransmissionMaterial",l.default({args:[h,e],ref:y},b,{buffer:n||D.texture,_transmission:s,anisotropicBlur:null!=M?M:S,transmission:e?s:0,thickness:f,side:i}))}));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("./Fbo.cjs.js"),i=require("../materials/DiscardMaterial.cjs.js");function o(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=o(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")},anisotropicBlur:{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},this.anisotropy>0&&(t.defines.USE_ANISOTROPY=""),e?t.defines.USE_SAMPLER="":t.defines.USE_TRANSMISSION="",t.fragmentShader="\n uniform float chromaticAberration; \n uniform float anisotropicBlur; \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 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 randomBase( float x ) { return floatConstruct(hash(floatBitsToUint(x))); }\n float randomBase( vec2 v ) { return floatConstruct(hash(floatBitsToUint(v))); }\n float randomBase( vec3 v ) { return floatConstruct(hash(floatBitsToUint(v))); }\n float randomBase( vec4 v ) { return floatConstruct(hash(floatBitsToUint(v))); }\n float rand(float seed) {\n float result = randomBase(vec3(gl_FragCoord.xy, seed));\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 float runningSeed = 0.0;\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(runningSeed++);\n float thickness_smear = thickness * max(pow(roughnessFactor, 0.33), anisotropicBlur);\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 + roughnessFactor * roughnessFactor * 2.0 * normalize(vec3(rand(runningSeed++) - 0.5, rand(runningSeed++) - 0.5, rand(runningSeed++) - 0.5)) * pow(rand(runningSeed++), 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,side:o=c.FrontSide,transmission:s=1,thickness:f=0,backsideThickness:d=0,backsideEnvMapIntensity:v=1,samples:h=10,resolution:p,backsideResolution:x,background:g,anisotropy:S,anisotropicBlur:M,...C},b)=>{a.extend({MeshTransmissionMaterial:u});const y=m.useRef(null),[w]=m.useState((()=>new i.DiscardMaterial)),k=r.useFBO(x||p),D=r.useFBO(p);let R,T,F,B;return a.useFrame((n=>{y.current.time=n.clock.elapsedTime,y.current.buffer!==D.texture||e||(B=y.current.__r3f.parent,B&&(F=n.gl.toneMapping,R=n.scene.background,T=y.current.envMapIntensity,n.gl.toneMapping=c.NoToneMapping,g&&(n.scene.background=g),B.material=w,t&&(n.gl.setRenderTarget(k),n.gl.render(n.scene,n.camera),B.material=y.current,B.material.buffer=k.texture,B.material.thickness=d,B.material.side=c.BackSide,B.material.envMapIntensity=v),n.gl.setRenderTarget(D),n.gl.render(n.scene,n.camera),B.material=y.current,B.material.thickness=f,B.material.side=o,B.material.buffer=D.texture,B.material.envMapIntensity=T,n.scene.background=R,n.gl.setRenderTarget(null),n.gl.toneMapping=F))})),m.useImperativeHandle(b,(()=>y.current),[]),m.createElement("meshTransmissionMaterial",l.default({args:[h,e],ref:y},C,{buffer:n||D.texture,_transmission:s,anisotropicBlur:null!=M?M:S,transmission:e?s:0,thickness:f,side:o}))}));exports.MeshTransmissionMaterial=f;
@@ -1,7 +1,6 @@
1
1
  import * as THREE from 'three';
2
- import { ThreeElements } from '@react-three/fiber';
3
2
  import { ForwardRefComponent } from '../helpers/ts-utils';
4
- type MeshTransmissionMaterialType = Omit<ThreeElements['meshPhysicalMaterial'], 'args' | 'roughness' | 'thickness' | 'transmission'> & {
3
+ type MeshTransmissionMaterialType = Omit<JSX.IntrinsicElements['meshPhysicalMaterial'], 'args' | 'roughness' | 'thickness' | 'transmission'> & {
5
4
  transmission?: number;
6
5
  thickness?: number;
7
6
  roughness?: number;
@@ -15,7 +14,7 @@ type MeshTransmissionMaterialType = Omit<ThreeElements['meshPhysicalMaterial'],
15
14
  time?: number;
16
15
  args?: [samples: number, transmissionSampler: boolean];
17
16
  };
18
- export type MeshTransmissionMaterialProps = Omit<MeshTransmissionMaterialType, 'ref' | 'args'> & {
17
+ type MeshTransmissionMaterialProps = Omit<MeshTransmissionMaterialType, 'args'> & {
19
18
  transmissionSampler?: boolean;
20
19
  backside?: boolean;
21
20
  backsideThickness?: number;
@@ -25,10 +24,12 @@ export type MeshTransmissionMaterialProps = Omit<MeshTransmissionMaterialType, '
25
24
  samples?: number;
26
25
  background?: THREE.Texture | THREE.Color;
27
26
  };
28
- declare module '@react-three/fiber' {
29
- interface ThreeElements {
30
- meshTransmissionMaterial: MeshTransmissionMaterialType;
27
+ declare global {
28
+ namespace JSX {
29
+ interface IntrinsicElements {
30
+ meshTransmissionMaterial: MeshTransmissionMaterialType;
31
+ }
31
32
  }
32
33
  }
33
- export declare const MeshTransmissionMaterial: ForwardRefComponent<MeshTransmissionMaterialProps, ThreeElements['meshTransmissionMaterial']>;
34
+ export declare const MeshTransmissionMaterial: ForwardRefComponent<MeshTransmissionMaterialProps, JSX.IntrinsicElements['meshTransmissionMaterial']>;
34
35
  export {};
@@ -334,8 +334,7 @@ const MeshTransmissionMaterial = /* @__PURE__ */React.forwardRef(({
334
334
  ref.current.time = state.clock.elapsedTime;
335
335
  // Render only if the buffer matches the built-in and no transmission sampler is set
336
336
  if (ref.current.buffer === fboMain.texture && !transmissionSampler) {
337
- var _r3f$parent;
338
- parent = (_r3f$parent = ref.current.__r3f.parent) == null ? void 0 : _r3f$parent.object;
337
+ parent = ref.current.__r3f.parent;
339
338
  if (parent) {
340
339
  // Save defaults
341
340
  oldTone = state.gl.toneMapping;
@@ -1,6 +1,21 @@
1
1
  import { IUniform, MeshStandardMaterial, MeshStandardMaterialParameters } from 'three';
2
- import { ThreeElements } from '@react-three/fiber';
3
2
  import { ForwardRefComponent } from '../helpers/ts-utils';
3
+ type WobbleMaterialType = JSX.IntrinsicElements['meshStandardMaterial'] & {
4
+ time?: number;
5
+ factor?: number;
6
+ speed?: number;
7
+ };
8
+ type Props = WobbleMaterialType & {
9
+ speed?: number;
10
+ factor?: number;
11
+ };
12
+ declare global {
13
+ namespace JSX {
14
+ interface IntrinsicElements {
15
+ wobbleMaterialImpl: WobbleMaterialType;
16
+ }
17
+ }
18
+ }
4
19
  interface Uniform<T> {
5
20
  value: T;
6
21
  }
@@ -19,18 +34,5 @@ declare class WobbleMaterialImpl extends MeshStandardMaterial {
19
34
  get factor(): number;
20
35
  set factor(v: number);
21
36
  }
22
- declare module '@react-three/fiber' {
23
- interface ThreeElements {
24
- wobbleMaterialImpl: ThreeElements['meshStandardMaterial'] & {
25
- time?: number;
26
- factor?: number;
27
- speed?: number;
28
- };
29
- }
30
- }
31
- export type WobbleMaterialProps = Omit<ThreeElements['meshStandardMaterial'], 'ref'> & {
32
- speed?: number;
33
- factor?: number;
34
- };
35
- export declare const MeshWobbleMaterial: ForwardRefComponent<WobbleMaterialProps, WobbleMaterialImpl>;
37
+ export declare const MeshWobbleMaterial: ForwardRefComponent<Props, WobbleMaterialImpl>;
36
38
  export {};
@@ -1 +1 @@
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("maath");function u(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function c(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 s=u(e),a=c(t),i=c(r);const f=i.createContext(null);function l(){return i.useContext(f)}function p({points:e=50}){const{path:t}=l(),[r,n]=i.useState([]),[o]=i.useState((()=>new a.MeshBasicMaterial({color:"black"}))),[u]=i.useState((()=>new a.SphereGeometry(.025,16,16))),c=i.useRef([]);return i.useEffect((()=>{t.curves!==c.current&&(n(t.getPoints(e)),c.current=t.curves)})),i.createElement(i.Fragment,null,r.map(((e,t)=>i.createElement("mesh",{key:t,material:o,geometry:u,position:[e.x,e.y,e.z]}))))}const m=i.forwardRef((({children:e,curves:t=[],object:r,debug:u=!1,smooth:c=!1,focus:l,offset:m,eps:d=1e-5,damping:g=.1,focusDamping:v=.1,maxSpeed:h=1/0,...b},j)=>{const{camera:y}=n.useThree(),P=i.useRef(null),[w]=i.useState((()=>new a.CurvePath)),x=i.useRef(null!=m?m:0),O=i.useMemo((()=>({focus:l,object:(null==r?void 0:r.current)instanceof a.Object3D?r:{current:y},path:w,current:x.current,offset:x.current,point:new a.Vector3,tangent:new a.Vector3,next:new a.Vector3})),[l,r]);i.useLayoutEffect((()=>{w.curves=[];const e=t.length>0?t:P.current.__r3f.children.map((e=>e.object));for(var r=0;r<e.length;r++)w.add(e[r]);if(c){const e=w.getPoints("number"==typeof c?c:1),t=new a.CatmullRomCurve3(e);w.curves=[t]}w.updateArcLengths()})),i.useImperativeHandle(j,(()=>P.current),[]),i.useLayoutEffect((()=>{x.current=o.misc.repeat(x.current,1)}),[m]);let E=0;const[C]=i.useState((()=>new a.Vector3));return n.useFrame(((e,t)=>{if(E=O.offset,o.easing.damp(x,"current",void 0!==m?m:O.current,g,t,h,void 0,d),O.offset=o.misc.repeat(x.current,1),w.getCurveLengths().length>0){w.getPointAt(O.offset,O.point),w.getTangentAt(O.offset,O.tangent).normalize(),w.getPointAt(o.misc.repeat(x.current-(E-O.offset),1),O.next);const e=(null==r?void 0:r.current)instanceof a.Object3D?r.current:y;e.position.copy(O.point),l&&o.easing.dampLookAt(e,(e=>(null==e?void 0:e.current)instanceof a.Object3D)(l)?l.current.getWorldPosition(C):l,v,t,h,void 0,d)}})),i.createElement("group",s.default({ref:P},b),i.createElement(f.Provider,{value:O},e,u&&i.createElement(p,null)))}));exports.MotionPathControls=m,exports.useMotion=l;
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("maath");function u(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function c(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 s=u(e),a=c(t),i=c(r);const l=i.createContext(null);function f(){const e=i.useContext(l);if(!e)throw new Error("useMotion hook must be used in a MotionPathControls component.");return e}function m({points:e=50,color:t="black"}){const{path:r}=f(),[n,o]=i.useState([]),u=i.useMemo((()=>new a.MeshBasicMaterial({color:t})),[t]),c=i.useMemo((()=>new a.SphereGeometry(.025,16,16)),[]),s=i.useRef([]);return i.useEffect((()=>{r.curves!==s.current&&(o(r.getPoints(e)),s.current=r.curves)})),n.map(((e,t)=>i.createElement("mesh",{key:t,material:u,geometry:c,position:[e.x,e.y,e.z]})))}const p=i.forwardRef((({children:e,curves:t=[],debug:r=!1,debugColor:u="black",object:c,focus:f,loop:p=!0,offset:d,smooth:g=!1,eps:v=1e-5,damping:b=.1,focusDamping:h=.1,maxSpeed:j=1/0,...y},M)=>{const{camera:w}=n.useThree(),P=i.useRef(null),O=i.useRef(null!=d?d:0),x=i.useMemo((()=>new a.CurvePath),[]),C=i.useMemo((()=>({focus:f,object:(null==c?void 0:c.current)instanceof a.Object3D?c:{current:w},path:x,current:O.current,offset:O.current,point:new a.Vector3,tangent:new a.Vector3,next:new a.Vector3})),[f,c]);i.useLayoutEffect((()=>{var e,r;x.curves=[];const n=t.length>0?t:null!==(e=null==(r=P.current)||null==(r=r.__r3f)?void 0:r.objects)&&void 0!==e?e:[];for(let e=0;e<n.length;e++)x.add(n[e]);if(g){const e=x.getPoints("number"==typeof g?g:1),t=new a.CatmullRomCurve3(e);x.curves=[t]}x.updateArcLengths()})),i.useImperativeHandle(M,(()=>Object.assign(P.current,{motion:C})),[C]),i.useLayoutEffect((()=>{O.current=o.misc.repeat(O.current,1)}),[d]);const E=i.useMemo((()=>new a.Vector3),[]);return n.useFrame(((e,t)=>{const r=C.offset;if(o.easing.damp(O,"current",void 0!==d?d:C.current,b,t,j,void 0,v),C.offset=p?o.misc.repeat(O.current,1):o.misc.clamp(O.current,0,1),x.getCurveLengths().length>0){x.getPointAt(C.offset,C.point),x.getTangentAt(C.offset,C.tangent).normalize(),x.getPointAt(o.misc.repeat(O.current-(r-C.offset),1),C.next);const e=(null==c?void 0:c.current)instanceof a.Object3D?c.current:w;e.position.copy(C.point),f&&o.easing.dampLookAt(e,(e=>(null==e?void 0:e.current)instanceof a.Object3D)(f)?f.current.getWorldPosition(E):f,h,t,j,void 0,v)}})),i.createElement("group",s.default({ref:P},y),i.createElement(l.Provider,{value:C},e,r&&i.createElement(m,{color:u})))}));exports.MotionPathControls=p,exports.useMotion=f;
@@ -1,11 +1,12 @@
1
1
  import * as THREE from 'three';
2
2
  import * as React from 'react';
3
- import { ThreeElements } from '@react-three/fiber';
4
- export type MotionPathProps = Omit<ThreeElements['group'], 'ref'> & {
3
+ type MotionPathProps = JSX.IntrinsicElements['group'] & {
5
4
  curves?: THREE.Curve<THREE.Vector3>[];
6
5
  debug?: boolean;
7
- object?: React.RefObject<THREE.Object3D>;
8
- focus?: [x: number, y: number, z: number] | React.RefObject<THREE.Object3D>;
6
+ debugColor?: THREE.ColorRepresentation;
7
+ object?: React.MutableRefObject<THREE.Object3D>;
8
+ focus?: [x: number, y: number, z: number] | React.MutableRefObject<THREE.Object3D>;
9
+ loop?: boolean;
9
10
  offset?: number;
10
11
  smooth?: boolean | number;
11
12
  eps?: number;
@@ -16,24 +17,16 @@ export type MotionPathProps = Omit<ThreeElements['group'], 'ref'> & {
16
17
  type MotionState = {
17
18
  current: number;
18
19
  path: THREE.CurvePath<THREE.Vector3>;
19
- focus: React.RefObject<THREE.Object3D> | [x: number, y: number, z: number] | undefined;
20
- object: React.RefObject<THREE.Object3D>;
20
+ focus: React.MutableRefObject<THREE.Object3D> | [x: number, y: number, z: number] | undefined;
21
+ object: React.MutableRefObject<THREE.Object3D>;
21
22
  offset: number;
22
23
  point: THREE.Vector3;
23
24
  tangent: THREE.Vector3;
24
25
  next: THREE.Vector3;
25
26
  };
27
+ export type MotionPathRef = THREE.Group & {
28
+ motion: MotionState;
29
+ };
26
30
  export declare function useMotion(): MotionState;
27
- export declare const MotionPathControls: React.ForwardRefExoticComponent<Omit<import("@react-three/fiber/dist/declarations/src/core/utils").Mutable<import("@react-three/fiber/dist/declarations/src/core/utils").Overwrite<Partial<import("@react-three/fiber/dist/declarations/src/core/utils").Overwrite<THREE.Group<THREE.Object3DEventMap>, import("@react-three/fiber").MathProps<THREE.Group<THREE.Object3DEventMap>> & import("@react-three/fiber").ReactProps<THREE.Group<THREE.Object3DEventMap>> & Partial<import("@react-three/fiber").EventHandlers>>>, Omit<import("@react-three/fiber").InstanceProps<THREE.Group<THREE.Object3DEventMap>, typeof THREE.Group>, "object">>>, "ref"> & {
28
- curves?: THREE.Curve<THREE.Vector3>[];
29
- debug?: boolean;
30
- object?: React.RefObject<THREE.Object3D>;
31
- focus?: [x: number, y: number, z: number] | React.RefObject<THREE.Object3D>;
32
- offset?: number;
33
- smooth?: boolean | number;
34
- eps?: number;
35
- damping?: number;
36
- focusDamping?: number;
37
- maxSpeed?: number;
38
- } & React.RefAttributes<THREE.Group<THREE.Object3DEventMap>>>;
31
+ export declare const MotionPathControls: React.ForwardRefExoticComponent<Omit<MotionPathProps, "ref"> & React.RefAttributes<MotionPathRef>>;
39
32
  export {};
@@ -5,21 +5,24 @@ import { useThree, useFrame } from '@react-three/fiber';
5
5
  import { misc, easing } from 'maath';
6
6
 
7
7
  const isObject3DRef = ref => (ref == null ? void 0 : ref.current) instanceof THREE.Object3D;
8
- const context = /* @__PURE__ */React.createContext(null);
8
+ const MotionContext = /* @__PURE__ */React.createContext(null);
9
9
  function useMotion() {
10
- return React.useContext(context);
10
+ const context = React.useContext(MotionContext);
11
+ if (!context) throw new Error('useMotion hook must be used in a MotionPathControls component.');
12
+ return context;
11
13
  }
12
14
  function Debug({
13
- points = 50
15
+ points = 50,
16
+ color = 'black'
14
17
  }) {
15
18
  const {
16
19
  path
17
20
  } = useMotion();
18
21
  const [dots, setDots] = React.useState([]);
19
- const [material] = React.useState(() => new THREE.MeshBasicMaterial({
20
- color: 'black'
21
- }));
22
- const [geometry] = React.useState(() => new THREE.SphereGeometry(0.025, 16, 16));
22
+ const material = React.useMemo(() => new THREE.MeshBasicMaterial({
23
+ color: color
24
+ }), [color]);
25
+ const geometry = React.useMemo(() => new THREE.SphereGeometry(0.025, 16, 16), []);
23
26
  const last = React.useRef([]);
24
27
  React.useEffect(() => {
25
28
  if (path.curves !== last.current) {
@@ -27,21 +30,23 @@ function Debug({
27
30
  last.current = path.curves;
28
31
  }
29
32
  });
30
- return /*#__PURE__*/React.createElement(React.Fragment, null, dots.map((item, index) => /*#__PURE__*/React.createElement("mesh", {
33
+ return dots.map((item, index) => /*#__PURE__*/React.createElement("mesh", {
31
34
  key: index,
32
35
  material: material,
33
36
  geometry: geometry,
34
37
  position: [item.x, item.y, item.z]
35
- })));
38
+ }));
36
39
  }
37
40
  const MotionPathControls = /* @__PURE__ */React.forwardRef(({
38
41
  children,
39
42
  curves = [],
40
- object,
41
43
  debug = false,
42
- smooth = false,
44
+ debugColor = 'black',
45
+ object,
43
46
  focus,
47
+ loop = true,
44
48
  offset = undefined,
49
+ smooth = false,
45
50
  eps = 0.00001,
46
51
  damping = 0.1,
47
52
  focusDamping = 0.1,
@@ -52,8 +57,8 @@ const MotionPathControls = /* @__PURE__ */React.forwardRef(({
52
57
  camera
53
58
  } = useThree();
54
59
  const ref = React.useRef(null);
55
- const [path] = React.useState(() => new THREE.CurvePath());
56
60
  const pos = React.useRef(offset !== null && offset !== void 0 ? offset : 0);
61
+ const path = React.useMemo(() => new THREE.CurvePath(), []);
57
62
  const state = React.useMemo(() => ({
58
63
  focus,
59
64
  object: (object == null ? void 0 : object.current) instanceof THREE.Object3D ? object : {
@@ -67,11 +72,12 @@ const MotionPathControls = /* @__PURE__ */React.forwardRef(({
67
72
  next: new THREE.Vector3()
68
73
  }), [focus, object]);
69
74
  React.useLayoutEffect(() => {
75
+ var _r3f$objects, _ref$current;
70
76
  path.curves = [];
71
- const _curves = curves.length > 0 ? curves : ref.current.__r3f.children.map(instance => instance.object);
72
- for (var i = 0; i < _curves.length; i++) path.add(_curves[i]);
77
+ const _curves = curves.length > 0 ? curves : (_r3f$objects = (_ref$current = ref.current) == null || (_ref$current = _ref$current.__r3f) == null ? void 0 : _ref$current.objects) !== null && _r3f$objects !== void 0 ? _r3f$objects : [];
78
+ for (let i = 0; i < _curves.length; i++) path.add(_curves[i]);
73
79
 
74
- //Smoothen curve
80
+ // Smoothen curve
75
81
  if (smooth) {
76
82
  const points = path.getPoints(typeof smooth === 'number' ? smooth : 1);
77
83
  const catmull = new THREE.CatmullRomCurve3(points);
@@ -79,24 +85,24 @@ const MotionPathControls = /* @__PURE__ */React.forwardRef(({
79
85
  }
80
86
  path.updateArcLengths();
81
87
  });
82
- React.useImperativeHandle(fref, () => ref.current, []);
88
+ React.useImperativeHandle(fref, () => Object.assign(ref.current, {
89
+ motion: state
90
+ }), [state]);
83
91
  React.useLayoutEffect(() => {
84
92
  // When offset changes, normalise pos to avoid overshoot spinning
85
93
  pos.current = misc.repeat(pos.current, 1);
86
94
  }, [offset]);
87
- let last = 0;
88
- const [vec] = React.useState(() => new THREE.Vector3());
95
+ const vec = React.useMemo(() => new THREE.Vector3(), []);
89
96
  useFrame((_state, delta) => {
90
- last = state.offset;
97
+ const lastOffset = state.offset;
91
98
  easing.damp(pos, 'current', offset !== undefined ? offset : state.current, damping, delta, maxSpeed, undefined, eps);
92
- state.offset = misc.repeat(pos.current, 1);
99
+ state.offset = loop ? misc.repeat(pos.current, 1) : misc.clamp(pos.current, 0, 1);
93
100
  if (path.getCurveLengths().length > 0) {
94
101
  path.getPointAt(state.offset, state.point);
95
102
  path.getTangentAt(state.offset, state.tangent).normalize();
96
- path.getPointAt(misc.repeat(pos.current - (last - state.offset), 1), state.next);
103
+ path.getPointAt(misc.repeat(pos.current - (lastOffset - state.offset), 1), state.next);
97
104
  const target = (object == null ? void 0 : object.current) instanceof THREE.Object3D ? object.current : camera;
98
105
  target.position.copy(state.point);
99
- //@ts-ignore
100
106
  if (focus) {
101
107
  easing.dampLookAt(target, isObject3DRef(focus) ? focus.current.getWorldPosition(vec) : focus, focusDamping, delta, maxSpeed, undefined, eps);
102
108
  }
@@ -104,9 +110,11 @@ const MotionPathControls = /* @__PURE__ */React.forwardRef(({
104
110
  });
105
111
  return /*#__PURE__*/React.createElement("group", _extends({
106
112
  ref: ref
107
- }, props), /*#__PURE__*/React.createElement(context.Provider, {
113
+ }, props), /*#__PURE__*/React.createElement(MotionContext.Provider, {
108
114
  value: state
109
- }, children, debug && /*#__PURE__*/React.createElement(Debug, null)));
115
+ }, children, debug && /*#__PURE__*/React.createElement(Debug, {
116
+ color: debugColor
117
+ })));
110
118
  });
111
119
 
112
120
  export { MotionPathControls, useMotion };
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),r=require("react");function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function u(e){if(e&&e.__esModule)return e;var r=Object.create(null);return e&&Object.keys(e).forEach((function(t){if("default"!==t){var u=Object.getOwnPropertyDescriptor(e,t);Object.defineProperty(r,t,u.get?u:{enumerable:!0,get:function(){return e[t]}})}})),r.default=e,Object.freeze(r)}var n=t(e),a=u(r);exports.MultiMaterial=function(e){const r=a.useRef(null);return a.useLayoutEffect((()=>{const e=r.current.parent,t=null==e?void 0:e.geometry;if(t){const u=e.material;e.material=r.current.__r3f.children.map((e=>e.object));const n=[...t.groups];return t.clearGroups(),e.material.forEach(((r,u)=>{u<e.material.length-1&&(r.depthWrite=!1),t.addGroup(0,1/0,u)})),()=>{e.material=u,t.groups=n}}})),a.createElement("group",n.default({ref:r},e))};
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),r=require("react");function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function u(e){if(e&&e.__esModule)return e;var r=Object.create(null);return e&&Object.keys(e).forEach((function(t){if("default"!==t){var u=Object.getOwnPropertyDescriptor(e,t);Object.defineProperty(r,t,u.get?u:{enumerable:!0,get:function(){return e[t]}})}})),r.default=e,Object.freeze(r)}var n=t(e),a=u(r);exports.MultiMaterial=function(e){const r=a.useRef(null);return a.useLayoutEffect((()=>{var e;const t=null==(e=r.current)?void 0:e.parent,u=null==t?void 0:t.geometry;if(u){const e=t.material;t.material=r.current.__r3f.objects;const n=[...u.groups];return u.clearGroups(),t.material.forEach(((e,r)=>{r<t.material.length-1&&(e.depthWrite=!1),u.addGroup(0,1/0,r)})),()=>{t.material=e,u.groups=n}}})),a.createElement("group",n.default({ref:r},e))};
@@ -1,4 +1,2 @@
1
- import { ThreeElements } from '@react-three/fiber';
2
1
  import * as React from 'react';
3
- export type MultiMaterialProps = Omit<ThreeElements['group'], 'ref'>;
4
- export declare function MultiMaterial(props: MultiMaterialProps): React.JSX.Element;
2
+ export declare function MultiMaterial(props: JSX.IntrinsicElements['group']): React.JSX.Element;
@@ -4,11 +4,12 @@ import * as React from 'react';
4
4
  function MultiMaterial(props) {
5
5
  const group = React.useRef(null);
6
6
  React.useLayoutEffect(() => {
7
- const parent = group.current.parent;
7
+ var _group$current;
8
+ const parent = (_group$current = group.current) == null ? void 0 : _group$current.parent;
8
9
  const geometry = parent == null ? void 0 : parent.geometry;
9
10
  if (geometry) {
10
11
  const oldMaterial = parent.material;
11
- parent.material = group.current.__r3f.children.map(instance => instance.object);
12
+ parent.material = group.current.__r3f.objects;
12
13
  const oldGroups = [...geometry.groups];
13
14
  geometry.clearGroups();
14
15
  parent.material.forEach((material, index) => {
@@ -1,12 +1,12 @@
1
- import { ReactThreeFiber, ThreeElement } from '@react-three/fiber';
1
+ import { ReactThreeFiber } from '@react-three/fiber';
2
2
  import { Camera, Event } from 'three';
3
3
  import { OrbitControls as OrbitControlsImpl } from 'three-stdlib';
4
- import { ForwardRefComponent, Overwrite } from '../helpers/ts-utils';
4
+ import { ForwardRefComponent } from '../helpers/ts-utils';
5
5
  type ExtractCallback<T, E extends string> = T extends {
6
6
  addEventListener(event: E, callback: infer C): void;
7
7
  } ? C : never;
8
8
  export type OrbitControlsChangeEvent = Parameters<ExtractCallback<OrbitControlsImpl, 'change'>>[0];
9
- export type OrbitControlsProps = Omit<Overwrite<ThreeElement<typeof OrbitControlsImpl>, {
9
+ export type OrbitControlsProps = Omit<ReactThreeFiber.Overwrite<ReactThreeFiber.Object3DNode<OrbitControlsImpl, typeof OrbitControlsImpl>, {
10
10
  camera?: Camera;
11
11
  domElement?: HTMLElement;
12
12
  enableDamping?: boolean;
@@ -17,6 +17,6 @@ export type OrbitControlsProps = Omit<Overwrite<ThreeElement<typeof OrbitControl
17
17
  regress?: boolean;
18
18
  target?: ReactThreeFiber.Vector3;
19
19
  keyEvents?: boolean | HTMLElement;
20
- }>, 'ref' | 'args'>;
20
+ }>, 'ref'>;
21
21
  export declare const OrbitControls: ForwardRefComponent<OrbitControlsProps, OrbitControlsImpl>;
22
22
  export {};
@@ -1,9 +1,8 @@
1
1
  import * as THREE from 'three';
2
2
  import * as React from 'react';
3
3
  import { OrthographicCamera as OrthographicCameraImpl } from 'three';
4
- import { ThreeElements } from '@react-three/fiber';
5
4
  import { ForwardRefComponent } from '../helpers/ts-utils';
6
- export type OrthographicCameraProps = Omit<ThreeElements['orthographicCamera'], 'ref' | 'children'> & {
5
+ type Props = Omit<JSX.IntrinsicElements['orthographicCamera'], 'children'> & {
7
6
  makeDefault?: boolean;
8
7
  manual?: boolean;
9
8
  children?: React.ReactNode | ((texture: THREE.Texture) => React.ReactNode);
@@ -11,4 +10,5 @@ export type OrthographicCameraProps = Omit<ThreeElements['orthographicCamera'],
11
10
  resolution?: number;
12
11
  envMap?: THREE.Texture;
13
12
  };
14
- export declare const OrthographicCamera: ForwardRefComponent<OrthographicCameraProps, OrthographicCameraImpl>;
13
+ export declare const OrthographicCamera: ForwardRefComponent<Props, OrthographicCameraImpl>;
14
+ export {};
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),n=require("three"),r=require("react"),t=require("./shaderMaterial.cjs.js"),i=require("@react-three/fiber"),o=require("three-stdlib"),c=require("../helpers/constants.cjs.js");function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function s(e){if(e&&e.__esModule)return e;var n=Object.create(null);return e&&Object.keys(e).forEach((function(r){if("default"!==r){var t=Object.getOwnPropertyDescriptor(e,r);Object.defineProperty(n,r,t.get?t:{enumerable:!0,get:function(){return e[r]}})}})),n.default=e,Object.freeze(n)}var l=a(e),p=s(n),u=s(r);const f=t.shaderMaterial({screenspace:!1,color:new p.Color("black"),opacity:1,thickness:.05,size:new p.Vector2},"#include <common>\n #include <morphtarget_pars_vertex>\n #include <skinning_pars_vertex>\n #include <clipping_planes_pars_vertex>\n uniform float thickness;\n uniform bool screenspace;\n uniform vec2 size;\n void main() {\n #if defined (USE_SKINNING)\n\t #include <beginnormal_vertex>\n #include <morphnormal_vertex>\n #include <skinbase_vertex>\n #include <skinnormal_vertex>\n #include <defaultnormal_vertex>\n #endif\n #include <begin_vertex>\n\t #include <morphtarget_vertex>\n\t #include <skinning_vertex>\n #include <project_vertex>\n #include <clipping_planes_vertex>\n vec4 tNormal = vec4(normal, 0.0);\n vec4 tPosition = vec4(transformed, 1.0);\n #ifdef USE_INSTANCING\n tNormal = instanceMatrix * tNormal;\n tPosition = instanceMatrix * tPosition;\n #endif\n if (screenspace) {\n vec3 newPosition = tPosition.xyz + tNormal.xyz * thickness;\n gl_Position = projectionMatrix * modelViewMatrix * vec4(newPosition, 1.0); \n } else {\n vec4 clipPosition = projectionMatrix * modelViewMatrix * tPosition;\n vec4 clipNormal = projectionMatrix * modelViewMatrix * tNormal;\n vec2 offset = normalize(clipNormal.xy) * thickness / size * clipPosition.w * 2.0;\n clipPosition.xy += offset;\n gl_Position = clipPosition;\n }\n }",`uniform vec3 color;\n uniform float opacity;\n #include <clipping_planes_pars_fragment>\n void main(){\n #include <clipping_planes_fragment>\n gl_FragColor = vec4(color, opacity);\n #include <tonemapping_fragment>\n #include <${c.version>=154?"colorspace_fragment":"encodings_fragment"}>\n }`);exports.Outlines=function({color:e="black",opacity:n=1,transparent:r=!1,screenspace:t=!1,toneMapped:c=!0,polygonOffset:a=!1,polygonOffsetFactor:s=0,renderOrder:d=0,thickness:m=.05,angle:g=Math.PI,clippingPlanes:v,...h}){const y=u.useRef(null),[_]=u.useState((()=>new f({side:p.BackSide}))),{gl:x}=i.useThree(),M=x.getDrawingBufferSize(new p.Vector2);u.useMemo((()=>i.extend({OutlinesMaterial:f})),[]);const P=u.useRef(0),b=u.useRef(null);return u.useLayoutEffect((()=>{const e=y.current;if(!e)return;const n=e.parent;if(n&&n.geometry&&(P.current!==g||b.current!==n.geometry)){var r;P.current=g,b.current=n.geometry;let t=null==(r=e.children)?void 0:r[0];t&&(g&&t.geometry.dispose(),e.remove(t)),n.skeleton?(t=new p.SkinnedMesh,t.material=_,t.bind(n.skeleton,n.bindMatrix),e.add(t)):n.isInstancedMesh?(t=new p.InstancedMesh(n.geometry,_,n.count),t.instanceMatrix=n.instanceMatrix,e.add(t)):(t=new p.Mesh,t.material=_,e.add(t)),t.geometry=g?o.toCreasedNormals(n.geometry,g):n.geometry,t.morphTargetInfluences=n.morphTargetInfluences,t.morphTargetDictionary=n.morphTargetDictionary}})),u.useLayoutEffect((()=>{const o=y.current;if(!o)return;const l=o.children[0];if(l){l.renderOrder=d;const p=o.parent;i.applyProps(l,{morphTargetInfluences:p.morphTargetInfluences,morphTargetDictionary:p.morphTargetDictionary}),i.applyProps(l.material,{transparent:r,thickness:m,color:e,opacity:n,size:M,screenspace:t,toneMapped:c,polygonOffset:a,polygonOffsetFactor:s,clippingPlanes:v,clipping:v&&v.length>0})}})),u.useEffect((()=>()=>{const e=y.current;if(!e)return;const n=e.children[0];n&&(g&&n.geometry.dispose(),e.remove(n))}),[]),u.createElement("group",l.default({ref:y},h))};
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),n=require("three"),r=require("react"),t=require("./shaderMaterial.cjs.js"),i=require("@react-three/fiber"),o=require("three-stdlib"),c=require("../helpers/constants.cjs.js");function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function s(e){if(e&&e.__esModule)return e;var n=Object.create(null);return e&&Object.keys(e).forEach((function(r){if("default"!==r){var t=Object.getOwnPropertyDescriptor(e,r);Object.defineProperty(n,r,t.get?t:{enumerable:!0,get:function(){return e[r]}})}})),n.default=e,Object.freeze(n)}var l=a(e),p=s(n),u=s(r);const f=t.shaderMaterial({screenspace:!1,color:new p.Color("black"),opacity:1,thickness:.05,size:new p.Vector2},"#include <common>\n #include <morphtarget_pars_vertex>\n #include <skinning_pars_vertex>\n #include <clipping_planes_pars_vertex>\n uniform float thickness;\n uniform bool screenspace;\n uniform vec2 size;\n void main() {\n #if defined (USE_SKINNING)\n\t #include <beginnormal_vertex>\n #include <morphnormal_vertex>\n #include <skinbase_vertex>\n #include <skinnormal_vertex>\n #include <defaultnormal_vertex>\n #endif\n #include <begin_vertex>\n\t #include <morphtarget_vertex>\n\t #include <skinning_vertex>\n #include <project_vertex>\n #include <clipping_planes_vertex>\n vec4 tNormal = vec4(normal, 0.0);\n vec4 tPosition = vec4(transformed, 1.0);\n #ifdef USE_INSTANCING\n tNormal = instanceMatrix * tNormal;\n tPosition = instanceMatrix * tPosition;\n #endif\n if (screenspace) {\n vec3 newPosition = tPosition.xyz + tNormal.xyz * thickness;\n gl_Position = projectionMatrix * modelViewMatrix * vec4(newPosition, 1.0); \n } else {\n vec4 clipPosition = projectionMatrix * modelViewMatrix * tPosition;\n vec4 clipNormal = projectionMatrix * modelViewMatrix * tNormal;\n vec2 offset = normalize(clipNormal.xy) * thickness / size * clipPosition.w * 2.0;\n clipPosition.xy += offset;\n gl_Position = clipPosition;\n }\n }",`uniform vec3 color;\n uniform float opacity;\n #include <clipping_planes_pars_fragment>\n void main(){\n #include <clipping_planes_fragment>\n gl_FragColor = vec4(color, opacity);\n #include <tonemapping_fragment>\n #include <${c.version>=154?"colorspace_fragment":"encodings_fragment"}>\n }`);exports.Outlines=function({color:e="black",opacity:n=1,transparent:r=!1,screenspace:t=!1,toneMapped:c=!0,polygonOffset:a=!1,polygonOffsetFactor:s=0,renderOrder:d=0,thickness:m=.05,angle:g=Math.PI,clippingPlanes:v,...h}){const y=u.useRef(),[_]=u.useState((()=>new f({side:p.BackSide}))),{gl:x}=i.useThree(),M=x.getDrawingBufferSize(new p.Vector2);u.useMemo((()=>i.extend({OutlinesMaterial:f})),[]);const P=u.useRef(0),b=u.useRef();return u.useLayoutEffect((()=>{const e=y.current;if(!e)return;const n=e.parent;if(n&&n.geometry&&(P.current!==g||b.current!==n.geometry)){var r;P.current=g,b.current=n.geometry;let t=null==(r=e.children)?void 0:r[0];t&&(g&&t.geometry.dispose(),e.remove(t)),n.skeleton?(t=new p.SkinnedMesh,t.material=_,t.bind(n.skeleton,n.bindMatrix),e.add(t)):n.isInstancedMesh?(t=new p.InstancedMesh(n.geometry,_,n.count),t.instanceMatrix=n.instanceMatrix,e.add(t)):(t=new p.Mesh,t.material=_,e.add(t)),t.geometry=g?o.toCreasedNormals(n.geometry,g):n.geometry,t.morphTargetInfluences=n.morphTargetInfluences,t.morphTargetDictionary=n.morphTargetDictionary}})),u.useLayoutEffect((()=>{const o=y.current;if(!o)return;const l=o.children[0];if(l){l.renderOrder=d;const p=o.parent;i.applyProps(l,{morphTargetInfluences:p.morphTargetInfluences,morphTargetDictionary:p.morphTargetDictionary}),i.applyProps(l.material,{transparent:r,thickness:m,color:e,opacity:n,size:M,screenspace:t,toneMapped:c,polygonOffset:a,polygonOffsetFactor:s,clippingPlanes:v,clipping:v&&v.length>0})}})),u.useEffect((()=>()=>{const e=y.current;if(!e)return;const n=e.children[0];n&&(g&&n.geometry.dispose(),e.remove(n))}),[]),u.createElement("group",l.default({ref:y},h))};
@@ -1,7 +1,7 @@
1
1
  import * as THREE from 'three';
2
2
  import * as React from 'react';
3
- import { ReactThreeFiber, ThreeElements } from '@react-three/fiber';
4
- export type OutlinesProps = Omit<ThreeElements['group'], 'ref'> & {
3
+ import { ReactThreeFiber } from '@react-three/fiber';
4
+ type OutlinesProps = JSX.IntrinsicElements['group'] & {
5
5
  color?: ReactThreeFiber.Color;
6
6
  screenspace?: boolean;
7
7
  opacity?: number;
@@ -15,3 +15,4 @@ export type OutlinesProps = Omit<ThreeElements['group'], 'ref'> & {
15
15
  renderOrder?: number;
16
16
  };
17
17
  export declare function Outlines({ color, opacity, transparent, screenspace, toneMapped, polygonOffset, polygonOffsetFactor, renderOrder, thickness, angle, clippingPlanes, ...props }: OutlinesProps): React.JSX.Element;
18
+ export {};
package/core/Outlines.js CHANGED
@@ -71,7 +71,7 @@ function Outlines({
71
71
  clippingPlanes,
72
72
  ...props
73
73
  }) {
74
- const ref = React.useRef(null);
74
+ const ref = React.useRef();
75
75
  const [material] = React.useState(() => new OutlinesMaterial({
76
76
  side: THREE.BackSide
77
77
  }));
@@ -83,7 +83,7 @@ function Outlines({
83
83
  OutlinesMaterial
84
84
  }), []);
85
85
  const oldAngle = React.useRef(0);
86
- const oldGeometry = React.useRef(null);
86
+ const oldGeometry = React.useRef();
87
87
  React.useLayoutEffect(() => {
88
88
  const group = ref.current;
89
89
  if (!group) return;
@@ -15,9 +15,9 @@ export type PerformanceMonitorApi = {
15
15
  flipped: number;
16
16
  fallback: boolean;
17
17
  subscriptions: Map<Symbol, Partial<PerformanceMonitorHookApi>>;
18
- subscribe: (ref: React.RefObject<Partial<PerformanceMonitorHookApi>>) => () => void;
18
+ subscribe: (ref: React.MutableRefObject<Partial<PerformanceMonitorHookApi>>) => () => void;
19
19
  };
20
- export type PerformanceMonitorProps = {
20
+ type PerformanceMonitorProps = {
21
21
  ms?: number;
22
22
  iterations?: number;
23
23
  threshold?: number;
@@ -1,9 +1,8 @@
1
1
  import * as THREE from 'three';
2
2
  import * as React from 'react';
3
3
  import { PerspectiveCamera as PerspectiveCameraImpl } from 'three';
4
- import { ThreeElements } from '@react-three/fiber';
5
4
  import { ForwardRefComponent } from '../helpers/ts-utils';
6
- export type PerspectiveCameraProps = Omit<ThreeElements['perspectiveCamera'], 'ref' | 'children'> & {
5
+ type Props = Omit<JSX.IntrinsicElements['perspectiveCamera'], 'children'> & {
7
6
  makeDefault?: boolean;
8
7
  manual?: boolean;
9
8
  children?: React.ReactNode | ((texture: THREE.Texture) => React.ReactNode);
@@ -11,4 +10,5 @@ export type PerspectiveCameraProps = Omit<ThreeElements['perspectiveCamera'], 'r
11
10
  resolution?: number;
12
11
  envMap?: THREE.Texture;
13
12
  };
14
- export declare const PerspectiveCamera: ForwardRefComponent<PerspectiveCameraProps, PerspectiveCameraImpl>;
13
+ export declare const PerspectiveCamera: ForwardRefComponent<Props, PerspectiveCameraImpl>;
14
+ export {};
@@ -1,8 +1,16 @@
1
1
  import * as THREE from 'three';
2
+ import { PrimitiveProps } from '@react-three/fiber';
2
3
  import { ForwardRefComponent } from '../helpers/ts-utils';
3
- import { ThreeElements } from '@react-three/fiber';
4
+ type PointMaterialType = JSX.IntrinsicElements['pointsMaterial'];
5
+ declare global {
6
+ namespace JSX {
7
+ interface IntrinsicElements {
8
+ pointMaterialImpl: PointMaterialType;
9
+ }
10
+ }
11
+ }
4
12
  export declare class PointMaterialImpl extends THREE.PointsMaterial {
5
13
  constructor(props: any);
6
14
  }
7
- export type PointMaterialProps = Omit<ThreeElements['pointsMaterial'], 'ref'>;
8
- export declare const PointMaterial: ForwardRefComponent<PointMaterialProps, PointMaterialImpl>;
15
+ export declare const PointMaterial: ForwardRefComponent<Omit<PrimitiveProps, 'object' | 'attach'>, PointMaterialImpl>;
16
+ export {};
@@ -1,8 +1,8 @@
1
- import { ThreeElement } from '@react-three/fiber';
1
+ import { ReactThreeFiber } from '@react-three/fiber';
2
2
  import * as THREE from 'three';
3
3
  import { PointerLockControls as PointerLockControlsImpl } from 'three-stdlib';
4
4
  import { ForwardRefComponent } from '../helpers/ts-utils';
5
- export type PointerLockControlsProps = Omit<ThreeElement<typeof PointerLockControlsImpl>, 'ref' | 'args'> & {
5
+ export type PointerLockControlsProps = ReactThreeFiber.Object3DNode<PointerLockControlsImpl, typeof PointerLockControlsImpl> & {
6
6
  domElement?: HTMLElement;
7
7
  selector?: string;
8
8
  enabled?: boolean;
@@ -1 +1 @@
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");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 i=a(e),o=s(t),u=s(r);const c=new o.Matrix4,l=new o.Ray,f=new o.Sphere,d=new o.Vector3;class p extends o.Group{constructor(){super(),this.size=0,this.color=new o.Color("white"),this.instance={current:void 0},this.instanceKey={current:void 0}}get geometry(){var e;return null==(e=this.instance.current)?void 0:e.geometry}raycast(e,t){var r,n;const a=this.instance.current;if(!a||!a.geometry)return;const s=a.userData.instances.indexOf(this.instanceKey);if(-1===s||s>a.geometry.drawRange.count)return;const i=null!==(r=null==(n=e.params.Points)?void 0:n.threshold)&&void 0!==r?r:1;if(f.set(this.getWorldPosition(d),i),!1===e.ray.intersectsSphere(f))return;c.copy(a.matrixWorld).invert(),l.copy(e.ray).applyMatrix4(c);const u=i/((this.scale.x+this.scale.y+this.scale.z)/3),p=u*u,m=l.distanceSqToPoint(this.position);if(m<p){const r=new o.Vector3;l.closestPointToPoint(this.position,r),r.applyMatrix4(this.matrixWorld);const n=e.ray.origin.distanceTo(r);if(n<e.near||n>e.far)return;t.push({distance:n,distanceToRay:Math.sqrt(m),point:r,index:s,face:null,object:this})}}}let m,y;const g=u.createContext(null),h=new o.Matrix4,b=new o.Vector3,x=u.forwardRef((({children:e,range:t,limit:r=1e3,...a},s)=>{const c=u.useRef(null);u.useImperativeHandle(s,(()=>c.current),[]);const[l,f]=u.useState([]),[[d,p,x]]=u.useState((()=>[new Float32Array(3*r),Float32Array.from({length:3*r},(()=>1)),Float32Array.from({length:r},(()=>1))]));u.useEffect((()=>{c.current.geometry.attributes.position.needsUpdate=!0})),n.useFrame((()=>{for(c.current.updateMatrix(),c.current.updateMatrixWorld(),h.copy(c.current.matrixWorld).invert(),c.current.geometry.drawRange.count=Math.min(r,void 0!==t?t:r,l.length),m=0;m<l.length;m++)y=l[m].current,y.getWorldPosition(b).applyMatrix4(h),b.toArray(d,3*m),c.current.geometry.attributes.position.needsUpdate=!0,y.matrixWorldNeedsUpdate=!0,y.color.toArray(p,3*m),c.current.geometry.attributes.color.needsUpdate=!0,x.set([y.size],m),c.current.geometry.attributes.size.needsUpdate=!0}));const w=u.useMemo((()=>({getParent:()=>c,subscribe:e=>(f((t=>[...t,e])),()=>f((t=>t.filter((t=>t.current!==e.current)))))})),[]);return u.createElement("points",i.default({userData:{instances:l},matrixAutoUpdate:!1,ref:c,raycast:()=>null},a),u.createElement("bufferGeometry",null,u.createElement("bufferAttribute",{attach:"attributes-position",args:[d,3],usage:o.DynamicDrawUsage}),u.createElement("bufferAttribute",{attach:"attributes-color",args:[p,3],usage:o.DynamicDrawUsage}),u.createElement("bufferAttribute",{attach:"attributes-size",args:[x,1],usage:o.DynamicDrawUsage})),u.createElement(g.Provider,{value:w},e))})),w=u.forwardRef((({children:e,...t},r)=>{u.useMemo((()=>n.extend({PositionPoint:p})),[]);const a=u.useRef(null);u.useImperativeHandle(r,(()=>a.current),[]);const{subscribe:s,getParent:o}=u.useContext(g);return u.useLayoutEffect((()=>s(a)),[]),u.createElement("positionPoint",i.default({instance:o(),instanceKey:a,ref:a},t),e)})),v=u.forwardRef((({children:e,positions:t,colors:r,sizes:a,stride:s=3,...c},l)=>{const f=u.useRef(null);return u.useImperativeHandle(l,(()=>f.current),[]),n.useFrame((()=>{const e=f.current.geometry.attributes;e.position.needsUpdate=!0,r&&(e.color.needsUpdate=!0),a&&(e.size.needsUpdate=!0)})),u.createElement("points",i.default({ref:f},c),u.createElement("bufferGeometry",null,u.createElement("bufferAttribute",{attach:"attributes-position",args:[t,s],usage:o.DynamicDrawUsage}),r&&u.createElement("bufferAttribute",{attach:"attributes-color",args:[r,s],count:r.length/s,usage:o.DynamicDrawUsage}),a&&u.createElement("bufferAttribute",{attach:"attributes-size",args:[a,1],count:a.length/s,usage:o.DynamicDrawUsage})),e)})),P=u.forwardRef(((e,t)=>e.positions instanceof Float32Array?u.createElement(v,i.default({},e,{ref:t})):u.createElement(x,i.default({},e,{ref:t}))));exports.Point=w,exports.Points=P,exports.PointsBuffer=v,exports.PositionPoint=p;
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");function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function i(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 s=a(e),o=i(t),u=i(r);const c=new o.Matrix4,l=new o.Ray,f=new o.Sphere,d=new o.Vector3;class m extends o.Group{constructor(){super(),this.size=0,this.color=new o.Color("white"),this.instance={current:void 0},this.instanceKey={current:void 0}}get geometry(){var e;return null==(e=this.instance.current)?void 0:e.geometry}raycast(e,t){var r,n;const a=this.instance.current;if(!a||!a.geometry)return;const i=a.userData.instances.indexOf(this.instanceKey);if(-1===i||i>a.geometry.drawRange.count)return;const s=null!==(r=null==(n=e.params.Points)?void 0:n.threshold)&&void 0!==r?r:1;if(f.set(this.getWorldPosition(d),s),!1===e.ray.intersectsSphere(f))return;c.copy(a.matrixWorld).invert(),l.copy(e.ray).applyMatrix4(c);const u=s/((this.scale.x+this.scale.y+this.scale.z)/3),m=u*u,p=l.distanceSqToPoint(this.position);if(p<m){const r=new o.Vector3;l.closestPointToPoint(this.position,r),r.applyMatrix4(this.matrixWorld);const n=e.ray.origin.distanceTo(r);if(n<e.near||n>e.far)return;t.push({distance:n,distanceToRay:Math.sqrt(p),point:r,index:i,face:null,object:this})}}}let p,y;const h=u.createContext(null),g=new o.Matrix4,b=new o.Vector3,x=u.forwardRef((({children:e,range:t,limit:r=1e3,...a},i)=>{const c=u.useRef(null);u.useImperativeHandle(i,(()=>c.current),[]);const[l,f]=u.useState([]),[[d,m,x]]=u.useState((()=>[new Float32Array(3*r),Float32Array.from({length:3*r},(()=>1)),Float32Array.from({length:r},(()=>1))]));u.useEffect((()=>{c.current.geometry.attributes.position.needsUpdate=!0})),n.useFrame((()=>{for(c.current.updateMatrix(),c.current.updateMatrixWorld(),g.copy(c.current.matrixWorld).invert(),c.current.geometry.drawRange.count=Math.min(r,void 0!==t?t:r,l.length),p=0;p<l.length;p++)y=l[p].current,y.getWorldPosition(b).applyMatrix4(g),b.toArray(d,3*p),c.current.geometry.attributes.position.needsUpdate=!0,y.matrixWorldNeedsUpdate=!0,y.color.toArray(m,3*p),c.current.geometry.attributes.color.needsUpdate=!0,x.set([y.size],p),c.current.geometry.attributes.size.needsUpdate=!0}));const w=u.useMemo((()=>({getParent:()=>c,subscribe:e=>(f((t=>[...t,e])),()=>f((t=>t.filter((t=>t.current!==e.current)))))})),[]);return u.createElement("points",s.default({userData:{instances:l},matrixAutoUpdate:!1,ref:c,raycast:()=>null},a),u.createElement("bufferGeometry",null,u.createElement("bufferAttribute",{attach:"attributes-position",count:d.length/3,array:d,itemSize:3,usage:o.DynamicDrawUsage}),u.createElement("bufferAttribute",{attach:"attributes-color",count:m.length/3,array:m,itemSize:3,usage:o.DynamicDrawUsage}),u.createElement("bufferAttribute",{attach:"attributes-size",count:x.length,array:x,itemSize:1,usage:o.DynamicDrawUsage})),u.createElement(h.Provider,{value:w},e))})),w=u.forwardRef((({children:e,...t},r)=>{u.useMemo((()=>n.extend({PositionPoint:m})),[]);const a=u.useRef(null);u.useImperativeHandle(r,(()=>a.current),[]);const{subscribe:i,getParent:o}=u.useContext(h);return u.useLayoutEffect((()=>i(a)),[]),u.createElement("positionPoint",s.default({instance:o(),instanceKey:a,ref:a},t),e)})),v=u.forwardRef((({children:e,positions:t,colors:r,sizes:a,stride:i=3,...c},l)=>{const f=u.useRef(null);return u.useImperativeHandle(l,(()=>f.current),[]),n.useFrame((()=>{const e=f.current.geometry.attributes;e.position.needsUpdate=!0,r&&(e.color.needsUpdate=!0),a&&(e.size.needsUpdate=!0)})),u.createElement("points",s.default({ref:f},c),u.createElement("bufferGeometry",null,u.createElement("bufferAttribute",{attach:"attributes-position",count:t.length/i,array:t,itemSize:i,usage:o.DynamicDrawUsage}),r&&u.createElement("bufferAttribute",{attach:"attributes-color",count:r.length/i,array:r,itemSize:3,usage:o.DynamicDrawUsage}),a&&u.createElement("bufferAttribute",{attach:"attributes-size",count:a.length/i,array:a,itemSize:1,usage:o.DynamicDrawUsage})),e)})),P=u.forwardRef(((e,t)=>e.positions instanceof Float32Array?u.createElement(v,s.default({},e,{ref:t})):u.createElement(x,s.default({},e,{ref:t}))));exports.Point=w,exports.Points=P,exports.PointsBuffer=v,exports.PositionPoint=m;