From 983ae4f8c2a240f3cb7daed4cc9be3f3c0c93e98 Mon Sep 17 00:00:00 2001
From: dsehnal <david.sehnal@gmail.com>
Date: Fri, 24 Dec 2021 11:21:15 +0100
Subject: [PATCH] PluginFeatureDetection and disable WBOIT in Safari
---
CHANGELOG.md | 2 ++
src/mol-plugin/config.ts | 30 +++---------------------------
src/mol-plugin/features.ts | 37 +++++++++++++++++++++++++++++++++++++
3 files changed, 42 insertions(+), 27 deletions(-)
create mode 100644 src/mol-plugin/features.ts
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7183eb73d..894e8bd12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ Note that since we don't clearly distinguish between a public and private interf
## [Unreleased]
+- Add ``PluginFeatureDetection`` and disable WBOIT in Safari 15.
+
## [v3.0.0-dev.7] - 2021-12-20
- Reduce number of created programs/shaders
diff --git a/src/mol-plugin/config.ts b/src/mol-plugin/config.ts
index 4e12347af..99fc21ae8 100644
--- a/src/mol-plugin/config.ts
+++ b/src/mol-plugin/config.ts
@@ -10,6 +10,7 @@ import { PluginContext } from './context';
import { PdbDownloadProvider } from '../mol-plugin-state/actions/structure';
import { EmdbDownloadProvider } from '../mol-plugin-state/actions/volume';
import { StructureRepresentationPresetProvider } from '../mol-plugin-state/builder/structure/representation-preset';
+import { PluginFeatureDetection } from './features';
export class PluginConfigItem<T = any> {
toString() { return this.key; }
@@ -19,31 +20,6 @@ export class PluginConfigItem<T = any> {
function item<T>(key: string, defaultValue?: T) { return new PluginConfigItem(key, defaultValue); }
-
-export function preferWebGl1() {
- if (typeof navigator === 'undefined' || typeof window === 'undefined') return false;
-
- // WebGL2 isn't working in MacOS 12.0.1 Safari 15.1, 15.2. It is working in Safari 15.4 tech preview, so disabling all versions before that.
- // prefer webgl 1 based on the userAgent substring
- const unpportedSafariVersions = [
- 'Version/15.1 Safari',
- 'Version/15.2 Safari',
- 'Version/15.3 Safari'
- ];
- if (unpportedSafariVersions.some(v => navigator.userAgent.indexOf(v) > 0)) {
- return true;
- }
-
- // Check for iOS device which enabled WebGL2 recently but it doesn't seem
- // to be full up to speed yet.
-
- // adapted from https://stackoverflow.com/questions/9038625/detect-if-device-is-ios
- const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
- const isAppleDevice = navigator.userAgent.includes('Macintosh');
- const isTouchScreen = navigator.maxTouchPoints >= 4; // true for iOS 13 (and hopefully beyond)
- return !(window as any).MSStream && (isIOS || (isAppleDevice && isTouchScreen));
-}
-
export const PluginConfig = {
item,
General: {
@@ -53,10 +29,10 @@ export const PluginConfig = {
PixelScale: item('plugin-config.pixel-scale', 1),
PickScale: item('plugin-config.pick-scale', 0.25),
PickPadding: item('plugin-config.pick-padding', 3),
- EnableWboit: item('plugin-config.enable-wboit', true),
+ EnableWboit: item('plugin-config.enable-wboit', PluginFeatureDetection.wboit),
// as of Oct 1 2021, WebGL 2 doesn't work on iOS 15.
// TODO: check back in a few weeks to see if it was fixed
- PreferWebGl1: item('plugin-config.prefer-webgl1', preferWebGl1()),
+ PreferWebGl1: item('plugin-config.prefer-webgl1', PluginFeatureDetection.preferWebGl1),
},
State: {
DefaultServer: item('plugin-state.server', 'https://webchem.ncbr.muni.cz/molstar-state'),
diff --git a/src/mol-plugin/features.ts b/src/mol-plugin/features.ts
new file mode 100644
index 000000000..ad04c71c6
--- /dev/null
+++ b/src/mol-plugin/features.ts
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author David Sehnal <david.sehnal@gmail.com>
+ */
+
+export const PluginFeatureDetection = {
+ get preferWebGl1() {
+ if (typeof navigator === 'undefined' || typeof window === 'undefined') return false;
+
+ // WebGL2 isn't working in MacOS 12.0.1 Safari 15.1, 15.2. It is working in Safari 15.4 tech preview, so disabling all versions before that.
+ // prefer webgl 1 based on the userAgent substring
+ const unpportedSafariVersions = [
+ 'Version/15.1 Safari',
+ 'Version/15.2 Safari',
+ 'Version/15.3 Safari'
+ ];
+ if (unpportedSafariVersions.some(v => navigator.userAgent.indexOf(v) > 0)) {
+ return true;
+ }
+
+ // Check for iOS device which enabled WebGL2 recently but it doesn't seem
+ // to be full up to speed yet.
+
+ // adapted from https://stackoverflow.com/questions/9038625/detect-if-device-is-ios
+ const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
+ const isAppleDevice = navigator.userAgent.includes('Macintosh');
+ const isTouchScreen = navigator.maxTouchPoints >= 4; // true for iOS 13 (and hopefully beyond)
+ return !(window as any).MSStream && (isIOS || (isAppleDevice && isTouchScreen));
+ },
+ get wboit() {
+ if (typeof navigator === 'undefined' || typeof window === 'undefined') return true;
+
+ // disable Wboit in Safari 15
+ return !/Version\/15.\d Safari/.test(navigator.userAgent);
+ }
+};
\ No newline at end of file
--
GitLab