From 99540a12e60250967ab3d07b838690848cbeef6f Mon Sep 17 00:00:00 2001 From: liuxianghui <519646741@qq.com> Date: Tue, 11 Jan 2022 13:48:10 +0800 Subject: [PATCH] =?UTF-8?q?babylonjs/core=20=20=E4=BB=8E4.2.0=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=87=B34.2.1=E7=89=88=E6=9C=AC=EF=BC=8C=20=E4=BB=A5?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E8=B0=B7=E6=AD=8C=E6=B5=8F=E8=A7=88=E5=99=A8?= =?UTF-8?q?=E7=9A=84=2097.0.4692.71=20=E7=89=88=E6=9C=AC=20=EF=BC=88?= =?UTF-8?q?=E4=B8=BB=E8=A6=81=E6=98=AF=E5=AF=B9=E6=A8=A1=E5=9E=8B=E6=B8=B2?= =?UTF-8?q?=E6=9F=93=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 11 +-- src/app/babylon/controller/scene-manager.ts | 1 - src/app/babylon/game.ts | 9 +-- yarn.lock | 87 +++++++++++---------- 4 files changed, 53 insertions(+), 55 deletions(-) diff --git a/package.json b/package.json index 8bc2e9f..6ecd23e 100644 --- a/package.json +++ b/package.json @@ -23,11 +23,11 @@ "@angular/platform-browser-dynamic": "~9.0.0", "@angular/router": "~9.0.0", "@aspnet/signalr": "^1.1.4", - "@babylonjs/core": "^4.2.0", - "@babylonjs/gui": "^4.2.0", - "@babylonjs/inspector": "^4.2.0", - "@babylonjs/loaders": "^4.2.0", - "@babylonjs/materials": "^4.2.0", + "@babylonjs/core": "^4.2.1", + "@babylonjs/gui": "^4.2.1", + "@babylonjs/inspector": "^4.2.1", + "@babylonjs/loaders": "^4.2.1", + "@babylonjs/materials": "^4.2.1", "@types/cesium": "^1.59.5", "@types/earcut": "^2.1.1", "@types/react-dom": "^17.0.10", @@ -35,6 +35,7 @@ "abp-ng2-module": "^6.4.0", "abp-web-resources": "^5.4.0", "angular-calendar": "^0.28.2", + "babylonjs": "4.2.1", "bson-objectid": "^1.3.1", "cesium": "^1.64.0", "class-transformer": "^0.4.0", diff --git a/src/app/babylon/controller/scene-manager.ts b/src/app/babylon/controller/scene-manager.ts index 46441f3..3a62441 100644 --- a/src/app/babylon/controller/scene-manager.ts +++ b/src/app/babylon/controller/scene-manager.ts @@ -172,7 +172,6 @@ export class SceneManager { camera.inputs.removeByType("ArcRotateCameraKeyboardMoveInput"); //为了配合快捷键，屏蔽了 camera.inputs.add(new MyArcRotateCameraPointersInput()); - } /** diff --git a/src/app/babylon/game.ts b/src/app/babylon/game.ts index 39831f1..80415d9 100644 --- a/src/app/babylon/game.ts +++ b/src/app/babylon/game.ts @@ -1,4 +1,4 @@ -import { Database, Engine, FileTools, RenderingManager, Scene } from "@babylonjs/core"; +import { AbstractMesh, Database, Engine, FileTools, Mesh, RenderingManager, Scene } from "@babylonjs/core"; import { SceneManager } from "./controller/scene-manager"; import { LoginSatus } from "./controller/status/login-status"; @@ -73,12 +73,6 @@ export class Game { // canvas.translate = true; //用于设置背景透明 // scene.autoClear = true; - - - - - - } //创建初始场景 @@ -97,7 +91,6 @@ export class Game { this.scene = null; this.engine.dispose(); this.engine = null; - } /** diff --git a/yarn.lock b/yarn.lock index 42fc322..e1372a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1112,58 +1112,58 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" -"@babylonjs/core@4.2.0", "@babylonjs/core@^4.2.0": - version "4.2.0" - resolved "https://registry.npmmirror.com/@babylonjs/core/download/@babylonjs/core-4.2.0.tgz#d1cfd43d7e3d2e58cde79083f04eeb607f6c8f18" - integrity sha1-0c/UPX49LljN55CD8E7rYH9sjxg= +"@babylonjs/core@4.2.1", "@babylonjs/core@^4.2.1": + version "4.2.1" + resolved "https://registry.npmmirror.com/@babylonjs/core/download/@babylonjs/core-4.2.1.tgz#9dc57dabf41d259a2343da308ec52575b368e588" + integrity sha512-Z2ZVNRKPB1UvmMeqQtxCJKrQtQ/hb5FcAZi66YEEE0MKBQlLmf6oZEM9vS1RljPK7NZoV/dZSdwjJgiQlGsuhA== dependencies: tslib ">=1.10.0" -"@babylonjs/gui@4.2.0", "@babylonjs/gui@^4.2.0": - version "4.2.0" - resolved "https://registry.npmmirror.com/@babylonjs/gui/download/@babylonjs/gui-4.2.0.tgz#c2a35ca6724759731fe0c4ddbfe2490301847f93" - integrity sha1-wqNcpnJHWXMf4MTdv+JJAwGEf5M= +"@babylonjs/gui@4.2.1", "@babylonjs/gui@^4.2.1": + version "4.2.1" + resolved "https://registry.npmmirror.com/@babylonjs/gui/download/@babylonjs/gui-4.2.1.tgz#e22e0ddfc456cc816500dd72ad034e1b41a53218" + integrity sha512-6gOolbWYFO5lrRWKunawYWQkX4a47dvuiIBrEmY6eKRN97e4f7YrR7oYolqeWFHLXzbn0JR0blOYQyUB5jQqmg== dependencies: - "@babylonjs/core" "4.2.0" + "@babylonjs/core" "4.2.1" tslib ">=1.10.0" -"@babylonjs/inspector@^4.2.0": - version "4.2.0" - resolved "https://registry.npmmirror.com/@babylonjs/inspector/download/@babylonjs/inspector-4.2.0.tgz#70d901729097f79b166decccfc8ed2195d2b1c35" - integrity sha1-cNkBcpCX95sWbezM/I7SGV0rHDU= - dependencies: - "@babylonjs/core" "4.2.0" - "@babylonjs/gui" "4.2.0" - "@babylonjs/loaders" "4.2.0" - "@babylonjs/materials" "4.2.0" - "@babylonjs/serializers" "4.2.0" - babylonjs-gltf2interface "4.2.0" +"@babylonjs/inspector@^4.2.1": + version "4.2.1" + resolved "https://registry.npmmirror.com/@babylonjs/inspector/download/@babylonjs/inspector-4.2.1.tgz#fa6092f22656c23d79b489aef7b2e72e982a9326" + integrity sha512-P0l3oAVniyxYJIgpZsAJ3veJnA9Sq02HLsy7Dr3y5UOA8WP0n7X1Uv2T1MbONdTkXJ1YoX/KBfAYVAA81FXhbg== + dependencies: + "@babylonjs/core" "4.2.1" + "@babylonjs/gui" "4.2.1" + "@babylonjs/loaders" "4.2.1" + "@babylonjs/materials" "4.2.1" + "@babylonjs/serializers" "4.2.1" + babylonjs-gltf2interface "4.2.1" tslib ">=1.10.0" -"@babylonjs/loaders@4.2.0", "@babylonjs/loaders@^4.2.0": - version "4.2.0" - resolved "https://registry.npmmirror.com/@babylonjs/loaders/download/@babylonjs/loaders-4.2.0.tgz#a9902dc277c16dcd22cd1907f86310e211c247cb" - integrity sha1-qZAtwnfBbc0izRkH+GMQ4hHCR8s= +"@babylonjs/loaders@4.2.1", "@babylonjs/loaders@^4.2.1": + version "4.2.1" + resolved "https://registry.npmmirror.com/@babylonjs/loaders/download/@babylonjs/loaders-4.2.1.tgz#34bcdf688f6bcb92bcf66de3d8fc297e9830026b" + integrity sha512-huLdk18nTqwXHYIbxpXRTo1smcL1eCD8TvvyWiHciRjPttpRNjoACSR/G2J2FD0ymSBu8ZS8cdMvq1by7x2DsA== dependencies: - "@babylonjs/core" "4.2.0" - babylonjs-gltf2interface "4.2.0" + "@babylonjs/core" "4.2.1" + babylonjs-gltf2interface "4.2.1" tslib ">=1.10.0" -"@babylonjs/materials@4.2.0", "@babylonjs/materials@^4.2.0": - version "4.2.0" - resolved "https://registry.npmmirror.com/@babylonjs/materials/download/@babylonjs/materials-4.2.0.tgz#8d889e49f6824e4fc62622b221f36ab0b8334d6e" - integrity sha1-jYieSfaCTk/GJiKyIfNqsLgzTW4= +"@babylonjs/materials@4.2.1", "@babylonjs/materials@^4.2.1": + version "4.2.1" + resolved "https://registry.npmmirror.com/@babylonjs/materials/download/@babylonjs/materials-4.2.1.tgz#a44ef5c8a4c3d99e16dce27895e5ce4f7d178393" + integrity sha512-G4mfmixt2BnATaa2/uhf7xfZv4fqD6bGHocbEWT1Iu0KOJcpU7Q0EYjN8bqx78hVFjd94e4g0/7Bey2JaGrakA== dependencies: - "@babylonjs/core" "4.2.0" + "@babylonjs/core" "4.2.1" tslib ">=1.10.0" -"@babylonjs/serializers@4.2.0": - version "4.2.0" - resolved "https://registry.npmmirror.com/@babylonjs/serializers/download/@babylonjs/serializers-4.2.0.tgz#ca8c9b773c1985e8b49790ec65f6fdcf4cea0a49" - integrity sha1-yoybdzwZhei0l5DsZfb9z0zqCkk= +"@babylonjs/serializers@4.2.1": + version "4.2.1" + resolved "https://registry.npmmirror.com/@babylonjs/serializers/download/@babylonjs/serializers-4.2.1.tgz#b7971f89ddbea5382edcd7ef62f6d04e962b63e4" + integrity sha512-G4Jw9ILUJp8hO49Jg+sxVAKfYMZlgxGClNrUKCOcsIGWg5Yy0hKd1BZd86wEiyJAYt+MDpuocWCShzkEV2mJhA== dependencies: - "@babylonjs/core" "4.2.0" - babylonjs-gltf2interface "4.2.0" + "@babylonjs/core" "4.2.1" + babylonjs-gltf2interface "4.2.1" tslib ">=1.10.0" "@firebase/analytics-types@0.4.0": @@ -3485,10 +3485,15 @@ babel-plugin-dynamic-import-node@^2.3.0: dependencies: object.assign "^4.1.0" -babylonjs-gltf2interface@4.2.0: - version "4.2.0" - resolved "https://registry.npmmirror.com/babylonjs-gltf2interface/download/babylonjs-gltf2interface-4.2.0.tgz#b0ef1e11e3574cf2c6f573d0c5c34857a2a7b322" - integrity sha1-sO8eEeNXTPLG9XPQxcNIV6KnsyI= +babylonjs-gltf2interface@4.2.1: + version "4.2.1" + resolved "https://registry.npmmirror.com/babylonjs-gltf2interface/download/babylonjs-gltf2interface-4.2.1.tgz#d23c78a23a16771ad9e7f8f6d20b7c00b5ce0c33" + integrity sha512-ZBfKgIoztO1x1nyf9aPQJ+WXmB6Kw0VlyxvcKchIixbICqeeExiN8nmjvypwXC4hl+5ZDMnUKQNrIhh7uzulnA== + +babylonjs@4.2.1: + version "4.2.1" + resolved "https://registry.npmmirror.com/babylonjs/download/babylonjs-4.2.1.tgz#202808ac89f7c6bd5f1efa848f2781360034967e" + integrity sha512-FQdJ2VTENUpUJQ30ddihwTjV6K94kglET0P7jV8OQzjA4eez3sotmG22Fn9+8yb069SA26KnrAGOI2sKMQ7BCw== backo2@1.0.2: version "1.0.2"