1
0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-06-06 05:14:10 +02:00
This commit is contained in:
syuilo
2026-04-22 09:36:40 +09:00
parent 6f79420fdc
commit 7b0e839661
4 changed files with 73 additions and 54 deletions

View File

@@ -17,10 +17,10 @@
}, },
"dependencies": { "dependencies": {
"@analytics/google-analytics": "1.1.0", "@analytics/google-analytics": "1.1.0",
"@babylonjs/core": "9.3.3", "@babylonjs/core": "9.3.4",
"@babylonjs/loaders": "9.3.3", "@babylonjs/loaders": "9.3.4",
"@babylonjs/materials": "9.3.3", "@babylonjs/materials": "9.3.4",
"@babylonjs/inspector": "9.3.3", "@babylonjs/inspector": "9.3.4",
"@discordapp/twemoji": "16.0.1", "@discordapp/twemoji": "16.0.1",
"@github/webauthn-json": "2.1.1", "@github/webauthn-json": "2.1.1",
"@mcaptcha/core-glue": "0.1.0-alpha-5", "@mcaptcha/core-glue": "0.1.0-alpha-5",

View File

@@ -851,12 +851,11 @@ export class RoomEngine extends EventEmitter<RoomEngineEvents> {
merged.name = 'preMerged'; merged.name = 'preMerged';
merged.material.freeze(); merged.material.freeze();
// subMaterialまでfreezeするとbabylon 9.3.2以降、snapshot rendering + selection outlineの組み合わせでなんかレンダリングがグリッチする if (merged.material instanceof BABYLON.MultiMaterial) {
//if (merged.material instanceof BABYLON.MultiMaterial) { for (const subMat of merged.material.subMaterials) {
// for (const subMat of merged.material.subMaterials) { subMat.freeze();
// subMat.freeze(); }
// } }
//}
// TODO: 再帰的にする // TODO: 再帰的にする
for (const m of loaderResult.transformNodes) { for (const m of loaderResult.transformNodes) {

View File

@@ -308,12 +308,11 @@ export class ModelManager {
merged.parent = this.root; merged.parent = this.root;
merged.material.freeze(); merged.material.freeze();
// subMaterialまでfreezeするとbabylon 9.3.2以降、snapshot rendering + selection outlineの組み合わせでなんかレンダリングがグリッチする if (merged.material instanceof BABYLON.MultiMaterial) {
//if (merged.material instanceof BABYLON.MultiMaterial) { for (const subMat of merged.material.subMaterials) {
// for (const subMat of merged.material.subMaterials) { (subMat as BABYLON.PBRMaterial).freeze();
// (subMat as BABYLON.PBRMaterial).freeze(); }
// } }
//}
merged.freezeWorldMatrix(); merged.freezeWorldMatrix();
merged.metadata = { ...this.root.metadata }; merged.metadata = { ...this.root.metadata };

97
pnpm-lock.yaml generated
View File

@@ -612,17 +612,17 @@ importers:
specifier: 1.1.0 specifier: 1.1.0
version: 1.1.0 version: 1.1.0
'@babylonjs/core': '@babylonjs/core':
specifier: 9.3.3 specifier: 9.3.4
version: 9.3.3 version: 9.3.4
'@babylonjs/inspector': '@babylonjs/inspector':
specifier: 9.3.3 specifier: 9.3.4
version: 9.3.3(ce8c0c0c1eae6416d162e7582e431fa4) version: 9.3.4(39831d7b27952802810ceefb54644126)
'@babylonjs/loaders': '@babylonjs/loaders':
specifier: 9.3.3 specifier: 9.3.4
version: 9.3.3(@babylonjs/core@9.3.3)(babylonjs-gltf2interface@8.51.2) version: 9.3.4(@babylonjs/core@9.3.4)(babylonjs-gltf2interface@8.51.2)
'@babylonjs/materials': '@babylonjs/materials':
specifier: 9.3.3 specifier: 9.3.4
version: 9.3.3(@babylonjs/core@9.3.3) version: 9.3.4(@babylonjs/core@9.3.4)
'@discordapp/twemoji': '@discordapp/twemoji':
specifier: 16.0.1 specifier: 16.0.1
version: 16.0.1 version: 16.0.1
@@ -1732,8 +1732,8 @@ packages:
peerDependencies: peerDependencies:
'@babylonjs/core': ^8.0.0 '@babylonjs/core': ^8.0.0
'@babylonjs/core@9.3.3': '@babylonjs/core@9.3.4':
resolution: {integrity: sha512-7/H736aO2NRi9/ocOWKUpzwt0rrL9fWmDIeLvM0F9g2cGURLLO26ZwqzoJmA19UvBAgrud8XgVZdZ6TaFl0OFQ==} resolution: {integrity: sha512-ZwaIfw9o9kpvloErFaV28QEyofubZu67gFKzxSOcbZwqqitIF8p7xbvt6QHAnIhczEKVYLYilzqyKIlNqYcaqw==}
'@babylonjs/gui-editor@8.51.2': '@babylonjs/gui-editor@8.51.2':
resolution: {integrity: sha512-+kG9551b0iPK/BcPhdK3QUlaA+BJ9pt3LGiWkhyEMKYfZ0dJRjjmoFZuCAehlYU9sxEiWf1C/y96BrPt2QodIA==} resolution: {integrity: sha512-+kG9551b0iPK/BcPhdK3QUlaA+BJ9pt3LGiWkhyEMKYfZ0dJRjjmoFZuCAehlYU9sxEiWf1C/y96BrPt2QodIA==}
@@ -1748,8 +1748,8 @@ packages:
peerDependencies: peerDependencies:
'@babylonjs/core': ^8.0.0 '@babylonjs/core': ^8.0.0
'@babylonjs/inspector@9.3.3': '@babylonjs/inspector@9.3.4':
resolution: {integrity: sha512-icGx95bcj6J12TT/GU5LKOcK+QH747rqZLK/YfjFRnQ4iAK9j9WcKsIHHh+9fetBdTzDAcgybzZnxpiw3+VvLA==} resolution: {integrity: sha512-kr2hAVgipnc4IRvxNDeX2DgKRuYmP/QfD0L5goBLG02hBGJGBeU7kRnHxbUUJrmr5PLtReTKSBEsqvx1kHE7cA==}
hasBin: true hasBin: true
peerDependencies: peerDependencies:
'@babylonjs/addons': ^9.0.0 '@babylonjs/addons': ^9.0.0
@@ -1759,6 +1759,7 @@ packages:
'@babylonjs/loaders': ^9.0.0 '@babylonjs/loaders': ^9.0.0
'@babylonjs/materials': ^9.0.0 '@babylonjs/materials': ^9.0.0
'@babylonjs/serializers': ^9.0.0 '@babylonjs/serializers': ^9.0.0
'@fluentui-contrib/react-resize-handle': ^0.8.4
'@fluentui-contrib/react-virtualizer': ^1.0.0 '@fluentui-contrib/react-virtualizer': ^1.0.0
'@fluentui/react-components': ^9.70.0 '@fluentui/react-components': ^9.70.0
'@fluentui/react-icons': ^2.0.310 '@fluentui/react-icons': ^2.0.310
@@ -1766,14 +1767,14 @@ packages:
react-dom: '>=16.14.0 <20.0.0' react-dom: '>=16.14.0 <20.0.0'
usehooks-ts: ^3.1.1 usehooks-ts: ^3.1.1
'@babylonjs/loaders@9.3.3': '@babylonjs/loaders@9.3.4':
resolution: {integrity: sha512-0wgXYBcBgJ/OYFo83bm6SGUv2Mo9puc6YiRWWe2Rni8wSSqi6LCDHlQ1Suil8kluhu9zimdpbTv9nhvlyExGjw==} resolution: {integrity: sha512-3HA8OUaqa5/Q9Jl7g2poN+YGQy1qGd0CHbYkkZoKeKE68fZNtWPQbKHMJzP+0wmoJHorVaLLwDxZFsG9oG0xQA==}
peerDependencies: peerDependencies:
'@babylonjs/core': ^9.0.0 '@babylonjs/core': ^9.0.0
babylonjs-gltf2interface: ^9.0.0 babylonjs-gltf2interface: ^9.0.0
'@babylonjs/materials@9.3.3': '@babylonjs/materials@9.3.4':
resolution: {integrity: sha512-QyW0Sgn0E0jBsbcgXmGtpeWUNLTvQRAE8Ax+bzqjOZ6rgaAN/X8EWdMywqJrVxc/YglixaQC2IZo9ShzIa+tgA==} resolution: {integrity: sha512-9nakZasS28K4y0m9EgdOiGDKlcCCVknwjKJ7u+CtmcNGuVD9kg4qa2BCLillgApircn86CuygaiJF3ht3K2GfA==}
peerDependencies: peerDependencies:
'@babylonjs/core': ^9.0.0 '@babylonjs/core': ^9.0.0
@@ -2338,6 +2339,15 @@ packages:
'@floating-ui/utils@0.2.10': '@floating-ui/utils@0.2.10':
resolution: {integrity: sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==} resolution: {integrity: sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==}
'@fluentui-contrib/react-resize-handle@0.8.4':
resolution: {integrity: sha512-g3cJ3q+nn32BB5b5mEtuSh6sGNYOGcKvRxQljvfg+UAhStceCPZYRM8gF+HswPPhQ0LUR6h780WMe072ndR6Lw==}
peerDependencies:
'@fluentui/react-components': '>=9.70.0 <10.0.0'
'@types/react': '>=16.8.0 <20.0.0'
'@types/react-dom': '>=16.8.0 <20.0.0'
react: '>=16.8.0 <20.0.0'
react-dom: '>=16.8.0 <20.0.0'
'@fluentui-contrib/react-virtualizer@0.5.4': '@fluentui-contrib/react-virtualizer@0.5.4':
resolution: {integrity: sha512-Tvet4HaE7G+R11HlRrydohBGJaGS94cUmWma0c/E3MbDj1eGgo5yLSoU3XvwksImb1KfRxpFKWEZ99xlzVhiOA==} resolution: {integrity: sha512-Tvet4HaE7G+R11HlRrydohBGJaGS94cUmWma0c/E3MbDj1eGgo5yLSoU3XvwksImb1KfRxpFKWEZ99xlzVhiOA==}
peerDependencies: peerDependencies:
@@ -11957,32 +11967,33 @@ snapshots:
'@babel/helper-string-parser': 7.27.1 '@babel/helper-string-parser': 7.27.1
'@babel/helper-validator-identifier': 7.28.5 '@babel/helper-validator-identifier': 7.28.5
'@babylonjs/addons@8.51.2(@babylonjs/core@9.3.3)': '@babylonjs/addons@8.51.2(@babylonjs/core@9.3.4)':
dependencies: dependencies:
'@babylonjs/core': 9.3.3 '@babylonjs/core': 9.3.4
'@babylonjs/core@9.3.3': {} '@babylonjs/core@9.3.4': {}
'@babylonjs/gui-editor@8.51.2(@babylonjs/core@9.3.3)(@babylonjs/gui@8.51.2(@babylonjs/core@9.3.3))(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)': '@babylonjs/gui-editor@8.51.2(@babylonjs/core@9.3.4)(@babylonjs/gui@8.51.2(@babylonjs/core@9.3.4))(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)':
dependencies: dependencies:
'@babylonjs/core': 9.3.3 '@babylonjs/core': 9.3.4
'@babylonjs/gui': 8.51.2(@babylonjs/core@9.3.3) '@babylonjs/gui': 8.51.2(@babylonjs/core@9.3.4)
'@types/react': 19.2.2 '@types/react': 19.2.2
'@types/react-dom': 19.2.3(@types/react@19.2.2) '@types/react-dom': 19.2.3(@types/react@19.2.2)
'@babylonjs/gui@8.51.2(@babylonjs/core@9.3.3)': '@babylonjs/gui@8.51.2(@babylonjs/core@9.3.4)':
dependencies: dependencies:
'@babylonjs/core': 9.3.3 '@babylonjs/core': 9.3.4
'@babylonjs/inspector@9.3.3(ce8c0c0c1eae6416d162e7582e431fa4)': '@babylonjs/inspector@9.3.4(39831d7b27952802810ceefb54644126)':
dependencies: dependencies:
'@babylonjs/addons': 8.51.2(@babylonjs/core@9.3.3) '@babylonjs/addons': 8.51.2(@babylonjs/core@9.3.4)
'@babylonjs/core': 9.3.3 '@babylonjs/core': 9.3.4
'@babylonjs/gui': 8.51.2(@babylonjs/core@9.3.3) '@babylonjs/gui': 8.51.2(@babylonjs/core@9.3.4)
'@babylonjs/gui-editor': 8.51.2(@babylonjs/core@9.3.3)(@babylonjs/gui@8.51.2(@babylonjs/core@9.3.3))(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2) '@babylonjs/gui-editor': 8.51.2(@babylonjs/core@9.3.4)(@babylonjs/gui@8.51.2(@babylonjs/core@9.3.4))(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)
'@babylonjs/loaders': 9.3.3(@babylonjs/core@9.3.3)(babylonjs-gltf2interface@8.51.2) '@babylonjs/loaders': 9.3.4(@babylonjs/core@9.3.4)(babylonjs-gltf2interface@8.51.2)
'@babylonjs/materials': 9.3.3(@babylonjs/core@9.3.3) '@babylonjs/materials': 9.3.4(@babylonjs/core@9.3.4)
'@babylonjs/serializers': 8.51.2(@babylonjs/core@9.3.3)(babylonjs-gltf2interface@8.51.2) '@babylonjs/serializers': 8.51.2(@babylonjs/core@9.3.4)(babylonjs-gltf2interface@8.51.2)
'@fluentui-contrib/react-resize-handle': 0.8.4(@fluentui/react-components@9.73.0(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(scheduler@0.27.0))(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
'@fluentui-contrib/react-virtualizer': 0.5.4(@fluentui/react-shared-contexts@9.26.1(@types/react@19.2.2)(react@19.2.5))(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5) '@fluentui-contrib/react-virtualizer': 0.5.4(@fluentui/react-shared-contexts@9.26.1(@types/react@19.2.2)(react@19.2.5))(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
'@fluentui/react-components': 9.73.0(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(scheduler@0.27.0) '@fluentui/react-components': 9.73.0(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(scheduler@0.27.0)
'@fluentui/react-icons': 2.0.319(react@19.2.5) '@fluentui/react-icons': 2.0.319(react@19.2.5)
@@ -11990,18 +12001,18 @@ snapshots:
react-dom: 19.2.5(react@19.2.5) react-dom: 19.2.5(react@19.2.5)
usehooks-ts: 3.1.1(react@19.2.5) usehooks-ts: 3.1.1(react@19.2.5)
'@babylonjs/loaders@9.3.3(@babylonjs/core@9.3.3)(babylonjs-gltf2interface@8.51.2)': '@babylonjs/loaders@9.3.4(@babylonjs/core@9.3.4)(babylonjs-gltf2interface@8.51.2)':
dependencies: dependencies:
'@babylonjs/core': 9.3.3 '@babylonjs/core': 9.3.4
babylonjs-gltf2interface: 8.51.2 babylonjs-gltf2interface: 8.51.2
'@babylonjs/materials@9.3.3(@babylonjs/core@9.3.3)': '@babylonjs/materials@9.3.4(@babylonjs/core@9.3.4)':
dependencies: dependencies:
'@babylonjs/core': 9.3.3 '@babylonjs/core': 9.3.4
'@babylonjs/serializers@8.51.2(@babylonjs/core@9.3.3)(babylonjs-gltf2interface@8.51.2)': '@babylonjs/serializers@8.51.2(@babylonjs/core@9.3.4)(babylonjs-gltf2interface@8.51.2)':
dependencies: dependencies:
'@babylonjs/core': 9.3.3 '@babylonjs/core': 9.3.4
babylonjs-gltf2interface: 8.51.2 babylonjs-gltf2interface: 8.51.2
'@bcoe/v8-coverage@1.0.2': {} '@bcoe/v8-coverage@1.0.2': {}
@@ -12510,6 +12521,16 @@ snapshots:
'@floating-ui/utils@0.2.10': {} '@floating-ui/utils@0.2.10': {}
'@fluentui-contrib/react-resize-handle@0.8.4(@fluentui/react-components@9.73.0(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(scheduler@0.27.0))(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
dependencies:
'@fluentui/react-components': 9.73.0(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(scheduler@0.27.0)
'@fluentui/react-utilities': 9.26.1(@types/react@19.2.2)(react@19.2.5)
'@swc/helpers': 0.5.18
'@types/react': 19.2.2
'@types/react-dom': 19.2.3(@types/react@19.2.2)
react: 19.2.5
react-dom: 19.2.5(react@19.2.5)
'@fluentui-contrib/react-virtualizer@0.5.4(@fluentui/react-shared-contexts@9.26.1(@types/react@19.2.2)(react@19.2.5))(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)': '@fluentui-contrib/react-virtualizer@0.5.4(@fluentui/react-shared-contexts@9.26.1(@types/react@19.2.2)(react@19.2.5))(@types/react-dom@19.2.3(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
dependencies: dependencies:
'@fluentui/react-jsx-runtime': 9.4.0(@types/react@19.2.2)(react@19.2.5) '@fluentui/react-jsx-runtime': 9.4.0(@types/react@19.2.2)(react@19.2.5)