three-base 2.0.9 → 2.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "three-base",
-    "version": "2.0.9",
+    "version": "2.0.10",
     "description": "three 3d three-base",
     "repository": {
         "type": "git",

package/pass/glow_pass.js

@@ -342,7 +342,8 @@ const blurShader = new RawShaderMaterial({
 const filterSelectShader = new RawShaderMaterial({
     uniforms: {
         selectTexture: { value: null },
-        blurTexture: { value: null }
+        blurTexture: { value: null },
+        opacity: { value: 1 },
     },
     vertexShader: `
 		attribute vec3 position;
@@ -359,11 +360,13 @@ const filterSelectShader = new RawShaderMaterial({
 		#endif
 		uniform sampler2D selectTexture;
 		uniform sampler2D blurTexture;
+		uniform float opacity;
 		varying vec2 vUv;
 
 		void main() {
 			gl_FragColor = texture2D(blurTexture, vUv);
 			gl_FragColor.a -= (texture2D(selectTexture, vUv).a);
+			gl_FragColor.a *= opacity;
 		}
 	`,
     blending: NoBlending,
@@ -375,7 +378,7 @@ const filterSelectShader = new RawShaderMaterial({
 const scene = new Scene();
 // 对象发光
 export default function glow_pass(renderer, camera, object3d) {
-    const { glow_enable = false, glow_color = "#04fa12", glow_width = 1 } = object3d.userData;
+    const { glow_enable = false, glow_color = "#04fa12", glow_width = 1, glow_opacity = 1 } = object3d.userData;
     if (!glow_enable || glow_width === 0) {
         return;
     }
@@ -399,13 +402,11 @@ export default function glow_pass(renderer, camera, object3d) {
     blurShader.uniforms.width.value = glow_width / 10;
     //一次描边
     renderer.setRenderTarget(blur1TextureTarget);
-    blurShader.uniforms.width.value = 1;
     blurShader.uniforms.tDiffuse.value = selectTextureTarget.texture;
     blurShader.uniforms.opacity.value = 1.0;
     fsQuad.render(renderer, blurShader);
     //二次描边
     renderer.setRenderTarget(blur2TextureTarget);
-    blurShader.uniforms.width.value = glow_width / 10;
     blurShader.uniforms.tDiffuse.value = blur1TextureTarget.texture;
     blurShader.uniforms.opacity.value = 0.9;
     fsQuad.render(renderer, blurShader);
@@ -457,6 +458,7 @@ export default function glow_pass(renderer, camera, object3d) {
     renderer.setRenderTarget(originRenderTarget);
     filterSelectShader.uniforms.selectTexture.value = selectTextureTarget.texture;
     filterSelectShader.uniforms.blurTexture.value = blur1TextureTarget.texture;
+    filterSelectShader.uniforms.opacity.value = glow_opacity;
     filterSelectShader.blending = NormalBlending; // 与有的纹理融合计算 保留前面通道传递下来的纹理
     fsQuad.render(renderer, filterSelectShader);
     // 调试代码

package/pass/glow_pass.ts

@@ -351,7 +351,8 @@ const blurShader = new RawShaderMaterial({
 const filterSelectShader = new RawShaderMaterial({
     uniforms: {
         selectTexture: { value: null },
-        blurTexture: { value: null }
+        blurTexture: { value: null },
+        opacity: { value: 1 },
     },
     vertexShader: `
 		attribute vec3 position;
@@ -368,11 +369,13 @@ const filterSelectShader = new RawShaderMaterial({
 		#endif
 		uniform sampler2D selectTexture;
 		uniform sampler2D blurTexture;
+		uniform float opacity;
 		varying vec2 vUv;
 
 		void main() {
 			gl_FragColor = texture2D(blurTexture, vUv);
 			gl_FragColor.a -= (texture2D(selectTexture, vUv).a);
+			gl_FragColor.a *= opacity;
 		}
 	`,
     blending: NoBlending, // 渲染时不与背景融合计算 直接替换
@@ -387,7 +390,7 @@ const scene = new Scene();
 // 对象发光
 export default function glow_pass(renderer: WebGLRenderer, camera: Camera, object3d: Object3D) {
 
-    const { glow_enable = false, glow_color = "#04fa12", glow_width = 1 } = object3d.userData;
+    const { glow_enable = false, glow_color = "#04fa12", glow_width = 1, glow_opacity = 1 } = object3d.userData;
 
     if (!glow_enable || glow_width === 0) {
         return;
@@ -414,39 +417,37 @@ export default function glow_pass(renderer: WebGLRenderer, camera: Camera, objec
     //描边颜色
     blurShader.uniforms.color.value.set(glow_color);
     blurShader.uniforms.width.value = glow_width / 10;
-    
+
     //一次描边
     renderer.setRenderTarget(blur1TextureTarget);
-    blurShader.uniforms.width.value = 1;
     blurShader.uniforms.tDiffuse.value = selectTextureTarget.texture;
     blurShader.uniforms.opacity.value = 1.0;
     fsQuad.render(renderer, blurShader);
-    
+
     //二次描边
     renderer.setRenderTarget(blur2TextureTarget);
-    blurShader.uniforms.width.value = glow_width / 10;
     blurShader.uniforms.tDiffuse.value = blur1TextureTarget.texture;
     blurShader.uniforms.opacity.value = 0.9;
     fsQuad.render(renderer, blurShader);
-    
+
     //三次描边
     renderer.setRenderTarget(blur1TextureTarget);
     blurShader.uniforms.tDiffuse.value = blur2TextureTarget.texture;
     blurShader.uniforms.opacity.value = 0.8;
     fsQuad.render(renderer, blurShader);
-    
+
     //四次描边
     renderer.setRenderTarget(blur2TextureTarget);
     blurShader.uniforms.tDiffuse.value = blur1TextureTarget.texture;
     blurShader.uniforms.opacity.value = 0.7;
     fsQuad.render(renderer, blurShader);
-    
+
     //五次描边
     renderer.setRenderTarget(blur1TextureTarget);
     blurShader.uniforms.tDiffuse.value = blur2TextureTarget.texture;
     blurShader.uniforms.opacity.value = 0.6;
     fsQuad.render(renderer, blurShader);
-    
+
     //六次描边
     renderer.setRenderTarget(blur2TextureTarget);
     blurShader.uniforms.tDiffuse.value = blur1TextureTarget.texture;
@@ -486,6 +487,7 @@ export default function glow_pass(renderer: WebGLRenderer, camera: Camera, objec
     renderer.setRenderTarget(originRenderTarget);
     filterSelectShader.uniforms.selectTexture.value = selectTextureTarget.texture;
     filterSelectShader.uniforms.blurTexture.value = blur1TextureTarget.texture;
+    filterSelectShader.uniforms.opacity.value = glow_opacity;
     filterSelectShader.blending = NormalBlending; // 与有的纹理融合计算 保留前面通道传递下来的纹理
     fsQuad.render(renderer, filterSelectShader);