three-base 1.129.12 → 1.129.15

package/lib/Text3D/Text3D.js

@@ -2,7 +2,7 @@
  * @Author: xiaosihan
  * @Date: 2022-06-14 09:48:00
  * @Last Modified by: xiaosihan
- * @Last Modified time: 2023-04-04 19:26:36
+ * @Last Modified time: 2023-04-07 21:52:03
  */
 import { Mesh, MeshStandardMaterial, TextGeometry } from "three";
 import fontContorller from "./fontController";
@@ -53,6 +53,7 @@ export default class Text3D extends Mesh {
                         bevelSegments: this._config.bevelSegments, //斜角分段
                     });
                     this.geometry.center();
+                    this.dispatchEvent({ type: "loaded" });
                 }
             });
         }

package/lib/Text3D/Text3D.ts

@@ -2,7 +2,7 @@
  * @Author: xiaosihan
  * @Date: 2022-06-14 09:48:00
  * @Last Modified by: xiaosihan
- * @Last Modified time: 2023-04-04 19:26:36
+ * @Last Modified time: 2023-04-07 21:52:03
  */
 
 import { Mesh, MeshStandardMaterial, TextGeometry } from "three";
@@ -80,6 +80,7 @@ export default class Text3D extends Mesh {
                         bevelSegments: this._config.bevelSegments,//斜角分段
                     });
                     this.geometry.center();
+                    this.dispatchEvent({ type: "loaded" });
                 }
             })
 

package/lib/Text3D/fontController.ts

@@ -6,7 +6,7 @@
  */
 
 import Dexie, { Table } from "dexie";
-import _, { filter, first, isEmpty } from "lodash";
+import { filter, first, isEmpty } from "lodash";
 import { Font } from "three";
 import threeUtils from "../threeUtils";
 import gentilisJSON from "./gentilis.json";

package/lib/ThreeBase.d.ts

@@ -1,4 +1,4 @@
-import { BufferGeometry, EventDispatcher, Object3D, PerspectiveCamera, Scene, Texture, Vector2, Vector3, WebGLRenderer, WebGLRenderTarget } from "three";
+import { BufferGeometry, Camera, EventDispatcher, Object3D, Scene, Texture, Vector2, Vector3, WebGLRenderer, WebGLRenderTarget } from "three";
 import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js";
 import ThreeMouse from "./ThreeMouse";
 import Transition from "./Transition";
