From 4b45f8ea3929186e276651785f20447d41d26fb5 Mon Sep 17 00:00:00 2001 From: lindsay Date: Fri, 22 Sep 2023 01:20:14 +0200 Subject: [PATCH] Example tweaks --- examples/buildings/xkt_dtx_IfcOpenHouse4.html | 4 ++++ examples/buildings/xkt_dtx_MAP.html | 4 ++++ examples/buildings/xkt_vbo_DemoProjekt.html | 4 ++++ examples/buildings/xkt_vbo_HolterTower.html | 4 ++++ examples/buildings/xkt_vbo_IfcOpenHouse4.html | 4 ++++ .../buildings/xkt_vbo_OTCCenferenceCenter.html | 6 ++++++ examples/cities/XKT_Lyon.html | 6 +----- examples/cities/XKT_dtx_Lyon.html | 4 ++++ examples/lidar/xkt_MAP.html | 4 ++++ .../navigation/camera_CameraPathAnimation.html | 16 +++++++++++++--- ...amera_CameraPathAnimation_dataTextures.html | 18 ++++++++++++------ 11 files changed, 60 insertions(+), 14 deletions(-) diff --git a/examples/buildings/xkt_dtx_IfcOpenHouse4.html b/examples/buildings/xkt_dtx_IfcOpenHouse4.html index 06ef0727c..1029fde7f 100644 --- a/examples/buildings/xkt_dtx_IfcOpenHouse4.html +++ b/examples/buildings/xkt_dtx_IfcOpenHouse4.html @@ -178,6 +178,10 @@

Resources

