@react-three/drei 9.86.2 → 9.86.4
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/README.md +1 -1
- package/core/AccumulativeShadows.cjs.js +1 -1
- package/core/AccumulativeShadows.js +7 -8
- package/core/ArcballControls.js +1 -1
- package/core/BBAnchor.js +2 -2
- package/core/Billboard.js +1 -1
- package/core/Bounds.js +1 -1
- package/core/CameraControls.js +1 -1
- package/core/CameraShake.js +1 -1
- package/core/CatmullRomLine.js +1 -1
- package/core/Caustics.cjs.js +1 -1
- package/core/Caustics.js +12 -13
- package/core/Center.js +1 -1
- package/core/Clone.js +1 -1
- package/core/Cloud.cjs.js +1 -1
- package/core/Cloud.js +12 -30
- package/core/ContactShadows.js +1 -1
- package/core/CubicBezierLine.js +1 -1
- package/core/CurveModifier.js +1 -1
- package/core/Decal.js +1 -1
- package/core/Detailed.js +1 -1
- package/core/DeviceOrientationControls.js +1 -1
- package/core/Edges.js +1 -1
- package/core/Effects.js +1 -1
- package/core/Example.js +1 -1
- package/core/FaceControls.js +4 -4
- package/core/FaceLandmarker.js +1 -1
- package/core/Facemesh.d.ts +3 -3
- package/core/Facemesh.js +4 -4
- package/core/FirstPersonControls.js +1 -1
- package/core/Float.js +1 -1
- package/core/FlyControls.js +1 -1
- package/core/GizmoHelper.js +7 -7
- package/core/GizmoViewcube.js +3 -3
- package/core/Gltf.js +1 -1
- package/core/GradientTexture.js +1 -4
- package/core/Grid.cjs.js +1 -1
- package/core/Grid.js +7 -8
- package/core/Image.cjs.js +1 -1
- package/core/Image.js +7 -8
- package/core/Instances.js +3 -3
- package/core/Lightformer.js +1 -1
- package/core/Line.js +1 -1
- package/core/MapControls.js +1 -1
- package/core/MarchingCubes.js +4 -4
- package/core/Mask.js +1 -1
- package/core/MeshDiscardMaterial.js +1 -1
- package/core/MeshDistortMaterial.js +1 -1
- package/core/MeshPortalMaterial.cjs.js +1 -1
- package/core/MeshPortalMaterial.js +5 -6
- package/core/MeshReflectorMaterial.cjs.js +1 -1
- package/core/MeshReflectorMaterial.js +2 -2
- package/core/MeshRefractionMaterial.cjs.js +1 -1
- package/core/MeshTransmissionMaterial.js +1 -1
- package/core/MeshWobbleMaterial.js +1 -1
- package/core/MotionPathControls.js +2 -2
- package/core/OrbitControls.js +1 -1
- package/core/OrthographicCamera.js +1 -1
- package/core/Outlines.cjs.js +1 -1
- package/core/Outlines.js +4 -5
- package/core/PerformanceMonitor.js +1 -1
- package/core/PerspectiveCamera.js +1 -1
- package/core/PointMaterial.cjs.js +1 -1
- package/core/PointMaterial.js +3 -4
- package/core/PointerLockControls.js +1 -1
- package/core/Points.js +4 -4
- package/core/PositionalAudio.js +1 -1
- package/core/QuadraticBezierLine.js +3 -3
- package/core/Reflector.cjs.js +1 -1
- package/core/Reflector.js +2 -2
- package/core/RenderTexture.js +1 -1
- package/core/Resize.js +1 -1
- package/core/RoundedBox.js +1 -1
- package/core/ScreenQuad.js +1 -1
- package/core/ScreenSpace.js +1 -1
- package/core/Segments.js +3 -3
- package/core/Shadow.js +1 -1
- package/core/Sky.js +1 -1
- package/core/Sparkles.cjs.js +1 -1
- package/core/Sparkles.js +3 -4
- package/core/SpotLight.cjs.js +1 -1
- package/core/SpotLight.js +1 -1
- package/core/Stage.cjs.js +1 -1
- package/core/Stars.cjs.js +1 -1
- package/core/Stars.js +4 -4
- package/core/Svg.js +1 -1
- package/core/Text.js +1 -1
- package/core/Text3D.js +1 -1
- package/core/TrackballControls.js +1 -1
- package/core/Trail.js +1 -1
- package/core/TransformControls.js +1 -1
- package/core/Wireframe.cjs.js +1 -1
- package/core/Wireframe.js +1 -1
- package/core/index.cjs.js +1 -1
- package/core/index.js +1 -1
- package/core/meshBounds.js +4 -4
- package/core/shapes.js +19 -19
- package/core/useBVH.js +1 -1
- package/core/useProgress.js +1 -1
- package/index.cjs.js +1 -1
- package/materials/BlurPass.cjs.js +1 -1
- package/materials/ConvolutionMaterial.cjs.js +1 -1
- package/materials/ConvolutionMaterial.js +1 -2
- package/materials/DiscardMaterial.js +1 -1
- package/materials/MeshRefractionMaterial.cjs.js +1 -1
- package/materials/MeshRefractionMaterial.js +7 -8
- package/materials/SpotLightMaterial.cjs.js +1 -1
- package/materials/SpotLightMaterial.js +1 -2
- package/materials/WireframeMaterial.js +4 -4
- package/native/index.cjs.js +1 -1
- package/native/index.js +1 -1
- package/package.json +1 -1
- package/react-three-drei-0.0.0-semantic-release.tgz +0 -0
- package/web/Html.cjs.js +1 -1
- package/web/Html.js +6 -6
- package/web/ScrollControls.js +4 -4
- package/web/Select.js +1 -1
- package/web/View.js +1 -1
- package/web/index.cjs.js +1 -1
- package/web/index.js +1 -1
- package/web/pivotControls/AxisArrow.js +4 -4
- package/web/pivotControls/AxisRotator.js +6 -6
- package/web/pivotControls/PlaneSlider.js +3 -3
- package/web/pivotControls/context.js +1 -1
- package/web/pivotControls/index.js +21 -21
- package/helpers/constants.cjs.js +0 -1
- package/helpers/constants.d.ts +0 -1
- package/helpers/constants.js +0 -5
package/core/FlyControls.js
CHANGED
|
@@ -3,7 +3,7 @@ import { useThree, useFrame } from '@react-three/fiber';
|
|
|
3
3
|
import * as React from 'react';
|
|
4
4
|
import { FlyControls as FlyControls$1 } from 'three-stdlib';
|
|
5
5
|
|
|
6
|
-
const FlyControls =
|
|
6
|
+
const FlyControls = /*#__PURE__*/React.forwardRef(({
|
|
7
7
|
domElement,
|
|
8
8
|
...props
|
|
9
9
|
}, fref) => {
|
package/core/GizmoHelper.js
CHANGED
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
import { useThree, useFrame } from '@react-three/fiber';
|
|
3
|
-
import {
|
|
3
|
+
import { Object3D, Matrix4, Quaternion, Vector3 } from 'three';
|
|
4
4
|
import { OrthographicCamera } from './OrthographicCamera.js';
|
|
5
5
|
import { Hud } from './Hud.js';
|
|
6
6
|
|
|
7
|
-
const Context =
|
|
7
|
+
const Context = /*#__PURE__*/React.createContext({});
|
|
8
8
|
const useGizmoContext = () => {
|
|
9
9
|
return React.useContext(Context);
|
|
10
10
|
};
|
|
11
11
|
const turnRate = 2 * Math.PI; // turn rate in angles per second
|
|
12
|
-
const dummy =
|
|
13
|
-
const matrix =
|
|
14
|
-
const [q1, q2] = [
|
|
15
|
-
const target =
|
|
16
|
-
const targetPosition =
|
|
12
|
+
const dummy = new Object3D();
|
|
13
|
+
const matrix = new Matrix4();
|
|
14
|
+
const [q1, q2] = [new Quaternion(), new Quaternion()];
|
|
15
|
+
const target = new Vector3();
|
|
16
|
+
const targetPosition = new Vector3();
|
|
17
17
|
const isOrbitControls = controls => {
|
|
18
18
|
return 'minPolarAngle' in controls;
|
|
19
19
|
};
|
package/core/GizmoViewcube.js
CHANGED
|
@@ -12,10 +12,10 @@ const colors = {
|
|
|
12
12
|
};
|
|
13
13
|
const defaultFaces = ['Right', 'Left', 'Top', 'Bottom', 'Front', 'Back'];
|
|
14
14
|
const makePositionVector = xyz => new Vector3(...xyz).multiplyScalar(0.38);
|
|
15
|
-
const corners =
|
|
15
|
+
const corners = [[1, 1, 1], [1, 1, -1], [1, -1, 1], [1, -1, -1], [-1, 1, 1], [-1, 1, -1], [-1, -1, 1], [-1, -1, -1]].map(makePositionVector);
|
|
16
16
|
const cornerDimensions = [0.25, 0.25, 0.25];
|
|
17
|
-
const edges =
|
|
18
|
-
const edgeDimensions =
|
|
17
|
+
const edges = [[1, 1, 0], [1, 0, 1], [1, 0, -1], [1, -1, 0], [0, 1, 1], [0, 1, -1], [0, -1, 1], [0, -1, -1], [-1, 1, 0], [-1, 0, 1], [-1, 0, -1], [-1, -1, 0]].map(makePositionVector);
|
|
18
|
+
const edgeDimensions = edges.map(edge => edge.toArray().map(axis => axis == 0 ? 0.5 : 0.25));
|
|
19
19
|
const FaceMaterial = ({
|
|
20
20
|
hover,
|
|
21
21
|
index,
|
package/core/Gltf.js
CHANGED
package/core/GradientTexture.js
CHANGED
|
@@ -2,10 +2,7 @@ import _extends from '@babel/runtime/helpers/esm/extends';
|
|
|
2
2
|
import * as React from 'react';
|
|
3
3
|
import { useThree } from '@react-three/fiber';
|
|
4
4
|
|
|
5
|
-
let GradientType =
|
|
6
|
-
/*@__PURE__*/
|
|
7
|
-
/*#__PURE__*/
|
|
8
|
-
function (GradientType) {
|
|
5
|
+
let GradientType = /*#__PURE__*/function (GradientType) {
|
|
9
6
|
GradientType["Linear"] = "linear";
|
|
10
7
|
GradientType["Radial"] = "radial";
|
|
11
8
|
return GradientType;
|
package/core/Grid.cjs.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),n=require("react"),o=require("three"),i=require("react-merge-refs"),r=require("@react-three/fiber"),t=require("./shaderMaterial.cjs.js")
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),n=require("react"),o=require("three"),i=require("react-merge-refs"),r=require("@react-three/fiber"),t=require("./shaderMaterial.cjs.js");function l(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function a(e){if(e&&e.__esModule)return e;var n=Object.create(null);return e&&Object.keys(e).forEach((function(o){if("default"!==o){var i=Object.getOwnPropertyDescriptor(e,o);Object.defineProperty(n,o,i.get?i:{enumerable:!0,get:function(){return e[o]}})}})),n.default=e,Object.freeze(n)}var s=l(e),c=a(n),f=a(o),d=l(i);const u=t.shaderMaterial({cellSize:.5,sectionSize:1,fadeDistance:100,fadeStrength:1,cellThickness:.5,sectionThickness:1,cellColor:new f.Color,sectionColor:new f.Color,infiniteGrid:!1,followCamera:!1,worldCamProjPosition:new f.Vector3,worldPlanePosition:new f.Vector3},"\n varying vec3 localPosition;\n varying vec4 worldPosition;\n\n uniform vec3 worldCamProjPosition;\n uniform vec3 worldPlanePosition;\n uniform float fadeDistance;\n uniform bool infiniteGrid;\n uniform bool followCamera;\n\n void main() {\n localPosition = position.xzy;\n if (infiniteGrid) localPosition *= 1.0 + fadeDistance;\n \n worldPosition = modelMatrix * vec4(localPosition, 1.0);\n if (followCamera) {\n worldPosition.xyz += (worldCamProjPosition - worldPlanePosition);\n localPosition = (inverse(modelMatrix) * worldPosition).xyz;\n }\n\n gl_Position = projectionMatrix * viewMatrix * worldPosition;\n }\n ",`\n varying vec3 localPosition;\n varying vec4 worldPosition;\n\n uniform vec3 worldCamProjPosition;\n uniform float cellSize;\n uniform float sectionSize;\n uniform vec3 cellColor;\n uniform vec3 sectionColor;\n uniform float fadeDistance;\n uniform float fadeStrength;\n uniform float cellThickness;\n uniform float sectionThickness;\n\n float getGrid(float size, float thickness) {\n vec2 r = localPosition.xz / size;\n vec2 grid = abs(fract(r - 0.5) - 0.5) / fwidth(r);\n float line = min(grid.x, grid.y) + 1.0 - thickness;\n return 1.0 - min(line, 1.0);\n }\n\n void main() {\n float g1 = getGrid(cellSize, cellThickness);\n float g2 = getGrid(sectionSize, sectionThickness);\n\n float dist = distance(worldCamProjPosition, worldPosition.xyz);\n float d = 1.0 - min(dist / fadeDistance, 1.0);\n vec3 color = mix(cellColor, sectionColor, min(1.0, sectionThickness * g2));\n\n gl_FragColor = vec4(color, (g1 + g2) * pow(d, fadeStrength));\n gl_FragColor.a = mix(0.75 * gl_FragColor.a, gl_FragColor.a, g2);\n if (gl_FragColor.a <= 0.0) discard;\n\n #include <tonemapping_fragment>\n #include <${parseInt(f.REVISION.replace(/\D+/g,""))>=154?"colorspace_fragment":"encodings_fragment"}>\n }\n `),m=c.forwardRef((({args:e,cellColor:n="#000000",sectionColor:o="#2080ff",cellSize:i=.5,sectionSize:t=1,followCamera:l=!1,infiniteGrid:a=!1,fadeDistance:m=100,fadeStrength:g=1,cellThickness:P=.5,sectionThickness:w=1,side:v=f.BackSide,...C},h)=>{r.extend({GridMaterial:u});const p=c.useRef(null),x=new f.Plane,z=new f.Vector3(0,1,0),j=new f.Vector3(0,0,0);r.useFrame((e=>{x.setFromNormalAndCoplanarPoint(z,j).applyMatrix4(p.current.matrixWorld);const n=p.current.material,o=n.uniforms.worldCamProjPosition,i=n.uniforms.worldPlanePosition;x.projectPoint(e.camera.position,o.value),i.value.set(0,0,0).applyMatrix4(p.current.matrixWorld)}));const y={cellSize:i,sectionSize:t,cellColor:n,sectionColor:o,cellThickness:P,sectionThickness:w},S={fadeDistance:m,fadeStrength:g,infiniteGrid:a,followCamera:l};return c.createElement("mesh",s.default({ref:d.default([p,h]),frustumCulled:!1},C),c.createElement("gridMaterial",s.default({transparent:!0,"extensions-derivatives":!0,side:v},y,S)),c.createElement("planeGeometry",{args:e}))}));exports.Grid=m;
|
package/core/Grid.js
CHANGED
|
@@ -4,21 +4,20 @@ import * as THREE from 'three';
|
|
|
4
4
|
import mergeRefs from 'react-merge-refs';
|
|
5
5
|
import { extend, useFrame } from '@react-three/fiber';
|
|
6
6
|
import { shaderMaterial } from './shaderMaterial.js';
|
|
7
|
-
import { version } from '../helpers/constants.js';
|
|
8
7
|
|
|
9
|
-
const GridMaterial =
|
|
8
|
+
const GridMaterial = shaderMaterial({
|
|
10
9
|
cellSize: 0.5,
|
|
11
10
|
sectionSize: 1,
|
|
12
11
|
fadeDistance: 100,
|
|
13
12
|
fadeStrength: 1,
|
|
14
13
|
cellThickness: 0.5,
|
|
15
14
|
sectionThickness: 1,
|
|
16
|
-
cellColor:
|
|
17
|
-
sectionColor:
|
|
15
|
+
cellColor: new THREE.Color(),
|
|
16
|
+
sectionColor: new THREE.Color(),
|
|
18
17
|
infiniteGrid: false,
|
|
19
18
|
followCamera: false,
|
|
20
|
-
worldCamProjPosition:
|
|
21
|
-
worldPlanePosition:
|
|
19
|
+
worldCamProjPosition: new THREE.Vector3(),
|
|
20
|
+
worldPlanePosition: new THREE.Vector3()
|
|
22
21
|
}, /* glsl */`
|
|
23
22
|
varying vec3 localPosition;
|
|
24
23
|
varying vec4 worldPosition;
|
|
@@ -75,10 +74,10 @@ const GridMaterial = /*@__PURE__*/shaderMaterial({
|
|
|
75
74
|
if (gl_FragColor.a <= 0.0) discard;
|
|
76
75
|
|
|
77
76
|
#include <tonemapping_fragment>
|
|
78
|
-
#include <${
|
|
77
|
+
#include <${parseInt(THREE.REVISION.replace(/\D+/g, '')) >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
|
|
79
78
|
}
|
|
80
79
|
`);
|
|
81
|
-
const Grid =
|
|
80
|
+
const Grid = /*#__PURE__*/React.forwardRef(({
|
|
82
81
|
args,
|
|
83
82
|
cellColor = '#000000',
|
|
84
83
|
sectionColor = '#2080ff',
|
package/core/Image.cjs.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),r=require("react"),t=require("three"),n=require("@react-three/fiber"),a=require("./shaderMaterial.cjs.js"),o=require("./useTexture.cjs.js")
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),r=require("react"),t=require("three"),n=require("@react-three/fiber"),a=require("./shaderMaterial.cjs.js"),o=require("./useTexture.cjs.js");function c(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function i(e){if(e&&e.__esModule)return e;var r=Object.create(null);return e&&Object.keys(e).forEach((function(t){if("default"!==t){var n=Object.getOwnPropertyDescriptor(e,t);Object.defineProperty(r,t,n.get?n:{enumerable:!0,get:function(){return e[t]}})}})),r.default=e,Object.freeze(r)}var s=c(e),l=i(r),u=i(t);const f=a.shaderMaterial({color:new u.Color("white"),scale:[1,1],imageBounds:[1,1],map:null,zoom:1,grayscale:0,opacity:1},"\n varying vec2 vUv;\n void main() {\n gl_Position = projectionMatrix * viewMatrix * modelMatrix * vec4(position, 1.);\n vUv = uv;\n }\n",`\n // mostly from https://gist.github.com/statico/df64c5d167362ecf7b34fca0b1459a44\n varying vec2 vUv;\n uniform vec2 scale;\n uniform vec2 imageBounds;\n uniform vec3 color;\n uniform sampler2D map;\n uniform float zoom;\n uniform float grayscale;\n uniform float opacity;\n const vec3 luma = vec3(.299, 0.587, 0.114);\n vec4 toGrayscale(vec4 color, float intensity) {\n return vec4(mix(color.rgb, vec3(dot(color.rgb, luma)), intensity), color.a);\n }\n vec2 aspect(vec2 size) {\n return size / min(size.x, size.y);\n }\n void main() {\n vec2 s = aspect(scale);\n vec2 i = aspect(imageBounds);\n float rs = s.x / s.y;\n float ri = i.x / i.y;\n vec2 new = rs < ri ? vec2(i.x * s.y / i.y, s.y) : vec2(s.x, i.y * s.x / i.x);\n vec2 offset = (rs < ri ? vec2((new.x - s.x) / 2.0, 0.0) : vec2(0.0, (new.y - s.y) / 2.0)) / new;\n vec2 uv = vUv * s / new + offset;\n vec2 zUv = (uv - vec2(0.5, 0.5)) / zoom + vec2(0.5, 0.5);\n gl_FragColor = toGrayscale(texture2D(map, zUv) * vec4(color, opacity), grayscale);\n \n #include <tonemapping_fragment>\n #include <${parseInt(u.REVISION.replace(/\D+/g,""))>=154?"colorspace_fragment":"encodings_fragment"}>\n }\n`),m=l.forwardRef((({children:e,color:r,segments:t=1,scale:a=1,zoom:o=1,grayscale:c=0,opacity:i=1,texture:u,toneMapped:m,transparent:v,...d},g)=>{n.extend({ImageMaterial:f});const p=Array.isArray(a)?[a[0],a[1]]:[a,a],y=[u.image.width,u.image.height];return l.createElement("mesh",s.default({ref:g,scale:Array.isArray(a)?[...a,1]:a},d),l.createElement("planeGeometry",{args:[1,1,t,t]}),l.createElement("imageMaterial",{color:r,map:u,zoom:o,grayscale:c,opacity:i,scale:p,imageBounds:y,toneMapped:m,transparent:v}),e)})),v=l.forwardRef((({url:e,...r},t)=>{const n=o.useTexture(e);return l.createElement(m,s.default({},r,{texture:n,ref:t}))})),d=l.forwardRef((({url:e,...r},t)=>l.createElement(m,s.default({},r,{ref:t})))),g=l.forwardRef(((e,r)=>{if(e.url)return l.createElement(v,s.default({},e,{ref:r}));if(e.texture)return l.createElement(d,s.default({},e,{ref:r}));throw new Error("<Image /> requires a url or texture")}));exports.Image=g;
|
package/core/Image.js
CHANGED
|
@@ -4,12 +4,11 @@ import * as THREE from 'three';
|
|
|
4
4
|
import { extend } from '@react-three/fiber';
|
|
5
5
|
import { shaderMaterial } from './shaderMaterial.js';
|
|
6
6
|
import { useTexture } from './useTexture.js';
|
|
7
|
-
import { version } from '../helpers/constants.js';
|
|
8
7
|
|
|
9
8
|
// {texture: THREE.Texture} XOR {url: string}
|
|
10
9
|
|
|
11
|
-
const ImageMaterialImpl =
|
|
12
|
-
color:
|
|
10
|
+
const ImageMaterialImpl = shaderMaterial({
|
|
11
|
+
color: new THREE.Color('white'),
|
|
13
12
|
scale: [1, 1],
|
|
14
13
|
imageBounds: [1, 1],
|
|
15
14
|
map: null,
|
|
@@ -51,10 +50,10 @@ const ImageMaterialImpl = /*@__PURE__*/shaderMaterial({
|
|
|
51
50
|
gl_FragColor = toGrayscale(texture2D(map, zUv) * vec4(color, opacity), grayscale);
|
|
52
51
|
|
|
53
52
|
#include <tonemapping_fragment>
|
|
54
|
-
#include <${
|
|
53
|
+
#include <${parseInt(THREE.REVISION.replace(/\D+/g, '')) >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
|
|
55
54
|
}
|
|
56
55
|
`);
|
|
57
|
-
const ImageBase =
|
|
56
|
+
const ImageBase = /*#__PURE__*/React.forwardRef(({
|
|
58
57
|
children,
|
|
59
58
|
color,
|
|
60
59
|
segments = 1,
|
|
@@ -89,7 +88,7 @@ const ImageBase = /*@__PURE__*/React.forwardRef(({
|
|
|
89
88
|
transparent: transparent
|
|
90
89
|
}), children);
|
|
91
90
|
});
|
|
92
|
-
const ImageWithUrl =
|
|
91
|
+
const ImageWithUrl = /*#__PURE__*/React.forwardRef(({
|
|
93
92
|
url,
|
|
94
93
|
...props
|
|
95
94
|
}, ref) => {
|
|
@@ -99,7 +98,7 @@ const ImageWithUrl = /*@__PURE__*/React.forwardRef(({
|
|
|
99
98
|
ref: ref
|
|
100
99
|
}));
|
|
101
100
|
});
|
|
102
|
-
const ImageWithTexture =
|
|
101
|
+
const ImageWithTexture = /*#__PURE__*/React.forwardRef(({
|
|
103
102
|
url: _url,
|
|
104
103
|
...props
|
|
105
104
|
}, ref) => {
|
|
@@ -107,7 +106,7 @@ const ImageWithTexture = /*@__PURE__*/React.forwardRef(({
|
|
|
107
106
|
ref: ref
|
|
108
107
|
}));
|
|
109
108
|
});
|
|
110
|
-
const Image =
|
|
109
|
+
const Image = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
111
110
|
if (props.url) return /*#__PURE__*/React.createElement(ImageWithUrl, _extends({}, props, {
|
|
112
111
|
ref: ref
|
|
113
112
|
}));else if (props.texture) return /*#__PURE__*/React.createElement(ImageWithTexture, _extends({}, props, {
|
package/core/Instances.js
CHANGED
|
@@ -62,7 +62,7 @@ const tempMatrix = /*@__PURE__*/new THREE.Matrix4();
|
|
|
62
62
|
const translation = /*@__PURE__*/new THREE.Vector3();
|
|
63
63
|
const rotation = /*@__PURE__*/new THREE.Quaternion();
|
|
64
64
|
const scale = /*@__PURE__*/new THREE.Vector3();
|
|
65
|
-
const Instance =
|
|
65
|
+
const Instance = /*#__PURE__*/React.forwardRef(({
|
|
66
66
|
context,
|
|
67
67
|
children,
|
|
68
68
|
...props
|
|
@@ -82,7 +82,7 @@ const Instance = /*@__PURE__*/React.forwardRef(({
|
|
|
82
82
|
ref: mergeRefs([ref, group])
|
|
83
83
|
}, props), children);
|
|
84
84
|
});
|
|
85
|
-
const Instances =
|
|
85
|
+
const Instances = /*#__PURE__*/React.forwardRef(({
|
|
86
86
|
children,
|
|
87
87
|
range,
|
|
88
88
|
limit = 1000,
|
|
@@ -172,7 +172,7 @@ const Instances = /*@__PURE__*/React.forwardRef(({
|
|
|
172
172
|
value: api
|
|
173
173
|
}, children));
|
|
174
174
|
});
|
|
175
|
-
const Merged =
|
|
175
|
+
const Merged = /*#__PURE__*/React.forwardRef(function Merged({
|
|
176
176
|
meshes,
|
|
177
177
|
children,
|
|
178
178
|
...props
|
package/core/Lightformer.js
CHANGED
package/core/Line.js
CHANGED
|
@@ -4,7 +4,7 @@ import { Vector3, Vector2, Color } from 'three';
|
|
|
4
4
|
import { useThree } from '@react-three/fiber';
|
|
5
5
|
import { LineSegments2, Line2, LineMaterial, LineSegmentsGeometry, LineGeometry } from 'three-stdlib';
|
|
6
6
|
|
|
7
|
-
const Line =
|
|
7
|
+
const Line = /*#__PURE__*/React.forwardRef(function Line({
|
|
8
8
|
points,
|
|
9
9
|
color = 'black',
|
|
10
10
|
vertexColors,
|
package/core/MapControls.js
CHANGED
|
@@ -3,7 +3,7 @@ import { useThree, useFrame } from '@react-three/fiber';
|
|
|
3
3
|
import * as React from 'react';
|
|
4
4
|
import { MapControls as MapControls$1 } from 'three-stdlib';
|
|
5
5
|
|
|
6
|
-
const MapControls =
|
|
6
|
+
const MapControls = /*#__PURE__*/React.forwardRef((props = {
|
|
7
7
|
enableDamping: true
|
|
8
8
|
}, ref) => {
|
|
9
9
|
const {
|
package/core/MarchingCubes.js
CHANGED
|
@@ -5,8 +5,8 @@ import mergeRefs from 'react-merge-refs';
|
|
|
5
5
|
import { MarchingCubes as MarchingCubes$1 } from 'three-stdlib';
|
|
6
6
|
import { useFrame } from '@react-three/fiber';
|
|
7
7
|
|
|
8
|
-
const globalContext =
|
|
9
|
-
const MarchingCubes =
|
|
8
|
+
const globalContext = /*#__PURE__*/React.createContext(null);
|
|
9
|
+
const MarchingCubes = /*#__PURE__*/React.forwardRef(({
|
|
10
10
|
resolution = 28,
|
|
11
11
|
maxPolyCount = 10000,
|
|
12
12
|
enableUvs = false,
|
|
@@ -31,7 +31,7 @@ const MarchingCubes = /*@__PURE__*/React.forwardRef(({
|
|
|
31
31
|
value: api
|
|
32
32
|
}, children)));
|
|
33
33
|
});
|
|
34
|
-
const MarchingCube =
|
|
34
|
+
const MarchingCube = /*#__PURE__*/React.forwardRef(({
|
|
35
35
|
strength = 0.5,
|
|
36
36
|
subtract = 12,
|
|
37
37
|
color,
|
|
@@ -52,7 +52,7 @@ const MarchingCube = /*@__PURE__*/React.forwardRef(({
|
|
|
52
52
|
ref: mergeRefs([ref, cubeRef])
|
|
53
53
|
}, props));
|
|
54
54
|
});
|
|
55
|
-
const MarchingPlane =
|
|
55
|
+
const MarchingPlane = /*#__PURE__*/React.forwardRef(({
|
|
56
56
|
planeType: _planeType = 'x',
|
|
57
57
|
strength = 0.5,
|
|
58
58
|
subtract = 12,
|
package/core/Mask.js
CHANGED
|
@@ -2,7 +2,7 @@ import _extends from '@babel/runtime/helpers/esm/extends';
|
|
|
2
2
|
import * as THREE from 'three';
|
|
3
3
|
import * as React from 'react';
|
|
4
4
|
|
|
5
|
-
const Mask =
|
|
5
|
+
const Mask = /*#__PURE__*/React.forwardRef(({
|
|
6
6
|
id = 1,
|
|
7
7
|
colorWrite = false,
|
|
8
8
|
depthWrite = false,
|
|
@@ -3,7 +3,7 @@ import * as React from 'react';
|
|
|
3
3
|
import { extend } from '@react-three/fiber';
|
|
4
4
|
import { DiscardMaterial } from '../materials/DiscardMaterial.js';
|
|
5
5
|
|
|
6
|
-
const MeshDiscardMaterial =
|
|
6
|
+
const MeshDiscardMaterial = /*#__PURE__*/React.forwardRef((props, fref) => {
|
|
7
7
|
extend({
|
|
8
8
|
DiscardMaterialImpl: DiscardMaterial
|
|
9
9
|
});
|
|
@@ -54,7 +54,7 @@ class DistortMaterialImpl extends MeshPhysicalMaterial {
|
|
|
54
54
|
this._radius.value = v;
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
|
-
const MeshDistortMaterial =
|
|
57
|
+
const MeshDistortMaterial = /*#__PURE__*/React.forwardRef(({
|
|
58
58
|
speed = 1,
|
|
59
59
|
...props
|
|
60
60
|
}, ref) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),r=require("three"),t=require("react"),n=require("@react-three/fiber"),a=require("./useIntersect.cjs.js"),i=require("./useFBO.cjs.js"),l=require("./RenderTexture.cjs.js"),o=require("./shaderMaterial.cjs.js"),u=require("three-stdlib"),s=require("../helpers/constants.cjs.js");function v(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function c(e){if(e&&e.__esModule)return e;var r=Object.create(null);return e&&Object.keys(e).forEach((function(t){if("default"!==t){var n=Object.getOwnPropertyDescriptor(e,t);Object.defineProperty(r,t,n.get?n:{enumerable:!0,get:function(){return e[t]}})}})),r.default=e,Object.freeze(r)}var d=v(e),m=c(r),f=c(t);const g=o.shaderMaterial({blur:0,map:null,sdf:null,blend:0,size:0,resolution:new m.Vector2},"varying vec2 vUv;\n void main() {\n gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);\n vUv = uv;\n }",`uniform sampler2D sdf;\n uniform sampler2D map;\n uniform float blur;\n uniform float size;\n uniform float time;\n uniform vec2 resolution;\n varying vec2 vUv;\n #include <packing>\n void main() {\n vec2 uv = gl_FragCoord.xy / resolution.xy;\n vec4 t = texture2D(map, uv);\n float k = blur;\n float d = texture2D(sdf, vUv).r/size;\n float alpha = 1.0 - smoothstep(0.0, 1.0, clamp(d/k + 1.0, 0.0, 1.0));\n gl_FragColor = vec4(t.rgb, blur == 0.0 ? t.a : t.a * alpha);\n #include <tonemapping_fragment>\n #include <${s.version>=154?"colorspace_fragment":"encodings_fragment"}>\n }`),p=f.forwardRef((({children:e,events:r,blur:t=0,eventPriority:o=0,renderPriority:u=0,worldUnits:s=!1,resolution:v=512,...c},p)=>{n.extend({PortalMaterialImpl:g});const h=f.useRef(null),{scene:y,gl:b,size:w,viewport:M,setEvents:U}=n.useThree(),T=i.useFBO(v,v),[R,S]=f.useState(0);n.useFrame((()=>{const e=h.current.blend>0?Math.max(1,u):0;R!==e&&S(e)})),f.useEffect((()=>{void 0!==r&&U({enabled:!r})}),[r]);const[_,D]=f.useState(!0),j=a.useIntersect(D);f.useLayoutEffect((()=>{var e;j.current=null==(e=h.current)?void 0:e.__r3f.parent}),[]),f.useLayoutEffect((()=>{if(j.current&&t&&null===h.current.sdf){const e=new m.Mesh(j.current.geometry,new m.MeshBasicMaterial),r=(new m.Box3).setFromBufferAttribute(e.geometry.attributes.position),t=new m.OrthographicCamera(r.min.x*(1+2/v),r.max.x*(1+2/v),r.max.y*(1+2/v),r.min.y*(1+2/v),.1,1e3);t.position.set(0,0,1),t.lookAt(0,0,0),b.setRenderTarget(T),b.render(e,t);const n=F(v,v,b)(T.texture),a=new Float32Array(v*v);b.readRenderTargetPixels(n,0,0,v,v,a);let i=1/0;for(let e=0;e<a.length;e++)a[e]<i&&(i=a[e]);i=-i,h.current.size=i,h.current.sdf=n.texture,b.setRenderTarget(null)}}),[v,t]),f.useImperativeHandle(p,(()=>h.current));const P=f.useCallback(((e,r,t)=>{var n;if(!j.current)return!1;if(r.pointer.set(e.offsetX/r.size.width*2-1,-e.offsetY/r.size.height*2+1),r.raycaster.setFromCamera(r.pointer,r.camera),0===(null==(n=h.current)?void 0:n.blend)){const[e]=r.raycaster.intersectObject(j.current);if(!e)return r.raycaster.camera=void 0,!1}}),[]);return f.createElement("portalMaterialImpl",d.default({ref:h,blur:t,blend:0,resolution:[w.width*M.dpr,w.height*M.dpr],toneMapped:!1,attach:"material"},c),f.createElement(l.RenderTexture,{attach:"map",frames:_?1/0:0,eventPriority:o,renderPriority:u,compute:P},e,f.createElement(x,{events:r,rootScene:y,priority:R,material:h,worldUnits:s})))}));function x({events:e,rootScene:r,material:t,priority:a,worldUnits:l}){const o=n.useThree((e=>e.scene)),v=n.useThree((e=>e.setEvents)),c=i.useFBO(),d=i.useFBO();f.useLayoutEffect((()=>{o.matrixAutoUpdate=!1}),[]),f.useEffect((()=>{void 0!==e&&v({enabled:e})}),[e]);const[g,p]=f.useMemo((()=>{const e={value:0};return[new u.FullScreenQuad(new m.ShaderMaterial({uniforms:{a:{value:c.texture},b:{value:d.texture},blend:e},vertexShader:"\n varying vec2 vUv;\n void main() {\n vUv = uv;\n gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );\n }",fragmentShader:`\n uniform sampler2D a;\n uniform sampler2D b;\n uniform float blend;\n varying vec2 vUv;\n #include <packing>\n void main() {\n vec4 ta = texture2D(a, vUv);\n vec4 tb = texture2D(b, vUv);\n gl_FragColor = mix(tb, ta, blend);\n #include <${s.version>=154?"colorspace_fragment":"encodings_fragment"}>\n }`})),e]}),[]);return n.useFrame((e=>{var n;let i=null==t||null==(n=t.current)?void 0:n.__r3f.parent;if(i){var u,s,v,m;if(l)o.matrixWorld.identity();else a&&1===(null==(u=t.current)?void 0:u.blend)&&i.updateWorldMatrix(!0,!1),o.matrixWorld.copy(i.matrixWorld);if(a)(null==(s=t.current)?void 0:s.blend)>0&&(null==(v=t.current)?void 0:v.blend)<1?(p.value=t.current.blend,e.gl.setRenderTarget(c),e.gl.render(o,e.camera),e.gl.setRenderTarget(d),e.gl.render(r,e.camera),e.gl.setRenderTarget(null),g.render(e.gl)):1===(null==(m=t.current)?void 0:m.blend)&&e.gl.render(o,e.camera)}}),a),f.createElement(f.Fragment,null)}const F=(e,r,t)=>{let n=new m.WebGLRenderTarget(e,r,{minFilter:m.LinearMipmapLinearFilter,magFilter:m.LinearFilter,type:m.FloatType,format:m.RedFormat,generateMipmaps:!0}),a=new m.WebGLRenderTarget(e,r,{minFilter:m.NearestFilter,magFilter:m.NearestFilter}),i=new m.WebGLRenderTarget(e,r,{minFilter:m.NearestFilter,magFilter:m.NearestFilter}),l=new m.WebGLRenderTarget(e,r,{minFilter:m.NearestFilter,magFilter:m.NearestFilter}),o=new m.WebGLRenderTarget(e,r,{minFilter:m.NearestFilter,magFilter:m.NearestFilter}),s=new m.WebGLRenderTarget(e,r,{minFilter:m.NearestFilter,magFilter:m.NearestFilter,type:m.FloatType,format:m.RedFormat}),v=new m.WebGLRenderTarget(e,r,{minFilter:m.NearestFilter,magFilter:m.NearestFilter,type:m.FloatType,format:m.RedFormat});const c=new u.FullScreenQuad(new m.ShaderMaterial({uniforms:{tex:{value:null}},vertexShader:"\n varying vec2 vUv;\n void main() {\n vUv = uv;\n gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );\n }",fragmentShader:"\n uniform sampler2D tex;\n varying vec2 vUv;\n #include <packing>\n void main() {\n gl_FragColor = pack2HalfToRGBA(vUv * (round(texture2D(tex, vUv).x)));\n }"})),d=new u.FullScreenQuad(new m.ShaderMaterial({uniforms:{tex:{value:null}},vertexShader:"\n varying vec2 vUv;\n void main() {\n vUv = uv;\n gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );\n }",fragmentShader:"\n uniform sampler2D tex;\n varying vec2 vUv;\n #include <packing>\n void main() {\n gl_FragColor = pack2HalfToRGBA(vUv * (1.0 - round(texture2D(tex, vUv).x)));\n }"})),f=new u.FullScreenQuad(new m.ShaderMaterial({uniforms:{tex:{value:null},offset:{value:0},level:{value:0},maxSteps:{value:0}},vertexShader:"\n varying vec2 vUv;\n void main() {\n vUv = uv;\n gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );\n }",fragmentShader:`\n varying vec2 vUv;\n uniform sampler2D tex;\n uniform float offset;\n uniform float level;\n uniform float maxSteps;\n #include <packing>\n void main() {\n float closestDist = 9999999.9;\n vec2 closestPos = vec2(0.0);\n for (float x = -1.0; x <= 1.0; x += 1.0) {\n for (float y = -1.0; y <= 1.0; y += 1.0) {\n vec2 voffset = vUv;\n voffset += vec2(x, y) * vec2(${1/e}, ${1/r}) * offset;\n vec2 pos = unpackRGBATo2Half(texture2D(tex, voffset));\n float dist = distance(pos.xy, vUv);\n if(pos.x != 0.0 && pos.y != 0.0 && dist < closestDist) {\n closestDist = dist;\n closestPos = pos;\n }\n }\n }\n gl_FragColor = pack2HalfToRGBA(closestPos);\n }`})),g=new u.FullScreenQuad(new m.ShaderMaterial({uniforms:{tex:{value:null},size:{value:new m.Vector2(e,r)}},vertexShader:"\n varying vec2 vUv;\n void main() {\n vUv = uv;\n gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );\n }",fragmentShader:"\n varying vec2 vUv;\n uniform sampler2D tex;\n uniform vec2 size;\n #include <packing>\n void main() {\n gl_FragColor = vec4(distance(size * unpackRGBATo2Half(texture2D(tex, vUv)), size * vUv), 0.0, 0.0, 0.0);\n }"})),p=new u.FullScreenQuad(new m.ShaderMaterial({uniforms:{inside:{value:v.texture},outside:{value:s.texture},tex:{value:null}},vertexShader:"\n varying vec2 vUv;\n void main() {\n vUv = uv;\n gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );\n }",fragmentShader:"\n varying vec2 vUv;\n uniform sampler2D inside;\n uniform sampler2D outside;\n uniform sampler2D tex;\n #include <packing>\n void main() {\n float i = texture2D(inside, vUv).x;\n float o =texture2D(outside, vUv).x;\n if (texture2D(tex, vUv).x == 0.0) {\n gl_FragColor = vec4(o, 0.0, 0.0, 0.0);\n } else {\n gl_FragColor = vec4(-i, 0.0, 0.0, 0.0);\n }\n }"}));return u=>{let x=n;u.minFilter=m.NearestFilter,u.magFilter=m.NearestFilter,c.material.uniforms.tex.value=u,t.setRenderTarget(a),c.render(t);const F=Math.ceil(Math.log(Math.max(e,r))/Math.log(2));let h=a,y=null;for(let e=0;e<F;e++){const r=Math.pow(2,F-e-1);y=h===a?l:a,f.material.uniforms.level.value=e,f.material.uniforms.maxSteps.value=F,f.material.uniforms.offset.value=r,f.material.uniforms.tex.value=h.texture,t.setRenderTarget(y),f.render(t),h=y}t.setRenderTarget(s),g.material.uniforms.tex.value=y.texture,g.render(t),d.material.uniforms.tex.value=u,t.setRenderTarget(i),d.render(t),h=i;for(let e=0;e<F;e++){const r=Math.pow(2,F-e-1);y=h===i?o:i,f.material.uniforms.level.value=e,f.material.uniforms.maxSteps.value=F,f.material.uniforms.offset.value=r,f.material.uniforms.tex.value=h.texture,t.setRenderTarget(y),f.render(t),h=y}return t.setRenderTarget(v),g.material.uniforms.tex.value=y.texture,g.render(t),t.setRenderTarget(x),p.material.uniforms.tex.value=u,p.render(t),t.setRenderTarget(null),x}};exports.MeshPortalMaterial=p;
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),r=require("three"),t=require("react"),n=require("@react-three/fiber"),a=require("./useIntersect.cjs.js"),i=require("./useFBO.cjs.js"),l=require("./RenderTexture.cjs.js"),o=require("./shaderMaterial.cjs.js"),u=require("three-stdlib");function s(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function v(e){if(e&&e.__esModule)return e;var r=Object.create(null);return e&&Object.keys(e).forEach((function(t){if("default"!==t){var n=Object.getOwnPropertyDescriptor(e,t);Object.defineProperty(r,t,n.get?n:{enumerable:!0,get:function(){return e[t]}})}})),r.default=e,Object.freeze(r)}var c=s(e),d=v(r),m=v(t);const f=o.shaderMaterial({blur:0,map:null,sdf:null,blend:0,size:0,resolution:new d.Vector2},"varying vec2 vUv;\n void main() {\n gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);\n vUv = uv;\n }",`uniform sampler2D sdf;\n uniform sampler2D map;\n uniform float blur;\n uniform float size;\n uniform float time;\n uniform vec2 resolution;\n varying vec2 vUv;\n #include <packing>\n void main() {\n vec2 uv = gl_FragCoord.xy / resolution.xy;\n vec4 t = texture2D(map, uv);\n float k = blur;\n float d = texture2D(sdf, vUv).r/size;\n float alpha = 1.0 - smoothstep(0.0, 1.0, clamp(d/k + 1.0, 0.0, 1.0));\n gl_FragColor = vec4(t.rgb, blur == 0.0 ? t.a : t.a * alpha);\n #include <tonemapping_fragment>\n #include <${parseInt(d.REVISION.replace(/\D+/g,""))>=154?"colorspace_fragment":"encodings_fragment"}>\n }`),g=m.forwardRef((({children:e,events:r,blur:t=0,eventPriority:o=0,renderPriority:u=0,worldUnits:s=!1,resolution:v=512,...g},F)=>{n.extend({PortalMaterialImpl:f});const h=m.useRef(null),{scene:y,gl:b,size:w,viewport:M,setEvents:U}=n.useThree(),R=i.useFBO(v,v),[S,T]=m.useState(0);n.useFrame((()=>{const e=h.current.blend>0?Math.max(1,u):0;S!==e&&T(e)})),m.useEffect((()=>{void 0!==r&&U({enabled:!r})}),[r]);const[_,D]=m.useState(!0),j=a.useIntersect(D);m.useLayoutEffect((()=>{var e;j.current=null==(e=h.current)?void 0:e.__r3f.parent}),[]),m.useLayoutEffect((()=>{if(j.current&&t&&null===h.current.sdf){const e=new d.Mesh(j.current.geometry,new d.MeshBasicMaterial),r=(new d.Box3).setFromBufferAttribute(e.geometry.attributes.position),t=new d.OrthographicCamera(r.min.x*(1+2/v),r.max.x*(1+2/v),r.max.y*(1+2/v),r.min.y*(1+2/v),.1,1e3);t.position.set(0,0,1),t.lookAt(0,0,0),b.setRenderTarget(R),b.render(e,t);const n=x(v,v,b)(R.texture),a=new Float32Array(v*v);b.readRenderTargetPixels(n,0,0,v,v,a);let i=1/0;for(let e=0;e<a.length;e++)a[e]<i&&(i=a[e]);i=-i,h.current.size=i,h.current.sdf=n.texture,b.setRenderTarget(null)}}),[v,t]),m.useImperativeHandle(F,(()=>h.current));const P=m.useCallback(((e,r,t)=>{var n;if(!j.current)return!1;if(r.pointer.set(e.offsetX/r.size.width*2-1,-e.offsetY/r.size.height*2+1),r.raycaster.setFromCamera(r.pointer,r.camera),0===(null==(n=h.current)?void 0:n.blend)){const[e]=r.raycaster.intersectObject(j.current);if(!e)return r.raycaster.camera=void 0,!1}}),[]);return m.createElement("portalMaterialImpl",c.default({ref:h,blur:t,blend:0,resolution:[w.width*M.dpr,w.height*M.dpr],toneMapped:!1,attach:"material"},g),m.createElement(l.RenderTexture,{attach:"map",frames:_?1/0:0,eventPriority:o,renderPriority:u,compute:P},e,m.createElement(p,{events:r,rootScene:y,priority:S,material:h,worldUnits:s})))}));function p({events:e,rootScene:r,material:t,priority:a,worldUnits:l}){const o=n.useThree((e=>e.scene)),s=n.useThree((e=>e.setEvents)),v=i.useFBO(),c=i.useFBO();m.useLayoutEffect((()=>{o.matrixAutoUpdate=!1}),[]),m.useEffect((()=>{void 0!==e&&s({enabled:e})}),[e]);const[f,g]=m.useMemo((()=>{const e={value:0};return[new u.FullScreenQuad(new d.ShaderMaterial({uniforms:{a:{value:v.texture},b:{value:c.texture},blend:e},vertexShader:"\n varying vec2 vUv;\n void main() {\n vUv = uv;\n gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );\n }",fragmentShader:`\n uniform sampler2D a;\n uniform sampler2D b;\n uniform float blend;\n varying vec2 vUv;\n #include <packing>\n void main() {\n vec4 ta = texture2D(a, vUv);\n vec4 tb = texture2D(b, vUv);\n gl_FragColor = mix(tb, ta, blend);\n #include <${parseInt(d.REVISION.replace(/\D+/g,""))>=154?"colorspace_fragment":"encodings_fragment"}>\n }`})),e]}),[]);return n.useFrame((e=>{var n;let i=null==t||null==(n=t.current)?void 0:n.__r3f.parent;if(i){var u,s,d,m;if(l)o.matrixWorld.identity();else a&&1===(null==(u=t.current)?void 0:u.blend)&&i.updateWorldMatrix(!0,!1),o.matrixWorld.copy(i.matrixWorld);if(a)(null==(s=t.current)?void 0:s.blend)>0&&(null==(d=t.current)?void 0:d.blend)<1?(g.value=t.current.blend,e.gl.setRenderTarget(v),e.gl.render(o,e.camera),e.gl.setRenderTarget(c),e.gl.render(r,e.camera),e.gl.setRenderTarget(null),f.render(e.gl)):1===(null==(m=t.current)?void 0:m.blend)&&e.gl.render(o,e.camera)}}),a),m.createElement(m.Fragment,null)}const x=(e,r,t)=>{let n=new d.WebGLRenderTarget(e,r,{minFilter:d.LinearMipmapLinearFilter,magFilter:d.LinearFilter,type:d.FloatType,format:d.RedFormat,generateMipmaps:!0}),a=new d.WebGLRenderTarget(e,r,{minFilter:d.NearestFilter,magFilter:d.NearestFilter}),i=new d.WebGLRenderTarget(e,r,{minFilter:d.NearestFilter,magFilter:d.NearestFilter}),l=new d.WebGLRenderTarget(e,r,{minFilter:d.NearestFilter,magFilter:d.NearestFilter}),o=new d.WebGLRenderTarget(e,r,{minFilter:d.NearestFilter,magFilter:d.NearestFilter}),s=new d.WebGLRenderTarget(e,r,{minFilter:d.NearestFilter,magFilter:d.NearestFilter,type:d.FloatType,format:d.RedFormat}),v=new d.WebGLRenderTarget(e,r,{minFilter:d.NearestFilter,magFilter:d.NearestFilter,type:d.FloatType,format:d.RedFormat});const c=new u.FullScreenQuad(new d.ShaderMaterial({uniforms:{tex:{value:null}},vertexShader:"\n varying vec2 vUv;\n void main() {\n vUv = uv;\n gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );\n }",fragmentShader:"\n uniform sampler2D tex;\n varying vec2 vUv;\n #include <packing>\n void main() {\n gl_FragColor = pack2HalfToRGBA(vUv * (round(texture2D(tex, vUv).x)));\n }"})),m=new u.FullScreenQuad(new d.ShaderMaterial({uniforms:{tex:{value:null}},vertexShader:"\n varying vec2 vUv;\n void main() {\n vUv = uv;\n gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );\n }",fragmentShader:"\n uniform sampler2D tex;\n varying vec2 vUv;\n #include <packing>\n void main() {\n gl_FragColor = pack2HalfToRGBA(vUv * (1.0 - round(texture2D(tex, vUv).x)));\n }"})),f=new u.FullScreenQuad(new d.ShaderMaterial({uniforms:{tex:{value:null},offset:{value:0},level:{value:0},maxSteps:{value:0}},vertexShader:"\n varying vec2 vUv;\n void main() {\n vUv = uv;\n gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );\n }",fragmentShader:`\n varying vec2 vUv;\n uniform sampler2D tex;\n uniform float offset;\n uniform float level;\n uniform float maxSteps;\n #include <packing>\n void main() {\n float closestDist = 9999999.9;\n vec2 closestPos = vec2(0.0);\n for (float x = -1.0; x <= 1.0; x += 1.0) {\n for (float y = -1.0; y <= 1.0; y += 1.0) {\n vec2 voffset = vUv;\n voffset += vec2(x, y) * vec2(${1/e}, ${1/r}) * offset;\n vec2 pos = unpackRGBATo2Half(texture2D(tex, voffset));\n float dist = distance(pos.xy, vUv);\n if(pos.x != 0.0 && pos.y != 0.0 && dist < closestDist) {\n closestDist = dist;\n closestPos = pos;\n }\n }\n }\n gl_FragColor = pack2HalfToRGBA(closestPos);\n }`})),g=new u.FullScreenQuad(new d.ShaderMaterial({uniforms:{tex:{value:null},size:{value:new d.Vector2(e,r)}},vertexShader:"\n varying vec2 vUv;\n void main() {\n vUv = uv;\n gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );\n }",fragmentShader:"\n varying vec2 vUv;\n uniform sampler2D tex;\n uniform vec2 size;\n #include <packing>\n void main() {\n gl_FragColor = vec4(distance(size * unpackRGBATo2Half(texture2D(tex, vUv)), size * vUv), 0.0, 0.0, 0.0);\n }"})),p=new u.FullScreenQuad(new d.ShaderMaterial({uniforms:{inside:{value:v.texture},outside:{value:s.texture},tex:{value:null}},vertexShader:"\n varying vec2 vUv;\n void main() {\n vUv = uv;\n gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );\n }",fragmentShader:"\n varying vec2 vUv;\n uniform sampler2D inside;\n uniform sampler2D outside;\n uniform sampler2D tex;\n #include <packing>\n void main() {\n float i = texture2D(inside, vUv).x;\n float o =texture2D(outside, vUv).x;\n if (texture2D(tex, vUv).x == 0.0) {\n gl_FragColor = vec4(o, 0.0, 0.0, 0.0);\n } else {\n gl_FragColor = vec4(-i, 0.0, 0.0, 0.0);\n }\n }"}));return u=>{let x=n;u.minFilter=d.NearestFilter,u.magFilter=d.NearestFilter,c.material.uniforms.tex.value=u,t.setRenderTarget(a),c.render(t);const F=Math.ceil(Math.log(Math.max(e,r))/Math.log(2));let h=a,y=null;for(let e=0;e<F;e++){const r=Math.pow(2,F-e-1);y=h===a?l:a,f.material.uniforms.level.value=e,f.material.uniforms.maxSteps.value=F,f.material.uniforms.offset.value=r,f.material.uniforms.tex.value=h.texture,t.setRenderTarget(y),f.render(t),h=y}t.setRenderTarget(s),g.material.uniforms.tex.value=y.texture,g.render(t),m.material.uniforms.tex.value=u,t.setRenderTarget(i),m.render(t),h=i;for(let e=0;e<F;e++){const r=Math.pow(2,F-e-1);y=h===i?o:i,f.material.uniforms.level.value=e,f.material.uniforms.maxSteps.value=F,f.material.uniforms.offset.value=r,f.material.uniforms.tex.value=h.texture,t.setRenderTarget(y),f.render(t),h=y}return t.setRenderTarget(v),g.material.uniforms.tex.value=y.texture,g.render(t),t.setRenderTarget(x),p.material.uniforms.tex.value=u,p.render(t),t.setRenderTarget(null),x}};exports.MeshPortalMaterial=g;
|
|
@@ -7,15 +7,14 @@ import { useFBO } from './useFBO.js';
|
|
|
7
7
|
import { RenderTexture } from './RenderTexture.js';
|
|
8
8
|
import { shaderMaterial } from './shaderMaterial.js';
|
|
9
9
|
import { FullScreenQuad } from 'three-stdlib';
|
|
10
|
-
import { version } from '../helpers/constants.js';
|
|
11
10
|
|
|
12
|
-
const PortalMaterialImpl =
|
|
11
|
+
const PortalMaterialImpl = shaderMaterial({
|
|
13
12
|
blur: 0,
|
|
14
13
|
map: null,
|
|
15
14
|
sdf: null,
|
|
16
15
|
blend: 0,
|
|
17
16
|
size: 0,
|
|
18
|
-
resolution:
|
|
17
|
+
resolution: new THREE.Vector2()
|
|
19
18
|
}, `varying vec2 vUv;
|
|
20
19
|
void main() {
|
|
21
20
|
gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
|
|
@@ -36,9 +35,9 @@ const PortalMaterialImpl = /*@__PURE__*/shaderMaterial({
|
|
|
36
35
|
float alpha = 1.0 - smoothstep(0.0, 1.0, clamp(d/k + 1.0, 0.0, 1.0));
|
|
37
36
|
gl_FragColor = vec4(t.rgb, blur == 0.0 ? t.a : t.a * alpha);
|
|
38
37
|
#include <tonemapping_fragment>
|
|
39
|
-
#include <${
|
|
38
|
+
#include <${parseInt(THREE.REVISION.replace(/\D+/g, '')) >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
|
|
40
39
|
}`);
|
|
41
|
-
const MeshPortalMaterial =
|
|
40
|
+
const MeshPortalMaterial = /*#__PURE__*/React.forwardRef(({
|
|
42
41
|
children,
|
|
43
42
|
events = undefined,
|
|
44
43
|
blur = 0,
|
|
@@ -194,7 +193,7 @@ function ManagePortalScene({
|
|
|
194
193
|
vec4 ta = texture2D(a, vUv);
|
|
195
194
|
vec4 tb = texture2D(b, vUv);
|
|
196
195
|
gl_FragColor = mix(tb, ta, blend);
|
|
197
|
-
#include <${
|
|
196
|
+
#include <${parseInt(THREE.REVISION.replace(/\D+/g, '')) >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
|
|
198
197
|
}`
|
|
199
198
|
}));
|
|
200
199
|
return [quad, blend];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),t=require("react"),r=require("three"),a=require("@react-three/fiber"),n=require("react-merge-refs"),
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),t=require("react"),r=require("three"),a=require("@react-three/fiber"),n=require("react-merge-refs"),i=require("../materials/BlurPass.cjs.js"),o=require("../materials/MeshReflectorMaterial.cjs.js");function s(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function l(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(r){if("default"!==r){var a=Object.getOwnPropertyDescriptor(e,r);Object.defineProperty(t,r,a.get?a:{enumerable:!0,get:function(){return e[r]}})}})),t.default=e,Object.freeze(t)}require("../materials/ConvolutionMaterial.cjs.js");var u=s(e),d=l(t),c=s(n);a.extend({MeshReflectorMaterialImpl:o.MeshReflectorMaterial});const p=d.forwardRef((({mixBlur:e=0,mixStrength:t=1,resolution:n=256,blur:o=[0,0],minDepthThreshold:s=.9,maxDepthThreshold:l=1,depthScale:p=0,depthToBlurRatioBias:m=.25,mirror:h=0,distortion:f=1,mixContrast:x=1,distortionMap:M,reflectorOffset:T=0,...S},y)=>{const w=a.useThree((({gl:e})=>e)),b=a.useThree((({camera:e})=>e)),R=a.useThree((({scene:e})=>e)),g=(o=Array.isArray(o)?o:[o,o])[0]+o[1]>0,v=d.useRef(null),[j]=d.useState((()=>new r.Plane)),[D]=d.useState((()=>new r.Vector3)),[B]=d.useState((()=>new r.Vector3)),[_]=d.useState((()=>new r.Vector3)),[O]=d.useState((()=>new r.Matrix4)),[P]=d.useState((()=>new r.Vector3(0,0,-1))),[U]=d.useState((()=>new r.Vector4)),[V]=d.useState((()=>new r.Vector3)),[E]=d.useState((()=>new r.Vector3)),[F]=d.useState((()=>new r.Vector4)),[W]=d.useState((()=>new r.Matrix4)),[q]=d.useState((()=>new r.PerspectiveCamera)),I=d.useCallback((()=>{var e;const t=v.current.parent||(null==(e=v.current)?void 0:e.__r3f.parent);if(!t)return;if(B.setFromMatrixPosition(t.matrixWorld),_.setFromMatrixPosition(b.matrixWorld),O.extractRotation(t.matrixWorld),D.set(0,0,1),D.applyMatrix4(O),B.addScaledVector(D,T),V.subVectors(B,_),V.dot(D)>0)return;V.reflect(D).negate(),V.add(B),O.extractRotation(b.matrixWorld),P.set(0,0,-1),P.applyMatrix4(O),P.add(_),E.subVectors(B,P),E.reflect(D).negate(),E.add(B),q.position.copy(V),q.up.set(0,1,0),q.up.applyMatrix4(O),q.up.reflect(D),q.lookAt(E),q.far=b.far,q.updateMatrixWorld(),q.projectionMatrix.copy(b.projectionMatrix),W.set(.5,0,0,.5,0,.5,0,.5,0,0,.5,.5,0,0,0,1),W.multiply(q.projectionMatrix),W.multiply(q.matrixWorldInverse),W.multiply(t.matrixWorld),j.setFromNormalAndCoplanarPoint(D,B),j.applyMatrix4(q.matrixWorldInverse),U.set(j.normal.x,j.normal.y,j.normal.z,j.constant);const r=q.projectionMatrix;F.x=(Math.sign(U.x)+r.elements[8])/r.elements[0],F.y=(Math.sign(U.y)+r.elements[9])/r.elements[5],F.z=-1,F.w=(1+r.elements[10])/r.elements[14],U.multiplyScalar(2/U.dot(F)),r.elements[2]=U.x,r.elements[6]=U.y,r.elements[10]=U.z+1,r.elements[14]=U.w}),[b,T]),[C,k,L,z]=d.useMemo((()=>{const a={minFilter:r.LinearFilter,magFilter:r.LinearFilter,type:r.HalfFloatType},u=new r.WebGLRenderTarget(n,n,a);u.depthBuffer=!0,u.depthTexture=new r.DepthTexture(n,n),u.depthTexture.format=r.DepthFormat,u.depthTexture.type=r.UnsignedShortType;const d=new r.WebGLRenderTarget(n,n,a);return[u,d,new i.BlurPass({gl:w,resolution:n,width:o[0],height:o[1],minDepthThreshold:s,maxDepthThreshold:l,depthScale:p,depthToBlurRatioBias:m}),{mirror:h,textureMatrix:W,mixBlur:e,tDiffuse:u.texture,tDepth:u.depthTexture,tDiffuseBlur:d.texture,hasBlur:g,mixStrength:t,minDepthThreshold:s,maxDepthThreshold:l,depthScale:p,depthToBlurRatioBias:m,distortion:f,distortionMap:M,mixContrast:x,"defines-USE_BLUR":g?"":void 0,"defines-USE_DEPTH":p>0?"":void 0,"defines-USE_DISTORTION":M?"":void 0}]}),[w,o,W,n,h,g,e,t,s,l,p,m,f,M,x]);return a.useFrame((()=>{var e;const t=v.current.parent||(null==(e=v.current)?void 0:e.__r3f.parent);if(!t)return;t.visible=!1;const r=w.xr.enabled,a=w.shadowMap.autoUpdate;I(),w.xr.enabled=!1,w.shadowMap.autoUpdate=!1,w.setRenderTarget(C),w.state.buffers.depth.setMask(!0),w.autoClear||w.clear(),w.render(R,q),g&&L.render(w,C,k),w.xr.enabled=r,w.shadowMap.autoUpdate=a,t.visible=!0,w.setRenderTarget(null)})),d.createElement("meshReflectorMaterialImpl",u.default({attach:"material",key:"key"+z["defines-USE_BLUR"]+z["defines-USE_DEPTH"]+z["defines-USE_DISTORTION"],ref:c.default([v,y])},z,S))}));exports.MeshReflectorMaterial=p;
|
|
@@ -6,10 +6,10 @@ import mergeRefs from 'react-merge-refs';
|
|
|
6
6
|
import { BlurPass } from '../materials/BlurPass.js';
|
|
7
7
|
import { MeshReflectorMaterial as MeshReflectorMaterial$1 } from '../materials/MeshReflectorMaterial.js';
|
|
8
8
|
|
|
9
|
-
|
|
9
|
+
extend({
|
|
10
10
|
MeshReflectorMaterialImpl: MeshReflectorMaterial$1
|
|
11
11
|
});
|
|
12
|
-
const MeshReflectorMaterial =
|
|
12
|
+
const MeshReflectorMaterial = /*#__PURE__*/React.forwardRef(({
|
|
13
13
|
mixBlur = 0,
|
|
14
14
|
mixStrength = 1,
|
|
15
15
|
resolution = 256,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),r=require("react"),t=require("@react-three/fiber"),
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),r=require("react"),t=require("@react-three/fiber"),a=require("three-mesh-bvh"),n=require("../materials/MeshRefractionMaterial.cjs.js");function i(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function o(e){if(e&&e.__esModule)return e;var r=Object.create(null);return e&&Object.keys(e).forEach((function(t){if("default"!==t){var a=Object.getOwnPropertyDescriptor(e,t);Object.defineProperty(r,t,a.get?a:{enumerable:!0,get:function(){return e[t]}})}})),r.default=e,Object.freeze(r)}require("three"),require("./shaderMaterial.cjs.js");var u=i(e),s=o(r);exports.MeshRefractionMaterial=function({aberrationStrength:e=0,fastChroma:i=!0,envMap:o,...c}){t.extend({MeshRefractionMaterial:n.MeshRefractionMaterial});const l=r.useRef(),{size:f}=t.useThree(),h=r.useMemo((()=>{var r,t;const a={},n=(u=o)&&u.isCubeTexture;var u;const s=(null!==(r=n?null==(t=o.image[0])?void 0:t.width:o.image.width)&&void 0!==r?r:1024)/4,c=Math.floor(Math.log2(s)),l=Math.pow(2,c),f=3*Math.max(l,112),h=4*l;return n&&(a.ENVMAP_TYPE_CUBEM=""),a.CUBEUV_TEXEL_WIDTH=""+1/f,a.CUBEUV_TEXEL_HEIGHT=""+1/h,a.CUBEUV_MAX_MIP=`${c}.0`,e>0&&(a.CHROMATIC_ABERRATIONS=""),i&&(a.FAST_CHROMA=""),a}),[e,i]);return r.useLayoutEffect((()=>{var e;const r=null==(e=l.current)||null==(e=e.__r3f)||null==(e=e.parent)?void 0:e.geometry;r&&(l.current.bvh=new a.MeshBVHUniformStruct,l.current.bvh.updateFrom(new a.MeshBVH(r.clone().toNonIndexed(),{lazyGeneration:!1,strategy:a.SAH})))}),[]),t.useFrame((({camera:e})=>{l.current.viewMatrixInverse=e.matrixWorld,l.current.projectionMatrixInverse=e.projectionMatrixInverse})),s.createElement("meshRefractionMaterial",u.default({key:JSON.stringify(h),defines:h,ref:l,resolution:[f.width,f.height],aberrationStrength:e,envMap:o},c))};
|
|
@@ -304,7 +304,7 @@ class MeshTransmissionMaterialImpl extends THREE.MeshPhysicalMaterial {
|
|
|
304
304
|
}));
|
|
305
305
|
}
|
|
306
306
|
}
|
|
307
|
-
const MeshTransmissionMaterial =
|
|
307
|
+
const MeshTransmissionMaterial = /*#__PURE__*/React.forwardRef(({
|
|
308
308
|
buffer,
|
|
309
309
|
transmissionSampler = false,
|
|
310
310
|
backside = false,
|
|
@@ -42,7 +42,7 @@ class WobbleMaterialImpl extends MeshStandardMaterial {
|
|
|
42
42
|
this._factor.value = v;
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
|
-
const MeshWobbleMaterial =
|
|
45
|
+
const MeshWobbleMaterial = /*#__PURE__*/React.forwardRef(({
|
|
46
46
|
speed = 1,
|
|
47
47
|
...props
|
|
48
48
|
}, ref) => {
|
|
@@ -5,7 +5,7 @@ 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 =
|
|
8
|
+
const context = /*#__PURE__*/React.createContext(null);
|
|
9
9
|
function useMotion() {
|
|
10
10
|
return React.useContext(context);
|
|
11
11
|
}
|
|
@@ -34,7 +34,7 @@ function Debug({
|
|
|
34
34
|
position: [item.x, item.y, item.z]
|
|
35
35
|
})));
|
|
36
36
|
}
|
|
37
|
-
const MotionPathControls =
|
|
37
|
+
const MotionPathControls = /*#__PURE__*/React.forwardRef(({
|
|
38
38
|
children,
|
|
39
39
|
curves = [],
|
|
40
40
|
object,
|
package/core/OrbitControls.js
CHANGED
|
@@ -3,7 +3,7 @@ import { useThree, useFrame } from '@react-three/fiber';
|
|
|
3
3
|
import * as React from 'react';
|
|
4
4
|
import { OrbitControls as OrbitControls$1 } from 'three-stdlib';
|
|
5
5
|
|
|
6
|
-
const OrbitControls =
|
|
6
|
+
const OrbitControls = /*#__PURE__*/React.forwardRef(({
|
|
7
7
|
makeDefault,
|
|
8
8
|
camera,
|
|
9
9
|
regress,
|
|
@@ -5,7 +5,7 @@ import mergeRefs from 'react-merge-refs';
|
|
|
5
5
|
import { useFBO } from './useFBO.js';
|
|
6
6
|
|
|
7
7
|
const isFunction = node => typeof node === 'function';
|
|
8
|
-
const OrthographicCamera =
|
|
8
|
+
const OrthographicCamera = /*#__PURE__*/React.forwardRef(({
|
|
9
9
|
envMap,
|
|
10
10
|
resolution = 256,
|
|
11
11
|
frames = Infinity,
|
package/core/Outlines.cjs.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),n=require("three"),t=require("react"),r=require("./shaderMaterial.cjs.js"),i=require("@react-three/fiber"),o=require("three-stdlib")
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),n=require("three"),t=require("react"),r=require("./shaderMaterial.cjs.js"),i=require("@react-three/fiber"),o=require("three-stdlib");function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function c(e){if(e&&e.__esModule)return e;var n=Object.create(null);return e&&Object.keys(e).forEach((function(t){if("default"!==t){var r=Object.getOwnPropertyDescriptor(e,t);Object.defineProperty(n,t,r.get?r:{enumerable:!0,get:function(){return e[t]}})}})),n.default=e,Object.freeze(n)}var s=a(e),l=c(n),u=c(t);const d=r.shaderMaterial({screenspace:!1,color:new l.Color("black"),opacity:1,thickness:.05,size:new l.Vector2},"#include <common>\n #include <morphtarget_pars_vertex>\n #include <skinning_pars_vertex>\n uniform float thickness;\n uniform float 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 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 == 0.0) {\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 void main(){\n gl_FragColor = vec4(color, opacity);\n #include <tonemapping_fragment>\n #include <${parseInt(l.REVISION.replace(/\D+/g,""))>=154?"colorspace_fragment":"encodings_fragment"}>\n }`);exports.Outlines=function({color:e="black",opacity:n=1,transparent:t=!1,screenspace:r=!1,toneMapped:a=!0,polygonOffset:c=!1,polygonOffsetFactor:f=0,renderOrder:p=0,thickness:m=.05,angle:g=Math.PI,...v}){var x;const y=u.useRef(null),[_]=u.useState((()=>new d({side:l.BackSide}))),{gl:M}=i.useThree(),h=M.getDrawingBufferSize(new l.Vector2);return u.useMemo((()=>i.extend({OutlinesMaterial:d})),[]),u.useLayoutEffect((()=>{const e=y.current,n=e.parent;if(n&&n.geometry){let t;return n.skeleton?(t=new l.SkinnedMesh,t.material=_,t.bind(n.skeleton,n.bindMatrix),e.add(t)):n.isInstancedMesh?(t=new l.InstancedMesh(n.geometry,_,n.count),t.instanceMatrix=n.instanceMatrix,e.add(t)):(t=new l.Mesh,t.material=_,e.add(t)),t.geometry=g?o.toCreasedNormals(n.geometry,g):n.geometry,()=>{g&&t.geometry.dispose(),e.remove(t)}}}),[g,null==(x=y.current)||null==(x=x.parent)?void 0:x.geometry]),u.useLayoutEffect((()=>{const o=y.current.children[0];o&&(o.renderOrder=p,i.applyProps(o.material,{transparent:t,thickness:m,color:e,opacity:n,size:h,screenspace:r,toneMapped:a,polygonOffset:c,polygonOffsetFactor:f}))}),[g,t,m,e,n,r,a,c,f,h,p]),u.createElement("group",s.default({ref:y},v))};
|
package/core/Outlines.js
CHANGED
|
@@ -4,14 +4,13 @@ import * as React from 'react';
|
|
|
4
4
|
import { shaderMaterial } from './shaderMaterial.js';
|
|
5
5
|
import { useThree, extend, applyProps } from '@react-three/fiber';
|
|
6
6
|
import { toCreasedNormals } from 'three-stdlib';
|
|
7
|
-
import { version } from '../helpers/constants.js';
|
|
8
7
|
|
|
9
|
-
const OutlinesMaterial =
|
|
8
|
+
const OutlinesMaterial = shaderMaterial({
|
|
10
9
|
screenspace: false,
|
|
11
|
-
color:
|
|
10
|
+
color: new THREE.Color('black'),
|
|
12
11
|
opacity: 1,
|
|
13
12
|
thickness: 0.05,
|
|
14
|
-
size:
|
|
13
|
+
size: new THREE.Vector2()
|
|
15
14
|
}, `#include <common>
|
|
16
15
|
#include <morphtarget_pars_vertex>
|
|
17
16
|
#include <skinning_pars_vertex>
|
|
@@ -51,7 +50,7 @@ const OutlinesMaterial = /*@__PURE__*/shaderMaterial({
|
|
|
51
50
|
void main(){
|
|
52
51
|
gl_FragColor = vec4(color, opacity);
|
|
53
52
|
#include <tonemapping_fragment>
|
|
54
|
-
#include <${
|
|
53
|
+
#include <${parseInt(THREE.REVISION.replace(/\D+/g, '')) >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
|
|
55
54
|
}`);
|
|
56
55
|
function Outlines({
|
|
57
56
|
color = 'black',
|
|
@@ -2,7 +2,7 @@ import * as React from 'react';
|
|
|
2
2
|
import { useState, useContext, useRef, useLayoutEffect, createContext } from 'react';
|
|
3
3
|
import { useFrame } from '@react-three/fiber';
|
|
4
4
|
|
|
5
|
-
const context =
|
|
5
|
+
const context = /*#__PURE__*/createContext(null);
|
|
6
6
|
function PerformanceMonitor({
|
|
7
7
|
iterations = 10,
|
|
8
8
|
ms = 250,
|
|
@@ -5,7 +5,7 @@ import mergeRefs from 'react-merge-refs';
|
|
|
5
5
|
import { useFBO } from './useFBO.js';
|
|
6
6
|
|
|
7
7
|
const isFunction = node => typeof node === 'function';
|
|
8
|
-
const PerspectiveCamera =
|
|
8
|
+
const PerspectiveCamera = /*#__PURE__*/React.forwardRef(({
|
|
9
9
|
envMap,
|
|
10
10
|
resolution = 256,
|
|
11
11
|
frames = Infinity,
|