From 7f1270d67ec60eee69fa96128dcf9fe6c6de310f Mon Sep 17 00:00:00 2001 From: lindsay Date: Wed, 13 Sep 2023 20:54:46 +0200 Subject: [PATCH] Example tweaks --- examples/buildings/index.html | 1 + examples/buildings/web-ifc_vbo_MAPGroundFloor.html | 13 ++++++++++++- examples/buildings/xkt_dtx_HolterTower.html | 13 ++++++++++++- examples/buildings/xkt_dtx_MAP.html | 14 +++++++++++++- examples/buildings/xkt_dtx_Schependomlaan.html | 10 +++++++++- examples/buildings/xkt_vbo_HolterTower.html | 13 ++++++++++++- examples/buildings/xkt_vbo_IfcOpenHouse4.html | 10 ++++++++-- examples/buildings/xkt_vbo_MAP.html | 13 ++++++++++++- .../buildings/xkt_vbo_OTCCenferenceCenter.html | 3 ++- examples/buildings/xkt_vbo_Schependomlaan.html | 10 +++++++++- examples/indexOld.html | 4 ++-- 11 files changed, 92 insertions(+), 12 deletions(-) diff --git a/examples/buildings/index.html b/examples/buildings/index.html index 8853884ac..3d2f2e463 100644 --- a/examples/buildings/index.html +++ b/examples/buildings/index.html @@ -272,6 +272,7 @@ ["xkt_vbo_textures_HousePlan", "House Plan model with textures loaded from XKT into SceneModel"], ["xkt_vbo_federated_Clinic", "Viewing a federated BIM model loaded from XKT into SceneModels"], ["xkt_vbo_DemoProjekt", "Viewing a BIM model exported from ArchiCAD"], + ["xkt_vbo_OTCCenferenceCenter", "OTC Conference Center model, loaded from XKT into SceneModel"], "#XKT + Data Textures", diff --git a/examples/buildings/web-ifc_vbo_MAPGroundFloor.html b/examples/buildings/web-ifc_vbo_MAPGroundFloor.html index 63d9974eb..8fe4cb3c2 100644 --- a/examples/buildings/web-ifc_vbo_MAPGroundFloor.html +++ b/examples/buildings/web-ifc_vbo_MAPGroundFloor.html @@ -114,7 +114,18 @@

Resources

