From 9545999270b035826cfb717732b09cd8d0778e4e Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Thu, 19 Oct 2023 15:03:38 +0200
Subject: [PATCH] fix aggiunte opzioni

---
 .../Web3D-Vue/Web3D_viewer/package-lock.json    |  8 ++++----
 3MF_test/Web3D-Vue/Web3D_viewer/package.json    |  2 +-
 WebGl/draw/webgl_drawVue.js                     | 17 +++++++++--------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/3MF_test/Web3D-Vue/Web3D_viewer/package-lock.json b/3MF_test/Web3D-Vue/Web3D_viewer/package-lock.json
index 11ae5ef..d1f8422 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.1225"
+        "webgl-visualizer": "^1.2.231019-beta.1237"
       },
       "devDependencies": {
         "babel-core": "^6.26.0",
@@ -9296,9 +9296,9 @@
       }
     },
     "node_modules/webgl-visualizer": {
-      "version": "1.2.231019-beta.1225",
-      "resolved": "https://nexus.steamware.net/repository/npm-group/webgl-visualizer/-/webgl-visualizer-1.2.231019-beta.1225.tgz",
-      "integrity": "sha512-PoPeL3nXGVkLbvrwz9X9uFUimfBarxh3/w7NQ8ShKDtbHtgTL36KL2/ripnnHGqR0uGe06DJDsaPC4Xe+4slQw==",
+      "version": "1.2.231019-beta.1237",
+      "resolved": "https://nexus.steamware.net/repository/npm-group/webgl-visualizer/-/webgl-visualizer-1.2.231019-beta.1237.tgz",
+      "integrity": "sha512-qjV1loIAgopaMfMr5QHuRH7mIiyHBI3obygjsKiG8CFqGwGETobhUVlEQ6GlgDuZyRTZWrKRVY4Clr7/XW5Y/A==",
       "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 90bb092..9ea81c8 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.1225"
+    "webgl-visualizer": "^1.2.231019-beta.1237"
   },
   "browserslist": [
     "> 1%",
diff --git a/WebGl/draw/webgl_drawVue.js b/WebGl/draw/webgl_drawVue.js
index f190036..5124b0b 100644
--- a/WebGl/draw/webgl_drawVue.js
+++ b/WebGl/draw/webgl_drawVue.js
@@ -12,7 +12,7 @@ var m_divStartDimY = 400;
 var fName = "Cubo.3mf";
 //var fileType = "3MF";
 
-var fileType = '3DM';
+var fileType = '3MF';
 
 var m_nApproxIndex = 5;
 
@@ -55,13 +55,18 @@ var layer_list = [];
 const GLBox3D = new THREE.Box3(); // Box3D globale delle geometrie
 //init();
 class webgl_original {
-    async initcall({ _dimX, _dimY, _fileName, _showInfiniteGrid, _fileType, _modelsDir}) {
+    async initcall({ _dimX, _dimY, _fileName, _showInfiniteGrid, _fileType, _modelsDir, _approxIndex, _showFrame, _frameLen, _frameFat, _frameType}) {
         m_divStartDimX = _dimX;
         m_divStartDimY = _dimY;
         fName = _fileName;
         m_bInfGrid = _showInfiniteGrid;
         modelsDir = _modelsDir;
         fileType = _fileType;
+        m_nApproxIndex = _approxIndex;
+        m_bShowFrame = _showFrame;
+        m_lFrameLen = _frameLen;
+        m_dFrameFat = _frameFat;
+        m_bFrameType = _frameType;
         //console.log(fName)
         setLoaders();
         if(fileType.toUpperCase() == '3MF')
@@ -101,11 +106,7 @@ export { webgl_original }
 function setLoaders() {
     //<input type="range" class="form-range" id="customRange1">
 
-    let mother = document.getElementById('WebGL-Export');
-    if(fileType.toUpperCase() == '3DM')
-    {
-       mother = document.getElementById('WebGL-Export')  
-    }
+    const mother = document.getElementById('WebGL-Export');
 
     const spinContainer = document.createElement('div');
     const sliderInput = document.createElement('input');
@@ -191,7 +192,7 @@ function setLoaders() {
             cDiv[i].style.backgroundSize = 'contain';
             // cDiv[i].style.backgroundColor = '#000';
 
-            cDiv[i].style.backgroundImage = 'url(../node_modules/webgl-visualizer/styles/LogoClassic_NoText.png)'
+            // cDiv[i].style.backgroundImage = 'url(../node_modules/webgl-visualizer/styles/LogoClassic_NoText.png)'
         }
     }