From 5b2ba791c151b0d0025d40ae1a26793fe2bf2a55 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Thu, 19 Oct 2023 10:07:42 +0200 Subject: [PATCH] aggiunto loader --- 3MF_test/Web3D-Vue/Web3D_viewer/package-lock.json | 8 ++++---- 3MF_test/Web3D-Vue/Web3D_viewer/package.json | 2 +- WebGl/draw/webgl_drawVue.js | 10 ++++++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/3MF_test/Web3D-Vue/Web3D_viewer/package-lock.json b/3MF_test/Web3D-Vue/Web3D_viewer/package-lock.json index 050bb27..17db4a6 100644 --- a/3MF_test/Web3D-Vue/Web3D_viewer/package-lock.json +++ b/3MF_test/Web3D-Vue/Web3D_viewer/package-lock.json @@ -10,7 +10,7 @@ "license": "MIT", "dependencies": { "vue": "^2.5.11", - "webgl-visualizer": "^1.2.231019-beta.955" + "webgl-visualizer": "^1.2.231019-beta.1002" }, "devDependencies": { "babel-core": "^6.26.0", @@ -9296,9 +9296,9 @@ } }, "node_modules/webgl-visualizer": { - "version": "1.2.231019-beta.955", - "resolved": "https://nexus.steamware.net/repository/npm-group/webgl-visualizer/-/webgl-visualizer-1.2.231019-beta.955.tgz", - "integrity": "sha512-RrjA17Y51FcOjh/eoJ0av7+ShNcSkurKmerIvxSD+McwS3NbS+2qfX4IEWojQTATmqcLM/Gx4/i1IUolNAvWjQ==", + "version": "1.2.231019-beta.1002", + "resolved": "https://nexus.steamware.net/repository/npm-group/webgl-visualizer/-/webgl-visualizer-1.2.231019-beta.1002.tgz", + "integrity": "sha512-mgKO2Mahs/F+fsY5qDt+ddiulrrdpw1mR8D6LqhHBXgKg4O3lSND4m0QR+wdTvJIUJxvHbDQHEhoVuWXkVrn+w==", "license": "ISC" }, "node_modules/webpack": { diff --git a/3MF_test/Web3D-Vue/Web3D_viewer/package.json b/3MF_test/Web3D-Vue/Web3D_viewer/package.json index 00adba5..fdf56af 100644 --- a/3MF_test/Web3D-Vue/Web3D_viewer/package.json +++ b/3MF_test/Web3D-Vue/Web3D_viewer/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "vue": "^2.5.11", - "webgl-visualizer": "^1.2.231019-beta.955" + "webgl-visualizer": "^1.2.231019-beta.1002" }, "browserslist": [ "> 1%", diff --git a/WebGl/draw/webgl_drawVue.js b/WebGl/draw/webgl_drawVue.js index 845f9be..4255e90 100644 --- a/WebGl/draw/webgl_drawVue.js +++ b/WebGl/draw/webgl_drawVue.js @@ -1,7 +1,7 @@ import * as THREE from '../threeJsLib/three.module.js'; import { OrbitControls } from '../jsm/controls/OrbitControls.js'; import { ThreeMFLoader } from '../jsm/loaders/3MFLoader.js'; -import { Rhino3dmLoader } from '../jsm/addons/loaders/3DMLoader.js'; +import { Rhino3dmLoader } from '../jsm/loaders/3DMLoader.js'; // VARIABILI DI CONTROLLO @@ -245,6 +245,8 @@ function init3mf() { } function init3dm(){ + const loader = new Rhino3dmLoader() ; + let startTime = performance.now(); return new Promise(() => { setTimeout(() => { loader.setLibraryPath( 'https://cdn.jsdelivr.net/npm/rhino3dm@7.15.0/' ) ; @@ -426,10 +428,14 @@ function init3dm(){ } AdaptSeceneToContest() ; - console.log(new Date()) ; + let endTime = performance.now(); + let timeElapsed = endTime - startTime; + console.log('init3dm in : ' + timeElapsed) + // console.log(new Date()) ; }) ; }, 0) }) + } function refreshElement(nStart, nEnd) {