three-base 2.0.85 → 2.0.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-base",
-  "version": "2.0.85",
+  "version": "2.0.87",
   "description": "three 3d three-base",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/threeLoader.d.ts

@@ -7,6 +7,7 @@ import { STLLoader } from "three/examples/jsm/loaders/STLLoader";
 import { USDZLoader } from "three/examples/jsm/loaders/USDZLoader";
 declare class ThreeLoader extends EventDispatcher {
     constructor();
+    uuid: string;
     anisotropy: number;
     setAnisotropy(v: number): void;
     textureMap: Map<string, Texture>;

package/threeLoader.js

@@ -2,7 +2,7 @@
  * @Author: xiaosihan
  * @Date: 2022-04-07 16:42:26
  * @Last Modified by: xiaosihan
- * @Last Modified time: 2023-02-07 11:11:48
+ * @Last Modified time: 2024-09-11 11:43:31
  */
 import { CanvasTexture, DefaultLoadingManager, EventDispatcher, Mesh, MeshStandardMaterial, RepeatWrapping, TextureLoader, VideoTexture, } from "three";
 import { DRACOLoader } from "three/examples/jsm/loaders/DRACOLoader";
@@ -24,6 +24,7 @@ import dracoDecoderJS from "./lib/draco/draco_decoder.js?url";
 import axios from "axios";
 import dracoDecoderWASM from "./lib/draco/draco_decoder.wasm?url";
 import threeUtils from "./threeUtils";
+import { generateUUID } from "three/src/math/MathUtils";
 // 加载器
 class ThreeLoader extends EventDispatcher {
     constructor() {
@@ -57,6 +58,7 @@ class ThreeLoader extends EventDispatcher {
             return new_url;
         });
     }
+    uuid = generateUUID();
     // 各向异性
     anisotropy = 16;
     // 设置各向异性 由渲染器来调用并设置
@@ -317,6 +319,29 @@ class ThreeLoader extends EventDispatcher {
                     .catch((err) => {
                     console.log(`${url},加载失败`, err);
                 });
+            case "obj":
+                const objObject3d = await this.objLoader.loadAsync(url);
+                objObject3d.traverse((obj) => {
+                    const mesh = obj;
+                    if (mesh.isMesh) {
+                        // 如果obj没有材质就给默认的材质
+                        if (!this.objLoader.materials) {
+                            mesh.material = new MeshStandardMaterial({
+                                metalness: 0.5,
+                                roughness: 0.5,
+                            });
+                        }
+                        const uv = mesh.geometry.getAttribute("uv");
+                        if (uv) {
+                            for (let i = 0; i < uv.count; i++) {
+                                uv.setY(i, 1 - uv.getY(i));
+                            }
+                        }
+                        // obj只翻转uv不翻转贴图
+                        this.setFlipYIsFalse(mesh.material);
+                    }
+                });
+                return objObject3d;
             default:
                 if (suffix) {
                     console.log(`${suffix},不支持的格式`);

package/threeLoader.ts

@@ -2,7 +2,7 @@
  * @Author: xiaosihan
  * @Date: 2022-04-07 16:42:26
  * @Last Modified by: xiaosihan
- * @Last Modified time: 2023-02-07 11:11:48
+ * @Last Modified time: 2024-09-11 11:43:31
  */
 
 import {
@@ -38,6 +38,7 @@ import dracoDecoderJS from "./lib/draco/draco_decoder.js?url";
 import axios from "axios";
 import dracoDecoderWASM from "./lib/draco/draco_decoder.wasm?url";
 import threeUtils from "./threeUtils";
+import { generateUUID } from "three/src/math/MathUtils";
 
 // 加载器
 class ThreeLoader extends EventDispatcher {
@@ -83,6 +84,8 @@ class ThreeLoader extends EventDispatcher {
     });
   }
 
+  uuid =  generateUUID();
+
   // 各向异性
   anisotropy = 16;
 
@@ -399,6 +402,32 @@ class ThreeLoader extends EventDispatcher {
             console.log(`${url},加载失败`, err);
           });
 
+      case "obj":
+        const objObject3d = await this.objLoader.loadAsync(url);
+        objObject3d.traverse((obj) => {
+          const mesh = obj as Mesh;
+
+          if (mesh.isMesh) {
+            // 如果obj没有材质就给默认的材质
+            if (!this.objLoader.materials) {
+              mesh.material = new MeshStandardMaterial({
+                metalness: 0.5,
+                roughness: 0.5,
+              });
+            }
+
+            const uv = mesh.geometry.getAttribute("uv");
+            if (uv) {
+              for (let i = 0; i < uv.count; i++) {
+                uv.setY(i, 1 - uv.getY(i));
+              }
+            }
+            // obj只翻转uv不翻转贴图
+            this.setFlipYIsFalse(mesh.material);
+          }
+        });
+        return objObject3d;
+
       default:
         if (suffix) {
           console.log(`${suffix},不支持的格式`);