diff --git a/package.json b/package.json index 374a5de..6d20405 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "dependencies": { "@babel/runtime": "^7.24.5", "@babylonjs/core": "^7.6.0", + "@babylonjs/gui": "^7.8.0", "@babylonjs/havok": "^1.3.4", "@babylonjs/loaders": "^7.6.0", "@galacean/engine": "^1.2.0-beta.5", @@ -14,8 +15,6 @@ "@galacean/engine-toolkit": "^1.2.0-beta", "@types/three": "^0.164.0", "babylonjs": "^7.6.0", - "babylonjs-gui": "^7.8.0", - "babylonjs-loaders": "^7.8.0", "dat.gui": "^0.7.9", "stats.js": "^0.17.0", "three": "^0.164.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 65bdaa8..fc69fe4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,12 +11,15 @@ dependencies: '@babylonjs/core': specifier: ^7.6.0 version: 7.7.0 + '@babylonjs/gui': + specifier: ^7.8.0 + version: 7.8.0(@babylonjs/core@7.7.0) '@babylonjs/havok': specifier: ^1.3.4 version: 1.3.4 '@babylonjs/loaders': specifier: ^7.6.0 - version: 7.7.0(@babylonjs/core@7.7.0)(babylonjs-gltf2interface@7.7.0) + version: 7.7.0(@babylonjs/core@7.7.0)(babylonjs-gltf2interface@7.8.0) '@galacean/engine': specifier: ^1.2.0-beta.5 version: 1.2.0-beta.5 @@ -47,6 +50,9 @@ dependencies: three-nebula: specifier: ^10.0.3 version: 10.0.3(three@0.164.1) + three-spritetext: + specifier: ^1.8.2 + version: 1.8.2(three@0.164.1) devDependencies: '@types/node': @@ -78,20 +84,28 @@ packages: resolution: {integrity: sha512-wSaECmExjtKIG3qov3W2PBxZJN2V2M8sVfJ4Se108+GIA3+Y+IHZl1R3A6oDc2ZUduMnxix+TigXpV2J7AQCgg==} dev: false + /@babylonjs/gui@7.8.0(@babylonjs/core@7.7.0): + resolution: {integrity: sha512-i57+aQeaBMZ1YASKJs8RSYOvzXdP+We2DNPnPLF1QhPm0smKivoVISkSRd0bCgu6UdVc4itvJrAmHFYUTksfBg==} + peerDependencies: + '@babylonjs/core': ^7.0.0 + dependencies: + '@babylonjs/core': 7.7.0 + dev: false + /@babylonjs/havok@1.3.4: resolution: {integrity: sha512-mCz+w7vlSjPHLfGkCvt2oTRY2qFWXem6x/B6bolNW8lgsOn1SebeZ/lx6Q6nobNbOtWqs5jt4ESEb+ctzutvMw==} dependencies: '@types/emscripten': 1.39.12 dev: false - /@babylonjs/loaders@7.7.0(@babylonjs/core@7.7.0)(babylonjs-gltf2interface@7.7.0): + /@babylonjs/loaders@7.7.0(@babylonjs/core@7.7.0)(babylonjs-gltf2interface@7.8.0): resolution: {integrity: sha512-zdMmNJ7TM0JZVMmRV/LCEEE+uZY8DBpBpSh5SHNp2/4lTMhQnmWuMzQCmT/XVVZL7uUhPp7JSt2KsVQDl3Udag==} peerDependencies: '@babylonjs/core': ^7.0.0 babylonjs-gltf2interface: ^7.0.0 dependencies: '@babylonjs/core': 7.7.0 - babylonjs-gltf2interface: 7.7.0 + babylonjs-gltf2interface: 7.8.0 dev: false /@esbuild/aix-ppc64@0.20.2: @@ -643,8 +657,8 @@ packages: picomatch: 2.3.1 dev: true - /babylonjs-gltf2interface@7.7.0: - resolution: {integrity: sha512-+bRMGLznjVhz84l+xACZQRjj3vKQrx2klIAhlQEA1p23BYAoxOR4XJs2SEK/alqy1VVTnVfauInHofqDs9DKqw==} + /babylonjs-gltf2interface@7.8.0: + resolution: {integrity: sha512-0OBFS5Xj8XTmx/Lxf48qa8rpLV1nkrieBmPSkt+4ArVM/wPGR0QbOAlJWn3auKD1uIaa3gVAbh1hdbOgh9GEhg==} dev: false /babylonjs@7.7.0: @@ -897,6 +911,15 @@ packages: uuid: 3.4.0 dev: false + /three-spritetext@1.8.2(three@0.164.1): + resolution: {integrity: sha512-OYjyAhWnQ6+7CPKjnpq3JQM+Lpr6cSOppCtbOOzF1IbCauGkoDFvbAnxYd0LVxEsIO2RALXXScg2eX+R6CAfyA==} + engines: {node: '>=12'} + peerDependencies: + three: '>=0.86.0' + dependencies: + three: 0.164.1 + dev: false + /three@0.164.1: resolution: {integrity: sha512-iC/hUBbl1vzFny7f5GtqzVXYjMJKaTPxiCxXfrvVdBi1Sf+jhd1CAkitiFwC7mIBFCo3MrDLJG97yisoaWig0w==} dev: false diff --git a/src/babylon/text-benchmark.ts b/src/babylon/text-benchmark.ts index de5831e..2b376cd 100644 --- a/src/babylon/text-benchmark.ts +++ b/src/babylon/text-benchmark.ts @@ -4,7 +4,7 @@ */ import { Vector3, Engine, Scene, UniversalCamera } from "@babylonjs/core"; -import { AdvancedDynamicTexture, TextBlock } from "babylonjs-gui"; +import { AdvancedDynamicTexture, TextBlock } from "@babylonjs/gui"; // 创建画布元素 const canvas = document.getElementById("canvas") as HTMLCanvasElement;