From 87bdcd2372b9e561c00a5bad9c06b12fd902f98f Mon Sep 17 00:00:00 2001
From: Alexander Rose <alexander.rose@weirdbyte.de>
Date: Wed, 29 Dec 2021 16:03:45 -0800
Subject: [PATCH] add prefer-webgl1 & disable-wboit Viewer GET params
---
CHANGELOG.md | 2 ++
src/apps/viewer/index.html | 4 ++++
src/apps/viewer/index.ts | 2 ++
3 files changed, 8 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 894e8bd12..396e81625 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 21c287ff5..d5e4b11e4 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 9a10546d3..823de4934 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],
--
GitLab