diff --git a/package-lock.json b/package-lock.json
index f4af8100..f22ee03d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,23 +1,20 @@
{
"name": "online-3d-viewer",
- "version": "0.13.0",
+ "version": "0.15.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "online-3d-viewer",
- "version": "0.13.0",
+ "version": "0.15.0",
"license": "MIT",
"dependencies": {
"@simonwep/pickr": "1.9.0",
"fflate": "0.8.2",
- "occt-import-js": "0.0.21",
- "three": "0.163.0",
- "web-ifc": "0.0.44"
+ "three": "0.163.0"
},
"devDependencies": {
"@types/node": "^20.1.0",
- "draco3d": "1.5.7",
"esbuild": "^0.20.0",
"eslint": "^8.29.0",
"eslint-plugin-unused-imports": "^3.0.0",
@@ -29,7 +26,8 @@
"rollup": "^4.0.2",
"run-python3": "^0.0.5",
"svgo": "^3.0.2",
- "typescript": "^5.0.4"
+ "typescript": "^5.0.4",
+ "web-ifc": "0.0.44"
}
},
"node_modules/@babel/parser": {
@@ -2526,12 +2524,6 @@
"tslib": "^2.0.3"
}
},
- "node_modules/draco3d": {
- "version": "1.5.7",
- "resolved": "https://registry.npmjs.org/draco3d/-/draco3d-1.5.7.tgz",
- "integrity": "sha512-m6WCKt/erDXcw+70IJXnG7M3awwQPAsZvJGX5zY7beBqpELw6RDGkYVU0W43AFxye4pDZ5i2Lbyc/NNGqwjUVQ==",
- "dev": true
- },
"node_modules/emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -4515,11 +4507,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/occt-import-js": {
- "version": "0.0.21",
- "resolved": "https://registry.npmjs.org/occt-import-js/-/occt-import-js-0.0.21.tgz",
- "integrity": "sha512-na+clmW5OmkEeZDtEVKnQNG9l3GIdEZSCN36lYIt+yJ3OM2MM8t5BYYI9Lrqb7sDPLP/Dt6HkjCNGlEd5JKFgQ=="
- },
"node_modules/omggif": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.10.tgz",
@@ -5920,6 +5907,7 @@
"version": "0.0.44",
"resolved": "https://registry.npmjs.org/web-ifc/-/web-ifc-0.0.44.tgz",
"integrity": "sha512-1Iz0zeYFVReE3ca72wIqCQeMQX3406ohJGcZrpnS3IevtKjqh7kLXJ5SrSW4C0IyaLhuLIuyLOFsBc6TeD38TA==",
+ "dev": true,
"dependencies": {
"web-ifc": "^0.0.43"
}
@@ -5927,7 +5915,8 @@
"node_modules/web-ifc/node_modules/web-ifc": {
"version": "0.0.43",
"resolved": "https://registry.npmjs.org/web-ifc/-/web-ifc-0.0.43.tgz",
- "integrity": "sha512-83rMzZTCZmlACjWYuZRci4GlaWh0hfoTJu/7VKSTOiTm+gAT06fLkIrAqyeOlZnZt/AyY4+IQkPm5RYs6PZPNA=="
+ "integrity": "sha512-83rMzZTCZmlACjWYuZRci4GlaWh0hfoTJu/7VKSTOiTm+gAT06fLkIrAqyeOlZnZt/AyY4+IQkPm5RYs6PZPNA==",
+ "dev": true
},
"node_modules/whatwg-encoding": {
"version": "2.0.0",
diff --git a/package.json b/package.json
index 69ef3d19..f62bca6a 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
"build_engine": "npm run update_engine_exports && esbuild source/engine/main.js --bundle --minify --global-name=OV --outfile=build/engine/o3dv.min.js",
"build_engine_module": "npm run update_engine_exports && rollup --config tools/rollup.js && tsc --project tools/tsconfig.json",
"build_website_dev": "esbuild source/website/index.js --bundle --minify --global-name=OV --sourcemap --loader:.ttf=file --loader:.woff=file --loader:.svg=file --outfile=build/website_dev/o3dv.website.min.js",
- "build_website": "esbuild source/website/index.js --bundle --minify --global-name=OV --loader:.ttf=file --loader:.woff=file --loader:.svg=file --outfile=build/website/o3dv.website.min.js",
+ "build_website": "esbuild source/website/index.js --bundle --minify --global-name=OV --loader:.ttf=file --loader:.woff=file --loader:.svg=file --outfile=build/website_dev/o3dv.website.min.js",
"update_engine_exports": "run-python3 tools/update_engine_exports.py"
},
"devDependencies": {
diff --git a/source/website/index.js b/source/website/index.js
index 07588bbc..a704eafc 100644
--- a/source/website/index.js
+++ b/source/website/index.js
@@ -48,14 +48,14 @@ export function RegisterToolbarPlugin (plugin)
export function StartWebsite ()
{
window.addEventListener ('load', () => {
- if (window.self !== window.top) {
- let noEmbeddingDiv = AddDiv (document.body, 'noembed');
- AddDiv (noEmbeddingDiv, null, Loc ('Embedding Online 3D Viewer in an iframe is not supported.'));
- let link = AddDomElement (noEmbeddingDiv, 'a', null, Loc ('Open Online 3D Viewer'));
- link.target = '_blank';
- link.href = window.self.location;
- return;
- }
+ // if (window.self !== window.top) {
+ // let noEmbeddingDiv = AddDiv (document.body, 'noembed');
+ // AddDiv (noEmbeddingDiv, null, Loc ('Embedding Online 3D Viewer in an iframe is not supported.'));
+ // let link = AddDomElement (noEmbeddingDiv, 'a', null, Loc ('Open Online 3D Viewer'));
+ // link.target = '_blank';
+ // link.href = window.self.location;
+ // return;
+ // }
document.getElementById ('intro_dragdrop_text').innerHTML = Loc ('Drag and drop 3D models here.');
document.getElementById ('intro_formats_title').innerHTML = Loc ('Check an example file:');
diff --git a/source/website/website.js b/source/website/website.js
index 45c38de8..196c34db 100644
--- a/source/website/website.js
+++ b/source/website/website.js
@@ -225,7 +225,7 @@ export class Website
this.InitDragAndDrop ();
this.InitSidebar ();
this.InitNavigator ();
- this.InitCookieConsent ();
+ // this.InitCookieConsent ();
this.viewer.SetMouseClickHandler (this.OnModelClicked.bind (this));
this.viewer.SetMouseMoveHandler (this.OnModelMouseMoved.bind (this));
diff --git a/website/index.html b/website/index.html
index c06fceb3..5daabda1 100644
--- a/website/index.html
+++ b/website/index.html
@@ -40,7 +40,7 @@