From e4265b542851c7bde115a9dc53ea61fb87b2d768 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Wed, 4 Oct 2023 08:37:17 +0200 Subject: [PATCH 1/3] rimesso spinner --- 3MF_test/Web3D-Vue/Web3D_viewer/index.html | 18 +++++++++--------- WebGl/draw/webgl_drawVue.js | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/3MF_test/Web3D-Vue/Web3D_viewer/index.html b/3MF_test/Web3D-Vue/Web3D_viewer/index.html index fbc5dee..7bbafc4 100644 --- a/3MF_test/Web3D-Vue/Web3D_viewer/index.html +++ b/3MF_test/Web3D-Vue/Web3D_viewer/index.html @@ -22,20 +22,20 @@ _dimX : X, _dimY: Y, _fileName: "Cubo.3mf", - _showInfiniteGrid: false + _showLimitedGrid: true } WGL.initcall(options); - document.getElementById("refre_slider").oninput = function() { - myFunction() - }; + //document.getElementById("refre_slider").oninput = function() { + // myFunction() + //}; - function myFunction() { - var val = document.getElementById("refre_slider").value //gets the oninput value - console.log(val) - WGL.refreshcall(1, val) - } + //function myFunction() { + // var val = document.getElementById("refre_slider").value //gets the oninput value + // console.log(val) + // WGL.refreshcall(1, val) + //} document.getElementById('btnRef').onclick = function() { diff --git a/WebGl/draw/webgl_drawVue.js b/WebGl/draw/webgl_drawVue.js index a7331e2..cb4c84d 100644 --- a/WebGl/draw/webgl_drawVue.js +++ b/WebGl/draw/webgl_drawVue.js @@ -26,11 +26,11 @@ var layer_list = []; const GLBox3D = new THREE.Box3(); // Box3D globale delle geometrie //init(); class webgl_original { - async initcall({ _dimX, _dimY, _fileName, _showInfiniteGrid}) { + async initcall({ _dimX, _dimY, _fileName, _showLimitedGrid}) { m_divStartDimX = _dimX; m_divStartDimY = _dimY; fName = _fileName; - m_bGrid_v1 = _showInfiniteGrid; + m_bGrid_v1 = _showLimitedGrid; //console.log(fName) setLoaders(); await init(); @@ -96,11 +96,11 @@ function setLoaders() { //if (useInSlider) { - mother.appendChild(sliderInput); - sliderInput.setAttribute('id', 'refre_slider'); - sliderInput.setAttribute('hidden', true); - sliderInput.type = 'range'; - sliderInput.min = '0'; + //mother.appendChild(sliderInput); + //sliderInput.setAttribute('id', 'refre_slider'); + //sliderInput.setAttribute('hidden', true); + //sliderInput.type = 'range'; + //sliderInput.min = '0'; //} mother.appendChild(spinContainer); //document.body.appendChild(spinContainer); From 95755b797a2d40f85747e751d41f89d18c667852 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Wed, 4 Oct 2023 08:40:51 +0200 Subject: [PATCH 2/3] fix slider set max commentato --- 3MF_test/Web3D-Vue/Web3D_viewer/package-lock.json | 8 ++++---- 3MF_test/Web3D-Vue/Web3D_viewer/package.json | 2 +- WebGl/draw/webgl_drawVue.js | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/3MF_test/Web3D-Vue/Web3D_viewer/package-lock.json b/3MF_test/Web3D-Vue/Web3D_viewer/package-lock.json index 81c8091..48601eb 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.230927-beta.957" + "webgl-visualizer": "^1.2.231004-beta.837" }, "devDependencies": { "babel-core": "^6.26.0", @@ -9296,9 +9296,9 @@ } }, "node_modules/webgl-visualizer": { - "version": "1.2.230927-beta.957", - "resolved": "https://nexus.steamware.net/repository/npm-group/webgl-visualizer/-/webgl-visualizer-1.2.230927-beta.957.tgz", - "integrity": "sha512-AMfO0jBhaYOG4pa0iUSK06WByyIfsfJtwkreKJ+aqzrUcsvnu4PQwnWyeIV8lJu4nmS0KiMlAn/jYgaBAXT59g==", + "version": "1.2.231004-beta.837", + "resolved": "https://nexus.steamware.net/repository/npm-group/webgl-visualizer/-/webgl-visualizer-1.2.231004-beta.837.tgz", + "integrity": "sha512-ba7w7x7/81dthr0YSc73LBpd5RZOuMVQNb7BbIJ6tx5IzkPHZ6ZZpDiFXJEqmlvs9D5qN+3knpr7vKxTAKvGTw==", "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 5dc3967..5ff2208 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.230927-beta.957" + "webgl-visualizer": "^1.2.231004-beta.837" }, "browserslist": [ "> 1%", diff --git a/WebGl/draw/webgl_drawVue.js b/WebGl/draw/webgl_drawVue.js index cb4c84d..59d333e 100644 --- a/WebGl/draw/webgl_drawVue.js +++ b/WebGl/draw/webgl_drawVue.js @@ -217,9 +217,9 @@ function AdaptSceneToContest() { scene.background = new THREE.Color(0xa0a0a0); //if (useInSlider) { - document.getElementById("refre_slider").max = layer_list[layer_list.length - 1].children[0].nLayer; - document.getElementById("refre_slider").value = layer_list[layer_list.length - 1].children[0].nLayer; - document.getElementById("refre_slider").removeAttribute('hidden'); + //document.getElementById("refre_slider").max = layer_list[layer_list.length - 1].children[0].nLayer; + //document.getElementById("refre_slider").value = layer_list[layer_list.length - 1].children[0].nLayer; + //document.getElementById("refre_slider").removeAttribute('hidden'); //} for (var i = 0; i < layer_list.length; ++i) { From 85be4a7b172522f2cf28feb6e3b47f8c1c383fb2 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Wed, 4 Oct 2023 08:43:01 +0200 Subject: [PATCH 3/3] aggiornamento versioni pacchetto installato --- 3MF_test/Web3D-Vue/Web3D_viewer/package-lock.json | 8 ++++---- 3MF_test/Web3D-Vue/Web3D_viewer/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/3MF_test/Web3D-Vue/Web3D_viewer/package-lock.json b/3MF_test/Web3D-Vue/Web3D_viewer/package-lock.json index 48601eb..fe37ef0 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.231004-beta.837" + "webgl-visualizer": "^1.2.231004-beta.841" }, "devDependencies": { "babel-core": "^6.26.0", @@ -9296,9 +9296,9 @@ } }, "node_modules/webgl-visualizer": { - "version": "1.2.231004-beta.837", - "resolved": "https://nexus.steamware.net/repository/npm-group/webgl-visualizer/-/webgl-visualizer-1.2.231004-beta.837.tgz", - "integrity": "sha512-ba7w7x7/81dthr0YSc73LBpd5RZOuMVQNb7BbIJ6tx5IzkPHZ6ZZpDiFXJEqmlvs9D5qN+3knpr7vKxTAKvGTw==", + "version": "1.2.231004-beta.841", + "resolved": "https://nexus.steamware.net/repository/npm-group/webgl-visualizer/-/webgl-visualizer-1.2.231004-beta.841.tgz", + "integrity": "sha512-NuhXMyLzysrLIn+OCRNgtYg4vyOTQOrsXrL5XXKLqxz5tvSqORY7CED6+B6/q6urtR+Fowsie+LKWBnG3j7ceA==", "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 5ff2208..f92b384 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.231004-beta.837" + "webgl-visualizer": "^1.2.231004-beta.841" }, "browserslist": [ "> 1%",