Merge branch 'develop'

3MF_test/Web3D-Vue/Web3D_viewer/index.html

@@ -22,7 +22,9 @@
       _dimX : X,
       _dimY: Y,
       _fileName: "Cubo.3mf",
-      _showLimitedGrid: true
+      _showLimitedGrid: true,
+      _isOrtographic: true,
+      _modelsDir: "./src/test3/"
     }
 
     WGL.initcall(options);

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.841"
+        "webgl-visualizer": "^1.2.231005-beta.942"
       },
       "devDependencies": {
         "babel-core": "^6.26.0",
@@ -9296,9 +9296,9 @@
       }
     },
     "node_modules/webgl-visualizer": {
-      "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==",
+      "version": "1.2.231005-beta.942",
+      "resolved": "https://nexus.steamware.net/repository/npm-group/webgl-visualizer/-/webgl-visualizer-1.2.231005-beta.942.tgz",
+      "integrity": "sha512-Fbx6Ogvo6g7lbuqQaQX33toQcoLmCbpH3c6spOwg16t02JYW+F75IUbzyUvi1FW5HM5/yNqku6ci8yOYzroJQQ==",
       "license": "ISC"
     },
     "node_modules/webpack": {

3MF_test/Web3D-Vue/Web3D_viewer/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "vue": "^2.5.11",
-    "webgl-visualizer": "^1.2.231004-beta.841"
+    "webgl-visualizer": "^1.2.231005-beta.942"
   },
   "browserslist": [
     "> 1%",

WebGl/draw/webgl_drawVue.js

@@ -11,14 +11,15 @@ var m_bZoom = true;
 var m_bPan = true;
 var m_bRot = true;
 var m_bAutoRot = false;
-var m_bGrid_v1 = true ;
-var m_nCameraStartPos = 8 ;
+var m_bGrid_v1 = true;
+var m_nCameraStartPos = 8;
 //var useInSlider = false;
 var m_nCamPos = 0;
 var m_nStartL = 0;
 var m_nEndL = 0;
 var m_bIsOrtographic = true ;
 var counter = 0;
+var modelsDir = "";
 
 
 let activeCamera, scene, renderer, controls, ORIG, perspectiveCamera, orthographicCamera;
@@ -26,11 +27,13 @@ var layer_list = [];
 const GLBox3D = new THREE.Box3(); // Box3D globale delle geometrie
 //init();
 class webgl_original {
-    async initcall({ _dimX, _dimY, _fileName, _showLimitedGrid}) {
+    async initcall({ _dimX, _dimY, _fileName, _showLimitedGrid, _isOrtographic, _modelsDir}) {
         m_divStartDimX = _dimX;
         m_divStartDimY = _dimY;
         fName = _fileName;
         m_bGrid_v1 = _showLimitedGrid;
+        m_bIsOrtographic = _isOrtographic;
+        modelsDir = _modelsDir;
         //console.log(fName)
         //setLoaders();
         await init();
@@ -190,7 +193,7 @@ function init() {
     let startTime = performance.now();
     return new Promise(() => {
         setTimeout(() => {
-            loader.load('../node_modules/webgl-visualizer/models/3mf/' + fName, function (object) {
+            loader.load(modelsDir + fName, function (object) {
                 object.rotation.set(-Math.PI / 2, 0, 0);
                 object.traverse(function (child) {
                     child.castShadow = true;