three-base 2.0.109 → 2.0.111

package/ThreeBase.js

@@ -55,7 +55,6 @@ export default class ThreeBase extends EventDispatcher {
             anisotropy: 16,
             colorSpace: SRGBColorSpace,
         });
-        baseRenderTarget.texture.colorSpace = SRGBColorSpace;
         return baseRenderTarget;
     })();
     // 公用渲染目标1
@@ -83,7 +82,7 @@ export default class ThreeBase extends EventDispatcher {
         const renderer = new WebGLRenderer({
             alpha: true,
             antialias: false,
-            precision: "lowp",
+            precision: "highp",
             logarithmicDepthBuffer: true,
             preserveDrawingBuffer: true,
             stencil: false, // 模版
@@ -567,8 +566,7 @@ export default class ThreeBase extends EventDispatcher {
     clearRendererTargte(rendererTarget) {
         const originTarget = this.renderer.getRenderTarget();
         this.renderer.setRenderTarget(rendererTarget);
-        fullScreenMesh.material = clearShader;
-        fullScreenMesh.render(this.renderer);
+        fullScreenMesh.render(this.renderer, clearShader);
         this.renderer.clearDepth();
         this.renderer.setRenderTarget(originTarget);
     }
@@ -580,11 +578,10 @@ export default class ThreeBase extends EventDispatcher {
             rendererTarget.setSize(this.tempVector2.x, this.tempVector2.y);
         }
         this.renderer.setRenderTarget(rendererTarget);
-        fullScreenMesh.material = copyShader;
         copyShader.uniforms.map.value = texture;
         copyShader.uniforms.opacity.value = opactity;
         copyShader.blending = alpha ? NoBlending : NormalBlending;
-        fullScreenMesh.render(this.renderer);
+        fullScreenMesh.render(this.renderer, copyShader);
         this.renderer.setRenderTarget(originTarget);
     }
     // 把对象绘制到渲染目标中
@@ -604,13 +601,12 @@ export default class ThreeBase extends EventDispatcher {
         this.renderer.setRenderTarget(this.renderTarget2);
         this.renderer.getSize(this.tempVector2);
         this.renderTarget2.setSize(this.tempVector2.x, this.tempVector2.y);
-        fullScreenMesh.material = strokeShader;
         strokeShader.uniforms.map.value = rendererTarget.texture;
         strokeShader.uniforms.resolution.value.set(this.tempVector2.x, this.tempVector2.y);
         strokeShader.uniforms.strokeWidth.value = strockWidth;
         strokeShader.uniforms.strokeColor.value.set(color);
         strokeShader.uniforms.opacity.value = opacity;
-        fullScreenMesh.render(this.renderer);
+        fullScreenMesh.render(this.renderer, strokeShader);
         this.copyTextureToRenderTarget(this.renderTarget2.texture, rendererTarget, true);
         this.renderer.setRenderTarget(originTarget);
     }
@@ -627,12 +623,11 @@ export default class ThreeBase extends EventDispatcher {
         this.renderer.setRenderTarget(this.renderTarget2);
         this.renderer.getSize(this.tempVector2);
         this.renderTarget2.setSize(this.tempVector2.x, this.tempVector2.y);
-        fullScreenMesh.material = gaussBlurShader;
         gaussBlurShader.uniforms.map.value = rendererTarget.texture;
         gaussBlurShader.uniforms.radius.value = radius;
         gaussBlurShader.uniforms.opacity.value = opacity;
         gaussBlurShader.uniforms.resolution.value.set(this.tempVector2.x, this.tempVector2.y);
-        fullScreenMesh.render(this.renderer);
+        fullScreenMesh.render(this.renderer, gaussBlurShader);
         this.copyTextureToRenderTarget(this.renderTarget2.texture, rendererTarget, true);
         this.renderer.setRenderTarget(originTarget);
     }
@@ -649,15 +644,13 @@ export default class ThreeBase extends EventDispatcher {
     renderRendererTarget(renderTarget) {
         baseTextureToRenderShader.uniforms.map.value = renderTarget.texture;
         baseTextureToRenderShader.uniforms.opacity.value = 1.0;
-        fullScreenMesh.material = baseTextureToRenderShader;
-        fullScreenMesh.render(this.renderer);
+        fullScreenMesh.render(this.renderer, baseTextureToRenderShader);
     }
     // 渲染纹理
     renderTexture(texture, alpha = false) {
         copyShader.uniforms.map.value = texture;
         copyShader.uniforms.opacity.value = 1.0;
-        fullScreenMesh.material = copyShader;
         copyShader.blending = alpha ? NoBlending : NormalBlending;
-        fullScreenMesh.render(this.renderer);
+        fullScreenMesh.render(this.renderer, copyShader);
     }
 }

package/ThreeMouse.js

@@ -7,6 +7,11 @@
 import * as THREE from "three";
 import { Raycaster } from "three";
 import { debounce } from "lodash";
+import { computeBoundsTree, disposeBoundsTree, acceleratedRaycast } from 'three-mesh-bvh';
+// Add the extension functions
+THREE.BufferGeometry.prototype.computeBoundsTree = computeBoundsTree;
+THREE.BufferGeometry.prototype.disposeBoundsTree = disposeBoundsTree;
+THREE.Mesh.prototype.raycast = acceleratedRaycast;
 /**
  *  three.js 专用的鼠标拾取模型对象
  */
@@ -98,6 +103,9 @@ export default class ThreeMouse {
         this._scene.traverseVisible(mesh => {
             // 判断对象是否有指定的事件
             if (this.hasCursor(mesh) || this.hasEvent(mesh, ["leftclick", "rightclick", "click", "dbclick", "mouseenter", "mouseleave", "mousemove", "mousedown", "mouseup"])) {
+                if (mesh.isMesh && !mesh.geometry.boundsTree) {
+                    mesh.geometry.computeBoundsTree();
+                }
                 meshs.push(mesh);
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-base",
-  "version": "2.0.109",
+  "version": "2.0.111",
   "description": "three 3d three-base",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -44,6 +44,7 @@
     "dexie": "^3",
     "vite": "*",
     "jszip": "^3.10.1",
-    "html2canvas": "^1.4.1"
+    "html2canvas": "^1.4.1",
+    "three-mesh-bvh": "^0.8.3"
   }
 }

package/shaders.d.ts

@@ -1,12 +1,5 @@
-import { Mesh, OrthographicCamera, ShaderMaterial, WebGLRenderer } from "three";
-declare class FullScreenQuad {
-    constructor();
-    _mesh: Mesh;
-    dispose(): void;
-    render(renderer: WebGLRenderer): void;
-    get material(): import("three").Material | import("three").Material[];
-    set material(value: import("three").Material | import("three").Material[]);
-}
+import { OrthographicCamera, ShaderMaterial } from "three";
+import FullScreenQuad from "./pass/FullScreenQuad";
 export declare const fullScreenMesh: FullScreenQuad;
 export declare const orthographicCamera: OrthographicCamera;
 export declare const clearShader: ShaderMaterial;
@@ -15,4 +8,3 @@ export declare const copyShader: ShaderMaterial;
 export declare const baseTextureToRenderShader: ShaderMaterial;
 export declare const strokeShader: ShaderMaterial;
 export declare const gaussBlurShader: ShaderMaterial;
-export {};

package/shaders.js

@@ -4,29 +4,8 @@
  * @Last Modified by: xiaosihan
  * @Last Modified time: 2022-04-02 18:28:38
  */
-import { BufferGeometry, Color, Float32BufferAttribute, Mesh, NoBlending, OrthographicCamera, ShaderChunk, ShaderMaterial, Vector2, } from "three";
-// https://github.com/mrdoob/three.js/pull/21358
-const _geometry = new BufferGeometry();
-_geometry.setAttribute("position", new Float32BufferAttribute([-1, 3, 0, -1, -1, 0, 3, -1, 0], 3));
-_geometry.setAttribute("uv", new Float32BufferAttribute([0, 2, 0, 0, 2, 0], 2));
-class FullScreenQuad {
-    constructor() {
-        this._mesh = new Mesh(_geometry);
-    }
-    _mesh;
-    dispose() {
-        this._mesh.geometry.dispose();
-    }
-    render(renderer) {
-        renderer.render(this._mesh, orthographicCamera);
-    }
-    get material() {
-        return this._mesh.material;
-    }
-    set material(value) {
-        this._mesh.material = value;
-    }
-}
+import { Color, NoBlending, OrthographicCamera, ShaderChunk, ShaderMaterial, Vector2 } from "three";
+import FullScreenQuad from "./pass/FullScreenQuad";
 // 常用着色器及工具
 // 全屏渲染模型
 export const fullScreenMesh = new FullScreenQuad();
@@ -89,7 +68,7 @@ export const intersectionShader = new ShaderMaterial({
 export const copyShader = new ShaderMaterial({
     uniforms: {
         map: { value: null },
-        opacity: { value: 1.0 } // 透明度
+        opacity: { value: 1.0 }, // 透明度
     },
     vertexShader: `
         ${ShaderChunk.common}
@@ -105,7 +84,6 @@ export const copyShader = new ShaderMaterial({
         ${ShaderChunk.logdepthbuf_pars_fragment}
         uniform sampler2D map;
         uniform float opacity;
-        uniform bool linear_to_srgb;
         varying vec2 vUv;
         void main() {
             vec4 diffuseColor = texture(map, vUv);
@@ -137,17 +115,9 @@ export const baseTextureToRenderShader = new ShaderMaterial({
     ${ShaderChunk.logdepthbuf_pars_fragment}
     uniform sampler2D map;
     uniform float opacity;
-    uniform bool linear_to_srgb;
     varying vec2 vUv;
-    float linearToSrgb(float v) {
-        return pow(v, 1.0 / 2.2);
-    }
     void main() {
-        vec4 diffuseColor = texture(map, vUv);
-        diffuseColor.r = linearToSrgb(diffuseColor.r);
-        diffuseColor.g = linearToSrgb(diffuseColor.g);
-        diffuseColor.b = linearToSrgb(diffuseColor.b);
-        gl_FragColor = diffuseColor * opacity;
+        gl_FragColor = sRGBTransferOETF(texture(map, vUv));
         ${ShaderChunk.logdepthbuf_fragment}
     }
 `,