sysadminix/aerbim-ht-monitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'AEB-5/Linking-sensors-to-structural-elements_3D_update_2' into 'main'

Browse Source 
babylon.js update to 8.33.4

See merge request wedeving/aerbim-www!12
This commit is contained in:
Timofey Syrokvashko
2025-10-28 17:44:45 +03:00
parent dc798e6272 549a05509b
commit 6ac5acebba
3 changed files with 21 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/components/model/ModelViewer.tsx
View File

@@ -1,6 +1,7 @@
'use client'
import React, { useEffect, useRef, useState } from 'react'
import {
Engine,
Scene,
@@ -11,7 +12,6 @@ import {
Color4,
AbstractMesh,
Nullable,
ImportMeshAsync,
HighlightLayer,
Mesh,
InstancedMesh,
@@ -19,7 +19,8 @@ import {
CubicEase,
EasingFunction,
Matrix,
Viewport
Viewport,
ImportMeshAsync,
} from '@babylonjs/core'
import '@babylonjs/loaders'
@@ -185,7 +186,7 @@ const ModelViewer: React.FC<ModelViewerProps> = ({
setLoadingProgress(100)
console.log('GLTF Model loaded successfully!')
console.log('[ModelViewer] ImportMeshAsync result:', result)
console.log('ImportMeshAsync result:', result)
if (result.meshes.length > 0) {
const boundingBox = result.meshes[0].getHierarchyBoundingVectors()

42
frontend/package-lock.json generated
View File

@@ -8,8 +8,8 @@
"name": "frontend",
"version": "0.1.0",
"dependencies": {
"@babylonjs/core": "^6.44.0",
"@babylonjs/loaders": "^6.49.0",
"@babylonjs/core": "^8.33.4",
"@babylonjs/loaders": "^8.33.4",
"@tanstack/react-query": "^5.85.5",
"axios": "^1.12.2",
"next": "^15.4.3",
@@ -188,20 +188,19 @@
}
},
"node_modules/@babylonjs/core": {
"version": "6.49.0",
"resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-6.49.0.tgz",
"integrity": "sha512-jU/JyqebRqqziNwHLcBYzANrVRd9S55yNZEjejwg2p4I8NRnoBBNgf4wuUVw17UKNHc1v3KD/Vnr5C2+dIWAqQ==",
"license": "Apache-2.0",
"peer": true
"version": "8.33.4",
"resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-8.33.4.tgz",
"integrity": "sha512-kXNFHRpjZkq61Ddr6FR7ScVMx6NCeorOqu6wTmQnTCndCTqNTJcS6p+OHloM9BVUNXvpJFNbKN+cHPPHGOc4Pg==",
"license": "Apache-2.0"
},
"node_modules/@babylonjs/loaders": {
"version": "6.49.0",
"resolved": "https://registry.npmjs.org/@babylonjs/loaders/-/loaders-6.49.0.tgz",
"integrity": "sha512-Cy5t20wnYDFmKgVvgMWQpxo/eq+gND60hWxtDT/HwXB0FMeVMlNRpqOWpFuGcVdM4tYCP9eYrhQxvwAJZC/dlA==",
"version": "8.33.4",
"resolved": "https://registry.npmjs.org/@babylonjs/loaders/-/loaders-8.33.4.tgz",
"integrity": "sha512-OmnvQWFPh+/qrJQxOhpFn8F6w52eFFf+Ond8ZS4rnWyFty5YWWy303vQfgBPOUguRcKdj0HZuKGLWsBXK4V3Ng==",
"license": "Apache-2.0",
"peerDependencies": {
"@babylonjs/core": "^6.0.0",
"babylonjs-gltf2interface": "^6.0.0"
"@babylonjs/core": "^8.0.0",
"babylonjs-gltf2interface": "^8.0.0"
}
},
"node_modules/@emnapi/core": {
@@ -1651,7 +1650,6 @@
"resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.2.tgz",
"integrity": "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA==",
"license": "MIT",
"peer": true,
"dependencies": {
"csstype": "^3.0.2"
}
@@ -1721,7 +1719,6 @@
"integrity": "sha512-6JSSaBZmsKvEkbRUkf7Zj7dru/8ZCrJxAqArcLaVMee5907JdtEbKGsZ7zNiIm/UAkpGUkaSMZEXShnN2D1HZA==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@typescript-eslint/scope-manager": "8.46.1",
"@typescript-eslint/types": "8.46.1",
@@ -2239,7 +2236,6 @@
"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
"dev": true,
"license": "MIT",
"peer": true,
"bin": {
"acorn": "bin/acorn"
},
@@ -2553,9 +2549,9 @@
}
},
"node_modules/babylonjs-gltf2interface": {
"version": "6.49.0",
"resolved": "https://registry.npmjs.org/babylonjs-gltf2interface/-/babylonjs-gltf2interface-6.49.0.tgz",
"integrity": "sha512-4qzKCgEayti/YUaeMgAAZxZJlx/kLqXxoC+G8gODYz9wOV9UjnHF09wREZ5cuELzzY/rjSJMqkgDfYbUQIQ6/A==",
"version": "8.33.4",
"resolved": "https://registry.npmjs.org/babylonjs-gltf2interface/-/babylonjs-gltf2interface-8.33.4.tgz",
"integrity": "sha512-Nqc54fsBznPBhOKuzjmP/I6gohwutJ0OkCN81tZEwf+kw0Y2MbwdiweTuq24ok3WDUPCKpkOmgraZKJkY74H9g==",
"license": "Apache-2.0",
"peer": true
},
@@ -2790,8 +2786,7 @@
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
"license": "MIT",
"peer": true
"license": "MIT"
},
"node_modules/damerau-levenshtein": {
"version": "1.0.8",
@@ -3191,7 +3186,6 @@
"integrity": "sha512-t5aPOpmtJcZcz5UJyY2GbvpDlsK5E8JqRqoKtfiKE3cNh437KIqfJr3A3AKf5k64NPx6d0G3dno6XDY05PqPtw==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.8.0",
"@eslint-community/regexpp": "^4.12.1",
@@ -5654,7 +5648,6 @@
"resolved": "https://registry.npmjs.org/preact/-/preact-10.27.2.tgz",
"integrity": "sha512-5SYSgFKSyhCbk6SrXyMpqjb5+MQBgfvEKE/OC+PujcY34sOpqtr+0AZQtPYx5IA6VxynQ7rUPCtKzyovpj9Bpg==",
"license": "MIT",
"peer": true,
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/preact"
@@ -5688,7 +5681,6 @@
"integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
"dev": true,
"license": "MIT",
"peer": true,
"bin": {
"prettier": "bin/prettier.cjs"
},
@@ -5845,7 +5837,6 @@
"resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz",
"integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==",
"license": "MIT",
"peer": true,
"engines": {
"node": ">=0.10.0"
}
@@ -5855,7 +5846,6 @@
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
"integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==",
"license": "MIT",
"peer": true,
"dependencies": {
"scheduler": "^0.27.0"
},
@@ -6633,7 +6623,6 @@
"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
"dev": true,
"license": "MIT",
"peer": true,
"engines": {
"node": ">=12"
},
@@ -6783,7 +6772,6 @@
"integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
"dev": true,
"license": "Apache-2.0",
"peer": true,
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"

4
frontend/package.json
View File

@@ -9,8 +9,8 @@
"lint": "next lint"
},
"dependencies": {
"@babylonjs/core": "^6.44.0",
"@babylonjs/loaders": "^6.49.0",
"@babylonjs/core": "^8.33.4",
"@babylonjs/loaders": "^8.33.4",
"@tanstack/react-query": "^5.85.5",
"axios": "^1.12.2",
"next": "^15.4.3",