three-base 1.0.22 → 1.0.24

package/lib/InstancedGroupMesh.ts

@@ -2,7 +2,7 @@
  * @Author: xiaosihan 
  * @Date: 2023-02-21 09:55:52 
  * @Last Modified by: xiaosihan
- * @Last Modified time: 2023-02-21 10:12:33
+ * @Last Modified time: 2023-02-26 14:42:21
  */
 
 import * as THREE from 'three'
@@ -26,22 +26,31 @@ export default class InstancedGroupMesh extends THREE.Mesh {
 
         const { meshCollect, instanceCollect } = this
 
+        group.updateMatrixWorld(true);
+
         // collect all mesh counts, in case there are more than one copy of the same mesh in this group
         group.traverse((obj) => {
-            if (obj.type !== 'Mesh') return
             const mesh = obj as THREE.Mesh
+            if (mesh.isMesh) {
 
-            // this is important
-            mesh.updateMatrix()
+                mesh.matrixWorld.decompose(mesh.position, mesh.quaternion, mesh.scale);
+                mesh.rotation.setFromQuaternion(mesh.quaternion);
+                mesh.updateMatrix();
 
-            // same geometry and same material consider as the same mesh
-            const uuid = mesh.geometry.uuid + '/' + (mesh.material as THREE.Material).uuid
+                // same geometry and same material consider as the same mesh
+                const uuid = mesh.geometry.uuid + '/' + (mesh.material as THREE.Material).uuid
 
-            if (meshCollect[uuid]) {
-                meshCollect[uuid].push(mesh)
+                if (meshCollect[uuid]) {
+                    meshCollect[uuid].push(mesh)
+                } else {
+                    meshCollect[uuid] = [mesh]
+                }
             } else {
-                meshCollect[uuid] = [mesh]
+                obj.position.set(0, 0, 0);
+                obj.scale.set(1, 1, 1);
+                obj.rotation.set(0, 0, 0);
             }
+
         })
 
         // create all instances

package/lib/ThreeBase.ts

@@ -224,15 +224,10 @@ export default class ThreeBase extends EventDispatcher {
     getLookAt() {
         const position = this.camera.position.toArray().map(v => round(v, 3));
         const center = this.controls.target.toArray().map(v => round(v, 3));
-        if (threeUtils.isDev) {
-            console.log(`
-            center: new Vector3(${center.join(",")}),
-            position: new Vector3(${position.join(",")})
-            `);
-        }
         return {
+            center: new Vector3(...center),
             position: new Vector3(...position),
-            center: new Vector3(...center)
+            centerPosition: `center: new Vector3(${center.join(",")}),position: new Vector3(${position.join(",")})`
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "three-base",
-    "version": "1.0.22",
+    "version": "1.0.24",
     "description": "three 3d three-base",
     "keywords": [
         "three",

package/lib/draco/README.md

@@ -1,32 +0,0 @@
-# Draco 3D Data Compression
-
-Draco is an open-source library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.
-
-[Website](https://google.github.io/draco/) | [GitHub](https://github.com/google/draco)
-
-## Contents
-
-This folder contains three utilities:
-
-* `draco_decoder.js` — Emscripten-compiled decoder, compatible with any modern browser.
-* `draco_decoder.wasm` — WebAssembly decoder, compatible with newer browsers and devices.
-* `draco_wasm_wrapper.js` — JavaScript wrapper for the WASM decoder.
-
-Each file is provided in two variations:
-
-* **Default:** Latest stable builds, tracking the project's [master branch](https://github.com/google/draco).
-* **glTF:** Builds targeted by the [glTF mesh compression extension](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_draco_mesh_compression), tracking the [corresponding Draco branch](https://github.com/google/draco/tree/gltf_2.0_draco_extension).
-
-Either variation may be used with `THREE.DRACOLoader`:
-
-```js
-var dracoLoader = new THREE.DRACOLoader();
-dracoLoader.setDecoderPath('path/to/decoders/');
-dracoLoader.setDecoderConfig({type: 'js'}); // (Optional) Override detection of WASM support.
-```
-
-Further [documentation on GitHub](https://github.com/google/draco/tree/master/javascript/example#static-loading-javascript-decoder).
-
-## License
-
-[Apache License 2.0](https://github.com/google/draco/blob/master/LICENSE)