@react-three/drei 7.27.2 → 7.27.3
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 -3
- package/core/MeshReflectorMaterial.cjs.js +1 -1
- package/core/MeshReflectorMaterial.d.ts +2 -4
- package/core/MeshReflectorMaterial.js +3 -7
- package/core/Reflector.cjs.js +1 -1
- package/core/Reflector.d.ts +2 -4
- package/core/Reflector.js +3 -7
- package/index.cjs.js +1 -1
- package/materials/MeshReflectorMaterial.cjs.js +1 -1
- package/materials/MeshReflectorMaterial.d.ts +4 -12
- package/materials/MeshReflectorMaterial.js +10 -38
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("three");class t extends e.MeshStandardMaterial{constructor(e={}){super(e),this._debug={value:0},this._tDepth={value:null},this._distortionMap={value:null},this._tDiffuse={value:null},this._tDiffuseBlur={value:null},this._textureMatrix={value:null},this._hasBlur={value:!1},this._mirror={value:0},this._mixBlur={value:0},this._blurStrength={value:.5},this._minDepthThreshold={value:.9},this._maxDepthThreshold={value:1},this._depthScale={value:0},this._depthToBlurRatioBias={value:.25},this._distortion={value:1},this.
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("three");class t extends e.MeshStandardMaterial{constructor(e={}){super(e),this._debug={value:0},this._tDepth={value:null},this._distortionMap={value:null},this._tDiffuse={value:null},this._tDiffuseBlur={value:null},this._textureMatrix={value:null},this._hasBlur={value:!1},this._mirror={value:0},this._mixBlur={value:0},this._blurStrength={value:.5},this._minDepthThreshold={value:.9},this._maxDepthThreshold={value:1},this._depthScale={value:0},this._depthToBlurRatioBias={value:.25},this._distortion={value:1},this._mixContrast={value:1},this.setValues(e)}onBeforeCompile(e){var t;null!=(t=e.defines)&&t.USE_UV||(e.defines.USE_UV=""),e.uniforms.debug=this._debug,e.uniforms.hasBlur=this._hasBlur,e.uniforms.tDiffuse=this._tDiffuse,e.uniforms.tDepth=this._tDepth,e.uniforms.distortionMap=this._distortionMap,e.uniforms.tDiffuseBlur=this._tDiffuseBlur,e.uniforms.textureMatrix=this._textureMatrix,e.uniforms.mirror=this._mirror,e.uniforms.mixBlur=this._mixBlur,e.uniforms.mixStrength=this._blurStrength,e.uniforms.minDepthThreshold=this._minDepthThreshold,e.uniforms.maxDepthThreshold=this._maxDepthThreshold,e.uniforms.depthScale=this._depthScale,e.uniforms.depthToBlurRatioBias=this._depthToBlurRatioBias,e.uniforms.distortion=this._distortion,e.uniforms.mixContrast=this._mixContrast,e.vertexShader=`\n uniform mat4 textureMatrix;\n varying vec4 my_vUv; \n ${e.vertexShader}`,e.vertexShader=e.vertexShader.replace("#include <project_vertex>","#include <project_vertex>\n my_vUv = textureMatrix * vec4( position, 1.0 );\n gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );"),e.fragmentShader=`\n uniform int debug;\n uniform sampler2D tDiffuse;\n uniform sampler2D tDiffuseBlur;\n uniform sampler2D tDepth;\n uniform sampler2D distortionMap;\n uniform float distortion;\n uniform float cameraNear;\n\t\t\t uniform float cameraFar;\n uniform bool hasBlur;\n uniform float mixBlur;\n uniform float mirror;\n uniform float mixStrength;\n uniform float minDepthThreshold;\n uniform float maxDepthThreshold;\n uniform float mixContrast;\n uniform float depthScale;\n uniform float depthToBlurRatioBias;\n varying vec4 my_vUv; \n ${e.fragmentShader}`,e.fragmentShader=e.fragmentShader.replace("#include <emissivemap_fragment>","#include <emissivemap_fragment>\n \n float distortionFactor = 0.0;\n #ifdef USE_DISTORTION\n distortionFactor = texture2D(distortionMap, vUv).r * distortion;\n #endif\n\n vec4 new_vUv = my_vUv;\n new_vUv.x += distortionFactor;\n new_vUv.y += distortionFactor;\n\n vec4 base = texture2DProj(tDiffuse, new_vUv);\n vec4 blur = texture2DProj(tDiffuseBlur, new_vUv);\n \n vec4 merge = base;\n \n #ifdef USE_NORMALMAP\n vec2 normal_uv = vec2(0.0);\n vec4 normalColor = texture2D(normalMap, vUv * normalScale);\n vec3 my_normal = normalize( vec3( normalColor.r * 2.0 - 1.0, normalColor.b, normalColor.g * 2.0 - 1.0 ) );\n vec3 coord = new_vUv.xyz / new_vUv.w;\n normal_uv = coord.xy + coord.z * my_normal.xz * 0.05;\n vec4 base_normal = texture2D(tDiffuse, normal_uv);\n vec4 blur_normal = texture2D(tDiffuseBlur, normal_uv);\n merge = base_normal;\n blur = blur_normal;\n #endif\n\n float depthFactor = 0.0001;\n float blurFactor = 0.0;\n\n #ifdef USE_DEPTH\n vec4 depth = texture2DProj(tDepth, new_vUv);\n depthFactor = smoothstep(minDepthThreshold, maxDepthThreshold, 1.0-(depth.r * depth.a));\n depthFactor *= depthScale;\n depthFactor = max(0.0001, min(1.0, depthFactor));\n\n #ifdef USE_BLUR\n blur = blur * min(1.0, depthFactor + depthToBlurRatioBias);\n merge = merge * min(1.0, depthFactor + 0.5);\n #else\n merge = merge * depthFactor;\n #endif\n \n #endif\n\n float reflectorRoughnessFactor = roughness;\n #ifdef USE_ROUGHNESSMAP\n vec4 reflectorTexelRoughness = texture2D( roughnessMap, vUv );\n reflectorRoughnessFactor *= reflectorTexelRoughness.g;\n #endif\n \n #ifdef USE_BLUR\n blurFactor = min(1.0, mixBlur * reflectorRoughnessFactor);\n merge = mix(merge, blur, blurFactor);\n #endif\n\n vec4 newMerge = vec4(0.0, 0.0, 0.0, 1.0);\n newMerge.r = (merge.r - 0.5) * mixContrast + 0.5;\n newMerge.g = (merge.g - 0.5) * mixContrast + 0.5;\n newMerge.b = (merge.b - 0.5) * mixContrast + 0.5;\n\n diffuseColor.rgb = diffuseColor.rgb * ((1.0 - min(1.0, mirror)) + newMerge.rgb * mixStrength); \n diffuseColor = sRGBToLinear(diffuseColor);\n \n if (debug == 1) {\n diffuseColor = sRGBToLinear(vec4(vec3(depthFactor), 1.0));\n }\n if (debug == 2) {\n diffuseColor = sRGBToLinear(vec4(vec3(blurFactor), 1.0));\n }\n if (debug == 3) {\n diffuseColor = sRGBToLinear(texture2DProj(tDiffuse, new_vUv));\n }\n if (debug == 4) {\n diffuseColor = sRGBToLinear(texture2DProj(tDiffuseBlur, new_vUv));\n }\n ")}get tDiffuse(){return this._tDiffuse.value}set tDiffuse(e){this._tDiffuse.value=e}get tDepth(){return this._tDepth.value}set tDepth(e){this._tDepth.value=e}get distortionMap(){return this._distortionMap.value}set distortionMap(e){this._distortionMap.value=e}get tDiffuseBlur(){return this._tDiffuseBlur.value}set tDiffuseBlur(e){this._tDiffuseBlur.value=e}get textureMatrix(){return this._textureMatrix.value}set textureMatrix(e){this._textureMatrix.value=e}get hasBlur(){return this._hasBlur.value}set hasBlur(e){this._hasBlur.value=e}get mirror(){return this._mirror.value}set mirror(e){this._mirror.value=e}get mixBlur(){return this._mixBlur.value}set mixBlur(e){this._mixBlur.value=e}get mixStrength(){return this._blurStrength.value}set mixStrength(e){this._blurStrength.value=e}get minDepthThreshold(){return this._minDepthThreshold.value}set minDepthThreshold(e){this._minDepthThreshold.value=e}get maxDepthThreshold(){return this._maxDepthThreshold.value}set maxDepthThreshold(e){this._maxDepthThreshold.value=e}get depthScale(){return this._depthScale.value}set depthScale(e){this._depthScale.value=e}get debug(){return this._debug.value}set debug(e){this._debug.value=e}get depthToBlurRatioBias(){return this._depthToBlurRatioBias.value}set depthToBlurRatioBias(e){this._depthToBlurRatioBias.value=e}get distortion(){return this._distortion.value}set distortion(e){this._distortion.value=e}get mixContrast(){return this._mixContrast.value}set mixContrast(e){this._mixContrast.value=e}}exports.MeshReflectorMaterial=t;
|
|
@@ -15,9 +15,7 @@ export declare class MeshReflectorMaterial extends MeshStandardMaterial {
|
|
|
15
15
|
private _depthScale;
|
|
16
16
|
private _depthToBlurRatioBias;
|
|
17
17
|
private _distortion;
|
|
18
|
-
private
|
|
19
|
-
private _contrast;
|
|
20
|
-
private _brightness;
|
|
18
|
+
private _mixContrast;
|
|
21
19
|
constructor(parameters?: {});
|
|
22
20
|
onBeforeCompile(shader: any): void;
|
|
23
21
|
get tDiffuse(): Texture | null;
|
|
@@ -50,12 +48,8 @@ export declare class MeshReflectorMaterial extends MeshStandardMaterial {
|
|
|
50
48
|
set depthToBlurRatioBias(v: number);
|
|
51
49
|
get distortion(): number;
|
|
52
50
|
set distortion(v: number);
|
|
53
|
-
get
|
|
54
|
-
set
|
|
55
|
-
get contrast(): number;
|
|
56
|
-
set contrast(v: number);
|
|
57
|
-
get brightness(): number;
|
|
58
|
-
set brightness(v: number);
|
|
51
|
+
get mixContrast(): number;
|
|
52
|
+
set mixContrast(v: number);
|
|
59
53
|
}
|
|
60
54
|
export declare type MeshReflectorMaterialProps = {
|
|
61
55
|
mixBlur: number;
|
|
@@ -71,7 +65,5 @@ export declare type MeshReflectorMaterialProps = {
|
|
|
71
65
|
depthScale: number;
|
|
72
66
|
depthToBlurRatioBias: number;
|
|
73
67
|
distortion: number;
|
|
74
|
-
|
|
75
|
-
contrast: number;
|
|
76
|
-
brightness: number;
|
|
68
|
+
mixContrast: number;
|
|
77
69
|
} & JSX.IntrinsicElements['meshStandardMaterial'];
|
|
@@ -48,15 +48,9 @@ class MeshReflectorMaterial extends MeshStandardMaterial {
|
|
|
48
48
|
this._distortion = {
|
|
49
49
|
value: 1
|
|
50
50
|
};
|
|
51
|
-
this.
|
|
51
|
+
this._mixContrast = {
|
|
52
52
|
value: 1.0
|
|
53
53
|
};
|
|
54
|
-
this._contrast = {
|
|
55
|
-
value: 1.0
|
|
56
|
-
};
|
|
57
|
-
this._brightness = {
|
|
58
|
-
value: 0.0
|
|
59
|
-
};
|
|
60
54
|
this.setValues(parameters);
|
|
61
55
|
}
|
|
62
56
|
|
|
@@ -82,9 +76,7 @@ class MeshReflectorMaterial extends MeshStandardMaterial {
|
|
|
82
76
|
shader.uniforms.depthScale = this._depthScale;
|
|
83
77
|
shader.uniforms.depthToBlurRatioBias = this._depthToBlurRatioBias;
|
|
84
78
|
shader.uniforms.distortion = this._distortion;
|
|
85
|
-
shader.uniforms.
|
|
86
|
-
shader.uniforms.contrast = this._contrast;
|
|
87
|
-
shader.uniforms.brightness = this._brightness;
|
|
79
|
+
shader.uniforms.mixContrast = this._mixContrast;
|
|
88
80
|
shader.vertexShader = `
|
|
89
81
|
uniform mat4 textureMatrix;
|
|
90
82
|
varying vec4 my_vUv;
|
|
@@ -107,11 +99,7 @@ class MeshReflectorMaterial extends MeshStandardMaterial {
|
|
|
107
99
|
uniform float mixStrength;
|
|
108
100
|
uniform float minDepthThreshold;
|
|
109
101
|
uniform float maxDepthThreshold;
|
|
110
|
-
|
|
111
|
-
uniform float gamma;
|
|
112
|
-
uniform float contrast;
|
|
113
|
-
uniform float brightness;
|
|
114
|
-
|
|
102
|
+
uniform float mixContrast;
|
|
115
103
|
uniform float depthScale;
|
|
116
104
|
uniform float depthToBlurRatioBias;
|
|
117
105
|
varying vec4 my_vUv;
|
|
@@ -174,9 +162,9 @@ class MeshReflectorMaterial extends MeshStandardMaterial {
|
|
|
174
162
|
#endif
|
|
175
163
|
|
|
176
164
|
vec4 newMerge = vec4(0.0, 0.0, 0.0, 1.0);
|
|
177
|
-
newMerge.r = (
|
|
178
|
-
newMerge.g = (
|
|
179
|
-
newMerge.b = (
|
|
165
|
+
newMerge.r = (merge.r - 0.5) * mixContrast + 0.5;
|
|
166
|
+
newMerge.g = (merge.g - 0.5) * mixContrast + 0.5;
|
|
167
|
+
newMerge.b = (merge.b - 0.5) * mixContrast + 0.5;
|
|
180
168
|
|
|
181
169
|
diffuseColor.rgb = diffuseColor.rgb * ((1.0 - min(1.0, mirror)) + newMerge.rgb * mixStrength);
|
|
182
170
|
diffuseColor = sRGBToLinear(diffuseColor);
|
|
@@ -316,28 +304,12 @@ class MeshReflectorMaterial extends MeshStandardMaterial {
|
|
|
316
304
|
this._distortion.value = v;
|
|
317
305
|
}
|
|
318
306
|
|
|
319
|
-
get
|
|
320
|
-
return this.
|
|
321
|
-
}
|
|
322
|
-
|
|
323
|
-
set gamma(v) {
|
|
324
|
-
this._gamma.value = v;
|
|
325
|
-
}
|
|
326
|
-
|
|
327
|
-
get contrast() {
|
|
328
|
-
return this._contrast.value;
|
|
329
|
-
}
|
|
330
|
-
|
|
331
|
-
set contrast(v) {
|
|
332
|
-
this._contrast.value = v;
|
|
333
|
-
}
|
|
334
|
-
|
|
335
|
-
get brightness() {
|
|
336
|
-
return this._brightness.value;
|
|
307
|
+
get mixContrast() {
|
|
308
|
+
return this._mixContrast.value;
|
|
337
309
|
}
|
|
338
310
|
|
|
339
|
-
set
|
|
340
|
-
this.
|
|
311
|
+
set mixContrast(v) {
|
|
312
|
+
this._mixContrast.value = v;
|
|
341
313
|
}
|
|
342
314
|
|
|
343
315
|
}
|