diff --git a/CHANGELOG.md b/CHANGELOG.md index 894e8bd12bcfa09bb59879b6910f7e9bfdd23e54..396e816250bca309154153069f8eff90a9c27f57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ Note that since we don't clearly distinguish between a public and private interf ## [Unreleased] - Add ``PluginFeatureDetection`` and disable WBOIT in Safari 15. +- Add ``disable-wboit`` Viewer GET param +- Add ``prefer-webgl1`` Viewer GET param ## [v3.0.0-dev.7] - 2021-12-20 diff --git a/src/apps/viewer/index.html b/src/apps/viewer/index.html index 21c287ff5824233b66922127583c5150ae1c732d..d5e4b11e43a9d8bb3dea64c6a94906b00a78366e 100644 --- a/src/apps/viewer/index.html +++ b/src/apps/viewer/index.html @@ -56,6 +56,8 @@ var pixelScale = getParam('pixel-scale', '[^&]+').trim(); var pickScale = getParam('pick-scale', '[^&]+').trim(); var pickPadding = getParam('pick-padding', '[^&]+').trim(); + var disableWboit = getParam('disable-wboit', '[^&]+').trim() === '1'; + var preferWebgl1 = getParam('prefer-webgl1', '[^&]+').trim() === '1'; molstar.Viewer.create('app', { layoutShowControls: !hideControls, @@ -69,6 +71,8 @@ pixelScale: parseFloat(pixelScale) || 1, pickScale: parseFloat(pickScale) || 0.25, pickPadding: isNaN(parseFloat(pickPadding)) ? 1 : parseFloat(pickPadding), + enableWboit: !disableWboit, + preferWebgl1: preferWebgl1, }).then(viewer => { var snapshotId = getParam('snapshot-id', '[^&]+').trim(); if (snapshotId) viewer.setRemoteSnapshot(snapshotId); diff --git a/src/apps/viewer/index.ts b/src/apps/viewer/index.ts index 9a10546d3c157b7515ae561dee2a15f3a01e38da..823de49342c70862f92985e445933e5670a03d7f 100644 --- a/src/apps/viewer/index.ts +++ b/src/apps/viewer/index.ts @@ -84,6 +84,7 @@ const DefaultViewerOptions = { pickScale: PluginConfig.General.PickScale.defaultValue, pickPadding: PluginConfig.General.PickPadding.defaultValue, enableWboit: PluginConfig.General.EnableWboit.defaultValue, + preferWebgl1: PluginConfig.General.PreferWebGl1.defaultValue, viewportShowExpand: PluginConfig.Viewport.ShowExpand.defaultValue, viewportShowControls: PluginConfig.Viewport.ShowControls.defaultValue, @@ -144,6 +145,7 @@ export class Viewer { [PluginConfig.General.PickScale, o.pickScale], [PluginConfig.General.PickPadding, o.pickPadding], [PluginConfig.General.EnableWboit, o.enableWboit], + [PluginConfig.General.PreferWebGl1, o.preferWebgl1], [PluginConfig.Viewport.ShowExpand, o.viewportShowExpand], [PluginConfig.Viewport.ShowControls, o.viewportShowControls], [PluginConfig.Viewport.ShowSettings, o.viewportShowSettings],