diff --git a/3MF_test/Web3D-Vue/Web3D_viewer/index.html b/3MF_test/Web3D-Vue/Web3D_viewer/index.html index 0c97ce2..18e6ccb 100644 --- a/3MF_test/Web3D-Vue/Web3D_viewer/index.html +++ b/3MF_test/Web3D-Vue/Web3D_viewer/index.html @@ -21,10 +21,11 @@ let options ={ _dimX : X, _dimY: Y, - _fileName: "Cubo.3mf", + _fileName: "Ex2.3dm", _showLimitedGrid: true, _isOrtographic: true, - _modelsDir: "./src/test3/" + _modelsDir: "./src/test3/", + _fileType: '3DM' } WGL.initcall(options); diff --git a/3MF_test/Web3D-Vue/Web3D_viewer/package-lock.json b/3MF_test/Web3D-Vue/Web3D_viewer/package-lock.json index 2b52b38..8711d95 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.231005-beta.942" + "webgl-visualizer": "^1.2.231019-beta.940" }, "devDependencies": { "babel-core": "^6.26.0", @@ -9296,9 +9296,9 @@ } }, "node_modules/webgl-visualizer": { - "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==", + "version": "1.2.231019-beta.940", + "resolved": "https://nexus.steamware.net/repository/npm-group/webgl-visualizer/-/webgl-visualizer-1.2.231019-beta.940.tgz", + "integrity": "sha512-IbwEFPbHqogiA0d6OYQc+sxVPehlsu9qO47VjQGjGZDr3WzlNGl4a4/7DmP1hTBRLGc5FJrD5Yzd48YOx31/kw==", "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 c3525b6..4acc3dd 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.231005-beta.942" + "webgl-visualizer": "^1.2.231019-beta.940" }, "browserslist": [ "> 1%", diff --git a/3MF_test/Web3D-Vue/Web3D_viewer/src/test3/Ex2.3dm b/3MF_test/Web3D-Vue/Web3D_viewer/src/test3/Ex2.3dm new file mode 100644 index 0000000..ab2cf20 Binary files /dev/null and b/3MF_test/Web3D-Vue/Web3D_viewer/src/test3/Ex2.3dm differ diff --git a/WebGl/draw/webgl_draw.js b/WebGl/draw/webgl_draw.js index f959333..3521d86 100644 --- a/WebGl/draw/webgl_draw.js +++ b/WebGl/draw/webgl_draw.js @@ -1,6 +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'; // VARIABILI DI CONTROLLO diff --git a/WebGl/jsm/loaders/3DMLoader.js b/WebGl/jsm/loaders/3DMLoader.js index c7d9bfe..327416e 100644 --- a/WebGl/jsm/loaders/3DMLoader.js +++ b/WebGl/jsm/loaders/3DMLoader.js @@ -24,7 +24,7 @@ import { RepeatWrapping, TextureLoader, DoubleSide -} from 'three'; +} from '../threeJsLib/three.module.js'; const _taskCache = new WeakMap(); diff --git a/WebGl/jsm/loaders/3MFLoader.js b/WebGl/jsm/loaders/3MFLoader.js index a331fd8..ab9ef28 100644 --- a/WebGl/jsm/loaders/3MFLoader.js +++ b/WebGl/jsm/loaders/3MFLoader.js @@ -20,7 +20,7 @@ import { RepeatWrapping, TextureLoader, SRGBColorSpace -} from 'three'; +} from '../threeJsLib/three.module.js'; import * as fflate from '../libs/fflate.module.js'; const COLOR_SPACE_3MF = SRGBColorSpace;