viewer.scene.camera.look = [6.599999999999998, 8.34099990051474, -4.159999575600315]; viewer.scene.camera.up = [-0.2820584034861215, 0.9025563895259413, -0.3253229483893775]; + viewer.cameraControl.enablePivotSphere({ + size: 1 + }); + new NavCubePlugin(viewer, { canvasId: "myNavCubeCanvas", visible: true, diff --git a/examples/buildings/xkt_dtx_MAP.html b/examples/buildings/xkt_dtx_MAP.html index 87c91d3e9..2198e679d 100644 --- a/examples/buildings/xkt_dtx_MAP.html +++ b/examples/buildings/xkt_dtx_MAP.html @@ -179,6 +179,10 @@

Resources

viewer.scene.camera.look=[1842009.4968455553, 9.685518291306686, -5173295.851503017]; viewer.scene.camera.up=[0.011650847910481935, 0.9999241456889114, -0.003995073374452514]; + viewer.cameraControl.enablePivotSphere({ + size: 1 + }); + new NavCubePlugin(viewer, { canvasId: "myNavCubeCanvas", visible: true, diff --git a/examples/buildings/xkt_vbo_DemoProjekt.html b/examples/buildings/xkt_vbo_DemoProjekt.html index d305c3e98..6f4d89596 100644 --- a/examples/buildings/xkt_vbo_DemoProjekt.html +++ b/examples/buildings/xkt_vbo_DemoProjekt.html @@ -182,6 +182,10 @@

Resources

saoEnabled: true }); + viewer.cameraControl.enablePivotSphere({ + size: 1 + }); + viewer.camera.eye = [102.07185264355974, 45.23873322531372, -54.1001537318987] viewer.camera.look = [35.0291287591034, -3.5295781673428905, -20.312957533628705] viewer.camera.up = [-0.48646319926706455, 0.8385999559445908, 0.24516049773277654] diff --git a/examples/buildings/xkt_vbo_HolterTower.html b/examples/buildings/xkt_vbo_HolterTower.html index 6c12cb0ad..557aa3e4a 100644 --- a/examples/buildings/xkt_vbo_HolterTower.html +++ b/examples/buildings/xkt_vbo_HolterTower.html @@ -175,6 +175,10 @@

Resources

viewer.scene.camera.look = [6.599999999999998, 8.34099990051474, -4.159999575600315]; viewer.scene.camera.up = [-0.2820584034861215, 0.9025563895259413, -0.3253229483893775]; + viewer.cameraControl.enablePivotSphere({ + size: 1 + }); + new NavCubePlugin(viewer, { canvasId: "myNavCubeCanvas", visible: true, diff --git a/examples/buildings/xkt_vbo_IfcOpenHouse4.html b/examples/buildings/xkt_vbo_IfcOpenHouse4.html index 074ee5c50..93c97946c 100644 --- a/examples/buildings/xkt_vbo_IfcOpenHouse4.html +++ b/examples/buildings/xkt_vbo_IfcOpenHouse4.html @@ -173,6 +173,10 @@

Resources

edges: true }); + viewer.cameraControl.enablePivotSphere({ + size: 1 + }); + viewer.scene.camera.eye = [14.915582703146043, 14.396781491179095, 5.431098754133695]; viewer.scene.camera.look = [6.599999999999998, 8.34099990051474, -4.159999575600315]; viewer.scene.camera.up = [-0.2820584034861215, 0.9025563895259413, -0.3253229483893775]; diff --git a/examples/buildings/xkt_vbo_OTCCenferenceCenter.html b/examples/buildings/xkt_vbo_OTCCenferenceCenter.html index e58ac921c..36854040e 100644 --- a/examples/buildings/xkt_vbo_OTCCenferenceCenter.html +++ b/examples/buildings/xkt_vbo_OTCCenferenceCenter.html @@ -215,6 +215,12 @@

Resources

objectDefaults: { "IfcPlate": { opacity: 0.3 // These are used as windows in this model - make transparent + }, + "IfcWindow": { + opacity: 0.4 + }, + "IfcSpace": { + opacity: 0.4 } } }); diff --git a/examples/cities/XKT_Lyon.html b/examples/cities/XKT_Lyon.html index 36ed5d7f8..e22e5d529 100644 --- a/examples/cities/XKT_Lyon.html +++ b/examples/cities/XKT_Lyon.html @@ -91,8 +91,7 @@

Resources

const viewer = new Viewer({ canvasId: "myCanvas", - transparent: true, - logarithmicDepthBufferEnabled: false // <<--- Enable logarithmic depth buffer + transparent: true }); //------------------------------------------------------------------------------------------------------------------ @@ -132,9 +131,6 @@

Resources

// Show a dot about the pivot point, whenever we orbit the Camera //------------------------------------------------------------------------------------------------------------------ - viewer.cameraControl.followPointer = true; - viewer.cameraControl.smartPivot = true; - const pivotElement = document.createRange().createContextualFragment("
").firstChild; document.body.appendChild(pivotElement); viewer.cameraControl.pivotElement = pivotElement; diff --git a/examples/cities/XKT_dtx_Lyon.html b/examples/cities/XKT_dtx_Lyon.html index 7dcfba490..623fd7d4d 100644 --- a/examples/cities/XKT_dtx_Lyon.html +++ b/examples/cities/XKT_dtx_Lyon.html @@ -98,6 +98,10 @@

Resources

transparent: true }); + viewer.cameraControl.enablePivotSphere({ + size: 1 + }); + // Enable data texture model representation for // all subsequently created SceneModels (unless they override it to be disabled) diff --git a/examples/lidar/xkt_MAP.html b/examples/lidar/xkt_MAP.html index fc0f35323..75b066024 100644 --- a/examples/lidar/xkt_MAP.html +++ b/examples/lidar/xkt_MAP.html @@ -96,6 +96,10 @@

Resources

transparent: true }); + viewer.cameraControl.enablePivotSphere({ + size: 1 + }); + new NavCubePlugin(viewer, { canvasId: "myNavCubeCanvas", visible: true, diff --git a/examples/navigation/camera_CameraPathAnimation.html b/examples/navigation/camera_CameraPathAnimation.html index 594bd2709..00d7d7675 100644 --- a/examples/navigation/camera_CameraPathAnimation.html +++ b/examples/navigation/camera_CameraPathAnimation.html @@ -78,8 +78,7 @@

Resources

const viewer = new Viewer({ canvasId: "myCanvas", - transparent: true, - dtxEnabled: true + transparent: true }); viewer.camera.eye = [10.449999809265137, 17.3799991607666, -98.30999755859375]; @@ -114,7 +113,18 @@

Resources

const sceneModel = xktLoader.load({ id: "myModel", src: "../../assets/models/xkt/v8/ifc/OTCConferenceCenter.ifc.xkt", - edges: false + edges: false, + objectDefaults: { + "IfcPlate": { + opacity: 0.3 // These are used as windows in this model - make transparent + }, + "IfcWindow": { + opacity: 0.4 + }, + "IfcSpace": { + opacity: 0.4 + } + } }); // new Skybox(viewer.scene, { diff --git a/examples/navigation/camera_CameraPathAnimation_dataTextures.html b/examples/navigation/camera_CameraPathAnimation_dataTextures.html index 2210bf3a7..c196f19f3 100644 --- a/examples/navigation/camera_CameraPathAnimation_dataTextures.html +++ b/examples/navigation/camera_CameraPathAnimation_dataTextures.html @@ -78,7 +78,8 @@

Resources

const viewer = new Viewer({ canvasId: "myCanvas", - transparent: true + transparent: true, + dtsEnabled: true }); viewer.scene.sao.enabled = true; // Higher-quality SAO settings @@ -119,11 +120,16 @@

Resources

src: "../../assets/models/xkt/v8/ifc/OTCConferenceCenter.ifc.xkt", edges: true, enableSAO: true, - useDataTextures: { - enableViewFrustumCulling: true, - targetLodFps: 50, - disableVertexWelding: true, - disableIndexRebucketing: true + objectDefaults: { + "IfcPlate": { + opacity: 0.3 // These are used as windows in this model - make transparent + }, + "IfcWindow": { + opacity: 0.4 + }, + "IfcSpace": { + opacity: 0.4 + } } });