id: "myModel", src: "../../assets/models/ifc/19_rue_Marc_Antoine_Petit_Ground_floor.ifc", loadMetadata: false, - edges: true + edges: true, + objectDefaults: { + "IfcPlate": { + opacity: 0.3 + }, + "IfcWindow": { + opacity: 0.4 + }, + "IfcSpace": { + opacity: 0.4 + } + } }); sceneModel.on("loaded", ()=>{ diff --git a/examples/buildings/xkt_dtx_HolterTower.html b/examples/buildings/xkt_dtx_HolterTower.html index b8faf855a..35814ef98 100644 --- a/examples/buildings/xkt_dtx_HolterTower.html +++ b/examples/buildings/xkt_dtx_HolterTower.html @@ -212,7 +212,18 @@

Resources

src: "../../assets/models/xkt/v8/ifc/HolterTower.ifc.xkt", saoEnabled: true, edges: true, - dtxEnabled: true + dtxEnabled: true, + objectDefaults: { + "IfcPlate": { + opacity: 0.3 // These are used as windows in this model - make transparent + }, + "IfcWindow": { + opacity: 0.4 + }, + "IfcSpace": { + opacity: 0.4 + } + } }); sceneModel.on("loaded", ()=>{ diff --git a/examples/buildings/xkt_dtx_MAP.html b/examples/buildings/xkt_dtx_MAP.html index ab2e34dd2..87c91d3e9 100644 --- a/examples/buildings/xkt_dtx_MAP.html +++ b/examples/buildings/xkt_dtx_MAP.html @@ -169,6 +169,7 @@

Resources

const viewer = new Viewer({ canvasId: "myCanvas", + edges: true, transparent: true, saoEnabled: true, dtxEnabled: true // Enable data texture model representation @@ -213,7 +214,18 @@

Resources

metaModelSrc: "../../assets/models/xkt/v7/MAP/MAP.json", saoEnabled: true, edges: true, - dtxEnabled: true + dtxEnabled: true, + objectDefaults: { + "IfcPlate": { + opacity: 0.3 // These are used as windows in this model - make transparent + }, + "IfcWindow": { + opacity: 0.4 + }, + "IfcSpace": { + opacity: 0.4 + } + } }); const t0 = performance.now(); diff --git a/examples/buildings/xkt_dtx_Schependomlaan.html b/examples/buildings/xkt_dtx_Schependomlaan.html index d1cda2658..8fde3649d 100644 --- a/examples/buildings/xkt_dtx_Schependomlaan.html +++ b/examples/buildings/xkt_dtx_Schependomlaan.html @@ -211,7 +211,15 @@

Resources

src: "../../assets/models/xkt/v8/ifc/Schependomlaan.ifc.xkt", saoEnabled: true, edges: true, - dtxEnabled: true + dtxEnabled: true, + objectDefaults: { + "IfcPlate": { + opacity: 0.3 // These are used as windows in this model - make transparent + }, + "IfcWindow": { + opacity: 0.4 + } + } }); sceneModel.on("loaded", ()=>{ diff --git a/examples/buildings/xkt_vbo_HolterTower.html b/examples/buildings/xkt_vbo_HolterTower.html index c277d9d39..6c12cb0ad 100644 --- a/examples/buildings/xkt_vbo_HolterTower.html +++ b/examples/buildings/xkt_vbo_HolterTower.html @@ -209,7 +209,18 @@

Resources

src: "../../assets/models/xkt/v8/ifc/HolterTower.ifc.xkt", saoEnabled: true, edges: true, - dtxEnabled: false + dtxEnabled: false, + objectDefaults: { + "IfcPlate": { + opacity: 0.3 // These are used as windows in this model - make transparent + }, + "IfcWindow": { + opacity: 0.4 + }, + "IfcSpace": { + opacity: 0.4 + } + } }); sceneModel.on("loaded", ()=>{ diff --git a/examples/buildings/xkt_vbo_IfcOpenHouse4.html b/examples/buildings/xkt_vbo_IfcOpenHouse4.html index 06f8caef0..074ee5c50 100644 --- a/examples/buildings/xkt_vbo_IfcOpenHouse4.html +++ b/examples/buildings/xkt_vbo_IfcOpenHouse4.html @@ -169,7 +169,8 @@

Resources

const viewer = new Viewer({ canvasId: "myCanvas", transparent: true, - saoEnabled: true + saoEnabled: true, + edges: true }); viewer.scene.camera.eye = [14.915582703146043, 14.396781491179095, 5.431098754133695]; @@ -209,7 +210,12 @@

Resources

id: "myModel", src: "../../assets/models/xkt/v8/ifc/IfcOpenHouse4.ifc.xkt", saoEnabled: true, - edges: false + edges: true, + objectDefaults: { + "IfcPlate": { + opacity: 0.3 // These are used as windows in this model - make transparent + } + } }); sceneModel.on("loaded", ()=>{ diff --git a/examples/buildings/xkt_vbo_MAP.html b/examples/buildings/xkt_vbo_MAP.html index 3fd16e5b7..64a61144f 100644 --- a/examples/buildings/xkt_vbo_MAP.html +++ b/examples/buildings/xkt_vbo_MAP.html @@ -197,7 +197,18 @@

Resources

id: "myModel", src: "../../assets/models/xkt/v8/gltf/MAP.gltf.xkt", saoEnabled: true, - edges: false + edges: true, + objectDefaults: { + "IfcPlate": { + opacity: 0.3 // These are used as windows in this model - make transparent + }, + "IfcWindow": { + opacity: 0.4 + }, + "IfcSpace": { + opacity: 0.4 + } + } }); const t0 = performance.now(); diff --git a/examples/buildings/xkt_vbo_OTCCenferenceCenter.html b/examples/buildings/xkt_vbo_OTCCenferenceCenter.html index 08a060d7e..e58ac921c 100644 --- a/examples/buildings/xkt_vbo_OTCCenferenceCenter.html +++ b/examples/buildings/xkt_vbo_OTCCenferenceCenter.html @@ -169,7 +169,8 @@

Resources

const viewer = new Viewer({ canvasId: "myCanvas", transparent: true, - saoEnabled: true + saoEnabled: true, + edges: true }); viewer.scene.camera.eye = [14.915582703146043, 14.396781491179095, 5.431098754133695]; diff --git a/examples/buildings/xkt_vbo_Schependomlaan.html b/examples/buildings/xkt_vbo_Schependomlaan.html index 2f3bc5afb..53526e2ba 100644 --- a/examples/buildings/xkt_vbo_Schependomlaan.html +++ b/examples/buildings/xkt_vbo_Schependomlaan.html @@ -210,7 +210,15 @@

Resources

src: "../../assets/models/xkt/v8/ifc/Schependomlaan.ifc.xkt", saoEnabled: true, edges: false, - dtxEnabled: true + dtxEnabled: true, + objectDefaults: { + "IfcPlate": { + opacity: 0.3 // These are used as windows in this model - make transparent + }, + "IfcWindow": { + opacity: 0.4 + } + } }); sceneModel.on("loaded", ()=>{ diff --git a/examples/indexOld.html b/examples/indexOld.html index edc71ff53..ce78fd310 100644 --- a/examples/indexOld.html +++ b/examples/indexOld.html @@ -215,7 +215,7 @@ } #index_toggle:checked + .index-button { - left: 485px; + left: 530px; color: white; } @@ -225,7 +225,7 @@ } #index_toggle:checked ~ .viewSourceButton { - left: 485px; + left: 530px; } #index_toggle:checked ~ .content-container {