@@ -10,13 +10,13 @@ export default class ThreeBase extends EventDispatcher {
     tempVector3: Vector3;
     size: Vector2;
     renderer: WebGLRenderer;
-    camera: PerspectiveCamera;
+    camera: Camera;
     scene: Scene;
     threeMouse: ThreeMouse;
     controls: OrbitControls;
     isRendererContextLost: boolean;
     setContainer(div: HTMLDivElement | null): Promise<void>;
-    resize(width: number, height: number): void;
+    setsize(width: number, height: number): void;
     controlsPosition: Transition;
     controlsCenter: Transition;
     init(): void;
@@ -42,7 +42,7 @@ export default class ThreeBase extends EventDispatcher {
     needRender: boolean;
     stopRender(): void;
     render(): void;
-    renderBindThis: any;
+    private renderBindThis;
     download(fileName?: string): void;
     private _preMesh;
     private _preRT;

package/lib/ThreeBase.js

@@ -2,9 +2,8 @@
  * @Author: xiaosihan
  * @Date: 2021-12-20 13:38:22
  * @Last Modified by: xiaosihan
- * @Last Modified time: 2023-03-30 11:00:20
+ * @Last Modified time: 2023-05-09 01:11:17
  */
-import elementResizeEvent from "element-resize-event";
 import { round } from "lodash";
 import { AxesHelper, EventDispatcher, GridHelper, LinearFilter, Mesh, MOUSE, NoBlending, NormalBlending, PerspectiveCamera, RGBAFormat, Scene, TOUCH, Vector2, Vector3, WebGLRenderer, WebGLRenderTarget } from "three";
 import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js";
@@ -14,6 +13,7 @@ import threeLoader from "./threeLoader";
 import ThreeMouse from "./ThreeMouse";
 import threeUtils from "./threeUtils";
 import Transition from "./Transition";
+import stroke_pass from "./stroke_pass/stroke_pass";
 // three.js 的基础对象
 export default class ThreeBase extends EventDispatcher {
     constructor() {
@@ -71,15 +71,9 @@ export default class ThreeBase extends EventDispatcher {
     // 设置 dom 容器
     async setContainer(div) {
         if (div) {
-            //删除这个容器里面的所有canvas
-            const canvas = div.getElementsByTagName("canvas");
-            for (let c of canvas)
-                c.remove();
+            div.style.overflow = "hidden";
+            div.innerHTML = "";
             div.append(this.renderer.domElement);
-            // 监听容器的尺寸的改变
-            elementResizeEvent(div, () => {
-                this.resize(div.clientWidth, div.clientHeight);
-            });
             // 如果上下文被销毁了,  就恢复上下文
             if (this.isRendererContextLost) {
                 //@ts-ignore
@@ -88,16 +82,18 @@ export default class ThreeBase extends EventDispatcher {
                 await new Promise(resolve => requestAnimationFrame(resolve));
                 this.renderer.domElement.style.opacity = "1";
             }
-            this.resize(div.clientWidth, div.clientHeight);
+            this.setsize(div.clientWidth, div.clientHeight);
             // 开启时时渲染
             threeUtils.removeEventListener("requestAnimationFrame", this.renderBindThis);
             threeUtils.addEventListener("requestAnimationFrame", this.renderBindThis);
         }
     }
     // 修改尺寸
-    resize(width, height) {
-        this.camera.aspect = width / height;
-        this.camera.updateProjectionMatrix();
+    setsize(width, height) {
+        if (this.camera instanceof PerspectiveCamera) {
+            this.camera.aspect = width / height;
+            this.camera.updateProjectionMatrix();
+        }
         this.renderer.setPixelRatio(window.devicePixelRatio);
         this.renderer.setSize(width, height);
         this.size.set(width, height);
@@ -228,7 +224,7 @@ export default class ThreeBase extends EventDispatcher {
         this.renderer.forceContextLoss();
         // 标记上下文被销毁了
         this.isRendererContextLost = true;
-        this.resize(100, 100);
+        this.setsize(100, 100);
         this.renderer.domElement.style.opacity = "0";
     }
     // 渲染场景
@@ -240,6 +236,11 @@ export default class ThreeBase extends EventDispatcher {
             this.stopRender();
             return;
         }
+        //判断尺寸发生改变时重置尺寸
+        const parentNode = this.renderer.domElement.parentNode;
+        if (parentNode.clientWidth !== this.size.x || parentNode.clientHeight !== this.size.y) {
+            this.setsize(parentNode.clientWidth, parentNode.clientHeight);
+        }
         // 分发鼠标事件
         this.threeMouse.dispatchEvent();
         // 在不自动渲染时, needRender=false 就跳过渲染
@@ -254,6 +255,12 @@ export default class ThreeBase extends EventDispatcher {
         // 渲染场景
         this.dispatchEvent({ type: "beforeRender" });
         this.renderer.render(this.scene, this.camera);
+        // 查找需要绘制描边的对象,并且绘制描边
+        this.scene.traverse(obj => {
+            if (obj.userData.stroke_enable) {
+                stroke_pass(this.renderer, this.camera, obj);
+            }
+        });
         this.dispatchEvent({ type: "afterRender" });
     }
     renderBindThis = this.render.bind(this);

package/lib/ThreeBase.ts

@@ -2,12 +2,11 @@
  * @Author: xiaosihan 
  * @Date: 2021-12-20 13:38:22 
  * @Last Modified by: xiaosihan
- * @Last Modified time: 2023-03-30 11:00:20
+ * @Last Modified time: 2023-05-09 01:11:17
  */
 
-import elementResizeEvent from "element-resize-event";
 import { round } from "lodash";
-import { AxesHelper, BufferGeometry, EventDispatcher, GridHelper, LinearFilter, Mesh, MeshBasicMaterial, MOUSE, NoBlending, NormalBlending, Object3D, PerspectiveCamera, RGBAFormat, Scene, Texture, TOUCH, Vector2, Vector3, WebGLRenderer, WebGLRenderTarget } from "three";
+import { AxesHelper, BufferGeometry, Camera, EventDispatcher, GridHelper, LinearFilter, Mesh, MeshBasicMaterial, MOUSE, NoBlending, NormalBlending, Object3D, PerspectiveCamera, RGBAFormat, Scene, Texture, TOUCH, Vector2, Vector3, WebGLRenderer, WebGLRenderTarget } from "three";
 import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js";
 import { generateUUID } from "three/src/math/MathUtils";
 import { clearShader, coptyShader, fullScreenMesh, gaussBlurShader, strokeShader } from "./shaders";
@@ -15,6 +14,7 @@ import threeLoader from "./threeLoader";
 import ThreeMouse from "./ThreeMouse";
 import threeUtils from "./threeUtils";
 import Transition from "./Transition";
+import stroke_pass from "./stroke_pass/stroke_pass";
 
 // three.js 的基础对象
 export default class ThreeBase extends EventDispatcher {
@@ -59,7 +59,7 @@ export default class ThreeBase extends EventDispatcher {
     })();
 
     //透视相机
-    camera = new PerspectiveCamera(45, 1, 0.0001, 10000);
+    camera: Camera = new PerspectiveCamera(45, 1, 0.0001, 10000);
 
     // 场景对象
     scene = new Scene();
@@ -87,16 +87,10 @@ export default class ThreeBase extends EventDispatcher {
     // 设置 dom 容器
     async setContainer(div: HTMLDivElement | null) {
         if (div) {
-            //删除这个容器里面的所有canvas
-            const canvas = div.getElementsByTagName("canvas");
-            for (let c of canvas) c.remove();
+            div.style.overflow = "hidden";
+            div.innerHTML = "";
             div.append(this.renderer.domElement);
 
-            // 监听容器的尺寸的改变
-            elementResizeEvent(div, () => {
-                this.resize(div.clientWidth, div.clientHeight);
-            });
-
             // 如果上下文被销毁了,  就恢复上下文
             if (this.isRendererContextLost) {
                 //@ts-ignore
@@ -106,7 +100,7 @@ export default class ThreeBase extends EventDispatcher {
                 this.renderer.domElement.style.opacity = "1";
             }
 
-            this.resize(div.clientWidth, div.clientHeight);
+            this.setsize(div.clientWidth, div.clientHeight);
 
             // 开启时时渲染
             threeUtils.removeEventListener("requestAnimationFrame", this.renderBindThis);
@@ -115,9 +109,12 @@ export default class ThreeBase extends EventDispatcher {
     }
 
     // 修改尺寸
-    resize(width: number, height: number) {
-        this.camera.aspect = width / height;
-        this.camera.updateProjectionMatrix();
+    setsize(width: number, height: number) {
+        if (this.camera instanceof PerspectiveCamera) {
+            this.camera.aspect = width / height;
+            this.camera.updateProjectionMatrix();
+        }
+
         this.renderer.setPixelRatio(window.devicePixelRatio);
         this.renderer.setSize(width, height);
         this.size.set(width, height);
@@ -271,7 +268,7 @@ export default class ThreeBase extends EventDispatcher {
         this.renderer.forceContextLoss();
         // 标记上下文被销毁了
         this.isRendererContextLost = true;
-        this.resize(100, 100);
+        this.setsize(100, 100);
         this.renderer.domElement.style.opacity = "0";
     }
 
@@ -287,6 +284,12 @@ export default class ThreeBase extends EventDispatcher {
             return;
         }
 
+        //判断尺寸发生改变时重置尺寸
+        const parentNode = this.renderer.domElement.parentNode as HTMLDivElement;
+        if (parentNode.clientWidth !== this.size.x || parentNode.clientHeight !== this.size.y) {
+            this.setsize(parentNode.clientWidth, parentNode.clientHeight);
+        }
+
         // 分发鼠标事件
         this.threeMouse.dispatchEvent();
 
@@ -305,10 +308,18 @@ export default class ThreeBase extends EventDispatcher {
         // 渲染场景
         this.dispatchEvent({ type: "beforeRender" });
         this.renderer.render(this.scene, this.camera);
+
+        // 查找需要绘制描边的对象,并且绘制描边
+        this.scene.traverse(obj => {
+            if (obj.userData.stroke_enable) {
+                stroke_pass(this.renderer, this.camera, obj);
+            }
+        });
+
         this.dispatchEvent({ type: "afterRender" });
     }
 
-    renderBindThis = this.render.bind(this);
+    private renderBindThis = this.render.bind(this);
 
     // 下载渲染图
     download(fileName: string = "download") {

package/lib/Transition.d.ts

@@ -23,9 +23,7 @@ export default class Transition {
     _: {
         [key: string]: number;
     };
-    onChangeCall?: (josn: {
-        [key: string]: number;
-    }) => void;
+    private onChangeCall;
     run({ timeTemp }: any): this;
     runbindThis: any;
     onChange(onChangeCall: (josn: {

package/lib/Transition.js

@@ -23,7 +23,7 @@ export default class Transition {
     constructor(param = {}, bezier = [0.8, 0, 0.2, 1], duration = 500) {
         this.setDuration(duration);
         this.setBezier(bezier);
-        this.set(param);
+        this.reset(param);
     }
     // 所有的 key 的枚举
     _keys = [];
@@ -57,7 +57,7 @@ export default class Transition {
     }
     // 存储 每个参数的 起始位置 起始时间 终止位置  终止时间
     _ = {};
-    onChangeCall;
+    onChangeCall = (josn) => { };
     // 执行过度动画
     run({ timeTemp }) {
         this.timeTemp = timeTemp;
@@ -73,7 +73,7 @@ export default class Transition {
     // 设置动画对象的回调事件
     onChange(onChangeCall) {
         this.onChangeCall = onChangeCall;
-        threeUtils.addEventListener("requestAnimationFrame", this.runbindThis);
+        this.onChangeCall(this.getJson());
         return this;
     }
     // 计算当前 key 的值
@@ -133,9 +133,9 @@ export default class Transition {
             // // 执行状态未完成
             // this._isDone = false;
         }
-        threeUtils.removeEventListener("requestAnimationFrame", this.runbindThis);
-        threeUtils.addEventListener("requestAnimationFrame", this.runbindThis);
         if (!this._isDone) {
+            threeUtils.removeEventListener("requestAnimationFrame", this.runbindThis);
+            threeUtils.addEventListener("requestAnimationFrame", this.runbindThis);
             await new Promise(resolve => setTimeout(resolve, this._duration + 50));
         }
         return this;
@@ -143,6 +143,9 @@ export default class Transition {
     // 重置起始和终止位置
     reset(param) {
         for (let key in param) {
+            if (!this._keys.includes(key)) {
+                this._keys.push(key);
+            }
             this._[key + "_start"] = param[key];
             this._[key + "_end"] = param[key];
             this._[key + "_startTime"] = -this._duration;

package/lib/Transition.ts

@@ -36,7 +36,7 @@ export default class Transition {
 
         this.setBezier(bezier);
 
-        this.set(param);
+        this.reset(param);
     }
 
     // 所有的 key 的枚举
@@ -82,7 +82,7 @@ export default class Transition {
     // 存储 每个参数的 起始位置 起始时间 终止位置  终止时间
     _: { [key: string]: number } = {};
 
-    onChangeCall?: (josn: { [key: string]: number }) => void;
+    private onChangeCall = (josn: { [key: string]: number }) => { };
 
     // 执行过度动画
     run({ timeTemp }: any) {
@@ -100,7 +100,7 @@ export default class Transition {
     // 设置动画对象的回调事件
     onChange(onChangeCall: (josn: { [key: string]: number }) => void): this {
         this.onChangeCall = onChangeCall;
-        threeUtils.addEventListener("requestAnimationFrame", this.runbindThis);
+        this.onChangeCall(this.getJson());
         return this;
     }
 
@@ -185,10 +185,9 @@ export default class Transition {
 
         }
 
-        threeUtils.removeEventListener("requestAnimationFrame", this.runbindThis);
-        threeUtils.addEventListener("requestAnimationFrame", this.runbindThis);
-
         if (!this._isDone) {
+            threeUtils.removeEventListener("requestAnimationFrame", this.runbindThis);
+            threeUtils.addEventListener("requestAnimationFrame", this.runbindThis);
             await new Promise(resolve => setTimeout(resolve, this._duration + 50));
         }
 
@@ -198,6 +197,11 @@ export default class Transition {
     reset(param: TParam): this {
 
         for (let key in param) {
+
+            if (!this._keys.includes(key)) {
+                this._keys.push(key);
+            }
+
             this._[key + "_start"] = param[key];
             this._[key + "_end"] = param[key];
             this._[key + "_startTime"] = -this._duration;

package/lib/planeModal1/PlaneModal1.d.ts

@@ -11,7 +11,6 @@ export type PlaneModal1Config = {
 };
 export default class PlaneModal1 extends Mesh {
     constructor(config?: PlaneModal1Config);
-    renderOrder: number;
     geometry: PlaneGeometry;
     material: MeshBasicMaterial;
     static img: HTMLImageElement;

package/lib/planeModal1/PlaneModal1.js

@@ -14,7 +14,6 @@ export default class PlaneModal1 extends Mesh {
         this.material.map = this.texture;
         this.scale.set(10, 10, 10);
     }
-    renderOrder = 99;
     geometry = new PlaneGeometry(1 * 0.65, 0.728 * 0.65, 1, 1);
     material = new MeshBasicMaterial({
         side: DoubleSide,
@@ -100,5 +99,6 @@ export default class PlaneModal1 extends Mesh {
             textPos.y += size;
         });
         this.texture.needsUpdate = true;
+        this.dispatchEvent({ type: "loaded" });
     }
 }

package/lib/planeModal1/PlaneModal1.ts

@@ -30,8 +30,6 @@ export default class PlaneModal1 extends Mesh {
         this.scale.set(10, 10, 10);
     }
 
-    renderOrder = 99;
-
     geometry = new PlaneGeometry(1 * 0.65, 0.728 * 0.65, 1, 1);
 
     material = new MeshBasicMaterial({
@@ -145,6 +143,7 @@ export default class PlaneModal1 extends Mesh {
 
         this.texture.needsUpdate = true;
 
+        this.dispatchEvent({ type: "loaded" });
     }
 
 

package/lib/spriteModal1/SpriteModal1.d.ts

@@ -11,7 +11,6 @@ export type SpritModal1Config = {
 };
 export default class SpritModal1 extends Sprite {
     constructor(config?: SpritModal1Config);
-    renderOrder: number;
     static img: HTMLImageElement;
     canvas: HTMLCanvasElement;
     context: CanvasRenderingContext2D;

package/lib/spriteModal1/SpriteModal1.js

@@ -15,7 +15,6 @@ export default class SpritModal1 extends Sprite {
         this.material.transparent = true;
         this.material.alphaTest = 0.01;
     }
-    renderOrder = 99;
     // 背景图
     static img = (() => {
         const img = new Image();
@@ -96,6 +95,7 @@ export default class SpritModal1 extends Sprite {
             textPos.y += size;
         });
         this.texture.needsUpdate = true;
+        this.dispatchEvent({ type: "loaded" });
     }
     //鼠标拾取计算
     raycast(raycaster, intersects) {

package/lib/spriteModal1/SpriteModal1.ts

@@ -34,8 +34,6 @@ export default class SpritModal1 extends Sprite {
         this.material.alphaTest = 0.01;
     }
 
-    renderOrder = 99;
-
     // 背景图
     static img = (() => {
         const img = new Image();
@@ -142,6 +140,7 @@ export default class SpritModal1 extends Sprite {
 
         this.texture.needsUpdate = true;
 
+        this.dispatchEvent({ type: "loaded" });
     }
 
     //鼠标拾取计算

package/lib/stroke_pass/FullScreenQuad.d.ts

@@ -0,0 +1,7 @@
+import { BufferGeometry, Material, Mesh, OrthographicCamera, Scene, WebGLRenderer } from "three";
+export default class FullScreenQuad extends Scene {
+    constructor();
+    mesh: Mesh<BufferGeometry, Material>;
+    orthographicCamera: OrthographicCamera;
+    render(renderer: WebGLRenderer, material: Material): void;
+}

package/lib/stroke_pass/FullScreenQuad.js

@@ -0,0 +1,25 @@
+/*
+ * @Author: xiaosihan
+ * @Date: 2023-05-09 01:36:35
+ * @Last Modified by: xiaosihan
+ * @Last Modified time: 2023-05-09 01:47:07
+ */
+import { BufferGeometry, Float32BufferAttribute, Mesh, MeshBasicMaterial, OrthographicCamera, Scene } from "three";
+export default class FullScreenQuad extends Scene {
+    constructor() {
+        super();
+    }
+    mesh = (() => {
+        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));
+        const mesh = new Mesh(geometry, new MeshBasicMaterial());
+        this.add(mesh);
+        return mesh;
+    })();
+    orthographicCamera = new OrthographicCamera(-1, 1, 1, -1, 0, 1);
+    render(renderer, material) {
+        this.mesh.material = material;
+        renderer.render(this, this.orthographicCamera);
+    }
+}

package/lib/stroke_pass/FullScreenQuad.ts

@@ -0,0 +1,33 @@
+/*
+ * @Author: xiaosihan 
+ * @Date: 2023-05-09 01:36:35 
+ * @Last Modified by: xiaosihan
+ * @Last Modified time: 2023-05-09 01:47:07
+ */
+
+
+import { BufferGeometry, Float32BufferAttribute, Material, Mesh, MeshBasicMaterial, OrthographicCamera, Scene, WebGLRenderer } from "three";
+
+
+export default class FullScreenQuad extends Scene {
+    constructor() {
+        super();
+    }
+
+    mesh = (() => {
+        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));
+        const mesh = new Mesh<BufferGeometry, Material>(geometry, new MeshBasicMaterial());
+        this.add(mesh);
+        return mesh;
+    })();
+
+    orthographicCamera = new OrthographicCamera(- 1, 1, 1, - 1, 0, 1);
+
+    render(renderer: WebGLRenderer, material: Material) {
+        this.mesh.material = material;
+        renderer.render(this, this.orthographicCamera);
+    }
+
+}

package/lib/stroke_pass/stroke_pass.d.ts

@@ -0,0 +1,2 @@
+import { Camera, Object3D, WebGLRenderer } from "three";
+export default function stroke_pass(renderer: WebGLRenderer, camera: Camera, object3d: Object3D): void;