Don't block whole screen when loading models

Update Xeokit viewer to 1.6.8 and SDK to 0.9.0
pull/8146/head
Wieland Lindenthal 5 years ago committed by Oliver Günther
parent a4d04cf9c1
commit 2ec0b8218e
No known key found for this signature in database
GPG Key ID: A3A8BDAD7C0C552C
  1. 14
      frontend/npm-shrinkwrap.json
  2. 4
      frontend/package.json
  3. 4
      frontend/src/app/modules/bim/ifc_models/ifc-viewer/ifc-viewer.component.ts
  4. 8
      modules/bim/app/assets/stylesheets/bim/ifc_viewer/loading_modal.sass

@ -3353,16 +3353,16 @@
} }
}, },
"@xeokit/xeokit-sdk": { "@xeokit/xeokit-sdk": {
"version": "0.8.8", "version": "0.9.0",
"resolved": "https://registry.npmjs.org/@xeokit/xeokit-sdk/-/xeokit-sdk-0.8.8.tgz", "resolved": "https://registry.npmjs.org/@xeokit/xeokit-sdk/-/xeokit-sdk-0.9.0.tgz",
"integrity": "sha512-e+HTZajykFolCeWm5CIT7HSzOYoRhCxbecpjsXlmfEUYeFZ2Rpxc8CbI/vo62DjwobjFOB/dtyz3xJ2uWkogGg==" "integrity": "sha512-DfsKm0gQabVemBp6wEa2I0g370bI58wZxA0I6Bv2DhyXlg0VrvAT/Uw8yDUmM76oqbs3NGmxfY0Nv7KcewtQqQ=="
}, },
"@xeokit/xeokit-viewer": { "@xeokit/xeokit-viewer": {
"version": "1.6.4", "version": "1.6.8",
"resolved": "https://registry.npmjs.org/@xeokit/xeokit-viewer/-/xeokit-viewer-1.6.4.tgz", "resolved": "https://registry.npmjs.org/@xeokit/xeokit-viewer/-/xeokit-viewer-1.6.8.tgz",
"integrity": "sha512-HgY9ceC+Nb6pBxCKlpcQo7cQearilXyVjPI9u5r27ZtHxkm1JDaAVInrDUTsFcpOyL2JBE17Xyb5kfzv9/FujQ==", "integrity": "sha512-+iVX3U3yG8vWtoJ2Icj1cMWhk+A3CbJLlY4SmPt2irn9My1dYUOclK0x7rQ9SXx7FGgEglZ3jTQ3/SnBbP+OLw==",
"requires": { "requires": {
"@xeokit/xeokit-sdk": "^0.8.8" "@xeokit/xeokit-sdk": "^0.9.0"
} }
}, },
"@xtuc/ieee754": { "@xtuc/ieee754": {

@ -71,8 +71,8 @@
"@uirouter/core": "^6.0.4", "@uirouter/core": "^6.0.4",
"@uirouter/rx": "^0.6.5", "@uirouter/rx": "^0.6.5",
"@w11k/ngx-componentdestroyed": "^5.0.2", "@w11k/ngx-componentdestroyed": "^5.0.2",
"@xeokit/xeokit-sdk": "^0.8.8", "@xeokit/xeokit-sdk": "^0.9.3",
"@xeokit/xeokit-viewer": "^1.6.4", "@xeokit/xeokit-viewer": "^1.6.9",
"amdefine": "^1.0.0", "amdefine": "^1.0.0",
"angular-dragula": "^1.2.8", "angular-dragula": "^1.2.8",
"atoa": "^1.0.0", "atoa": "^1.0.0",

@ -33,7 +33,7 @@ import {IFCViewerService} from "core-app/modules/bim/ifc_models/ifc-viewer/ifc-v
@Component({ @Component({
selector: 'ifc-viewer', selector: 'ifc-viewer',
template: ` template: `
<div class="ifc-model-viewer--container"> <div class="ifc-model-viewer--container xeokit-busy-modal-backdrop">
<div class="ifc-model-viewer--toolbar-container"></div> <div class="ifc-model-viewer--toolbar-container"></div>
<canvas class="ifc-model-viewer--model-canvas"></canvas> <canvas class="ifc-model-viewer--model-canvas"></canvas>
</div> </div>
@ -59,7 +59,7 @@ export class IFCViewerComponent implements OnInit, OnDestroy {
explorerElement: jQuery(".ifc-model-viewer--tree-panel")[0], // Left panel explorerElement: jQuery(".ifc-model-viewer--tree-panel")[0], // Left panel
toolbarElement: element.find(".ifc-model-viewer--toolbar-container")[0], // Toolbar toolbarElement: element.find(".ifc-model-viewer--toolbar-container")[0], // Toolbar
navCubeCanvasElement: element.find(".ifc-model-viewer--nav-cube-canvas")[0], navCubeCanvasElement: element.find(".ifc-model-viewer--nav-cube-canvas")[0],
sectionPlanesOverviewCanvasElement: element.find(".ifc-model-viewer--section-planes-overview-canvas")[0] busyModelBackdropElement: document.querySelector(".xeokit-busy-modal-backdrop")
}, },
this.Gon.get('ifc_models', 'projects') as any[] this.Gon.get('ifc_models', 'projects') as any[]
); );

@ -1,14 +1,16 @@
.xeokit-busy-modal-backdrop
position: relative
.xeokit-busy-modal .xeokit-busy-modal
display: none display: none
position: fixed position: absolute
z-index: 1000000
padding-top: 100px padding-top: 100px
left: 0 left: 0
top: 0 top: 0
width: 100% width: 100%
height: 100% height: 100%
overflow: auto
background-color: rgba(0, 0, 0, 0.4) background-color: rgba(0, 0, 0, 0.4)
z-index: 30 // OpenProject special
.xeokit-busy-modal-content .xeokit-busy-modal-content
position: relative position: relative

Loading…
Cancel
Save