three-base 2.0.14 → 2.0.15

package/PlaneModal1/PlaneModal1.d.ts

@@ -1,4 +1,4 @@
-import { MeshBasicMaterial, Mesh, CanvasTexture, PlaneGeometry } from "three";
+import { Mesh, MeshBasicMaterial, PlaneGeometry } from "three";
 export type PlaneModal1Config = {
     size?: number;
     title?: string;
@@ -16,7 +16,7 @@ export default class PlaneModal1 extends Mesh {
     static img: HTMLImageElement;
     canvas: HTMLCanvasElement;
     context: CanvasRenderingContext2D;
-    texture: CanvasTexture | import("three").Texture;
+    texture: import("three").CanvasTexture | import("three").Texture;
     _config: {
         size: number;
         title: string;

package/PlaneModal1/PlaneModal1.js

@@ -4,9 +4,9 @@
  * @Last Modified by: xiaosihan
  * @Last Modified time: 2023-03-09 19:15:35
  */
-import { MeshBasicMaterial, Mesh, DoubleSide, Vector2, PlaneGeometry } from "three";
-import planeModalPNG from "./planeModal.png";
+import { DoubleSide, Mesh, MeshBasicMaterial, PlaneGeometry, Vector2 } from "three";
 import threeLoader from "../threeLoader";
+import planeModalPNG from "./planeModal.png";
 // 平面模型弹窗
 export default class PlaneModal1 extends Mesh {
     constructor(config = {}) {

package/PlaneModal1/PlaneModal1.ts

@@ -5,9 +5,9 @@
  * @Last Modified time: 2023-03-09 19:15:35
  */
 
-import { MeshBasicMaterial, Mesh, DoubleSide, CanvasTexture, Vector2, BufferGeometry, PlaneGeometry, SRGBColorSpace } from "three";
-import planeModalPNG from "./planeModal.png";
+import { DoubleSide, Mesh, MeshBasicMaterial, PlaneGeometry, Vector2 } from "three";
 import threeLoader from "../threeLoader";
+import planeModalPNG from "./planeModal.png";
 
 
 export type PlaneModal1Config = {

package/ThreeBase.js

@@ -5,7 +5,7 @@
  * @Last Modified time: 2023-05-23 23:54:13
  */
 import { round } from "lodash";
-import { AxesHelper, DepthFormat, DepthTexture, EventDispatcher, GridHelper, LinearFilter, Mesh, MOUSE, NoBlending, NormalBlending, PerspectiveCamera, RGBAFormat, Scene, SRGBColorSpace, sRGBEncoding, TOUCH, UnsignedShortType, Vector2, Vector3, WebGLRenderer, WebGLRenderTarget } from "three";
+import { AxesHelper, DepthFormat, DepthTexture, EventDispatcher, GridHelper, LinearFilter, Mesh, MOUSE, NoBlending, NormalBlending, PerspectiveCamera, RGBAFormat, Scene, SRGBColorSpace, TOUCH, UnsignedShortType, 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";
@@ -29,6 +29,7 @@ export default class ThreeBase extends EventDispatcher {
         baseDepthTexture.anisotropy = 16;
         return baseDepthTexture;
     })();
+    // TODO 渲染目标的颜色空间问题 还没有处理好
     // 基础纹理渲染对象
     baseRenderTarget = new WebGLRenderTarget(128, 128, {
         minFilter: LinearFilter,
@@ -42,7 +43,7 @@ export default class ThreeBase extends EventDispatcher {
         // | typeof SRGBColorSpace
         // | typeof LinearSRGBColorSpace
         // | typeof DisplayP3ColorSpace;
-        encoding: sRGBEncoding
+        // encoding: sRGBEncoding
         // LinearEncoding | typeof sRGBEncoding;
     });
     // 公用渲染目标1
@@ -294,7 +295,8 @@ export default class ThreeBase extends EventDispatcher {
         this.renderer.render(this.scene, this.camera);
         this.renderer.setRenderTarget(null);
         this.renderer.clear();
-        this.renderer.render(this.scene, this.camera);
+        this.renderRendererTarget(this.baseRenderTarget);
+        // this.renderer.render(this.scene, this.camera);
         // 查找需要绘制描边的对象,并且绘制描边
         this.scene.traverse(obj => {
             stroke_pass(this.renderer, this.camera, obj, this.baseDepthTexture);

package/ThreeBase.ts

@@ -34,6 +34,7 @@ export default class ThreeBase extends EventDispatcher {
         return baseDepthTexture;
     })();
 
+    // TODO 渲染目标的颜色空间问题 还没有处理好
     // 基础纹理渲染对象
     baseRenderTarget = new WebGLRenderTarget(128, 128, {
         minFilter: LinearFilter,
@@ -47,7 +48,7 @@ export default class ThreeBase extends EventDispatcher {
         // | typeof SRGBColorSpace
         // | typeof LinearSRGBColorSpace
         // | typeof DisplayP3ColorSpace;
-        encoding: sRGBEncoding
+        // encoding: sRGBEncoding
         // LinearEncoding | typeof sRGBEncoding;
     });
 
@@ -353,7 +354,8 @@ export default class ThreeBase extends EventDispatcher {
 
         this.renderer.setRenderTarget(null);
         this.renderer.clear();
-        this.renderer.render(this.scene, this.camera);
+        this.renderRendererTarget(this.baseRenderTarget);
+        // this.renderer.render(this.scene, this.camera);
 
         // 查找需要绘制描边的对象,并且绘制描边
         this.scene.traverse(obj => {

package/package.json

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

package/tsconfig.json

@@ -10,9 +10,6 @@
             "vite/client",
             "node"
         ],
-        "typeRoots": [
-            "./",
-        ],
         "sourceMap": false,
         "declaration": true,
         "declarationDir": "./",
@@ -28,7 +25,6 @@
         "isolatedModules": false,
         "noEmit": false,
         "noImplicitAny": false,
-        "locale": "zh-cn",
     },
     "include": [
         "./",