Browse Source

enable wboit by default, use devicePixelRatio by default

David Sehnal 4 years ago
parent
commit
47a3dfcef9
3 changed files with 10 additions and 5 deletions
  1. 8 3
      src/apps/viewer/index.ts
  2. 1 1
      src/mol-canvas3d/canvas3d.ts
  3. 1 1
      src/mol-plugin/config.ts

+ 8 - 3
src/apps/viewer/index.ts

@@ -68,7 +68,7 @@ const DefaultViewerOptions = {
     layoutShowLog: true,
     layoutShowLeftPanel: true,
     disableAntialiasing: false,
-    pixelScale: 1,
+    pixelScale: void 0 as number | undefined,
     enableWboit: false,
 
     viewportShowExpand: PluginConfig.Viewport.ShowExpand.defaultValue,
@@ -114,12 +114,17 @@ export class Viewer {
             },
             components: {
                 ...DefaultPluginSpec.components,
-                remoteState: o.layoutShowRemoteState ? 'default' : 'none'
+                remoteState: o.layoutShowRemoteState ? 'default' : 'none',
+                viewport: {
+                    canvas3d: {
+                        multiSample: { mode: 'on', sampleLevel: 2  }
+                    }
+                }
             },
             config: [
                 [PluginConfig.General.DisableAntialiasing, o.disableAntialiasing],
                 [PluginConfig.General.PixelScale, o.pixelScale],
-                [PluginConfig.General.EnableWboit, o.enableWboit],
+                [PluginConfig.General.EnableWboit, true || o.enableWboit],
                 [PluginConfig.Viewport.ShowExpand, o.viewportShowExpand],
                 [PluginConfig.Viewport.ShowControls, o.viewportShowControls],
                 [PluginConfig.Viewport.ShowSettings, o.viewportShowSettings],

+ 1 - 1
src/mol-canvas3d/canvas3d.ts

@@ -149,7 +149,7 @@ namespace Canvas3D {
     export interface DragEvent { current: Representation.Loci, buttons: ButtonsType, button: ButtonsType.Flag, modifiers: ModifiersKeys, pageStart: Vec2, pageEnd: Vec2 }
     export interface ClickEvent { current: Representation.Loci, buttons: ButtonsType, button: ButtonsType.Flag, modifiers: ModifiersKeys, page?: Vec2, position?: Vec3 }
 
-    export function fromCanvas(canvas: HTMLCanvasElement, props: Partial<Canvas3DProps> = {}, attribs: Partial<{ antialias: boolean, pixelScale: number, pickScale: number, enableWboit: boolean }> = {}) {
+    export function fromCanvas(canvas: HTMLCanvasElement, props: Partial<Canvas3DProps> = {}, attribs: Partial<{ antialias: boolean, pixelScale?: number, pickScale: number, enableWboit: boolean }> = {}) {
         const gl = getGLContext(canvas, {
             alpha: true,
             antialias: attribs.antialias ?? true,

+ 1 - 1
src/mol-plugin/config.ts

@@ -24,7 +24,7 @@ export const PluginConfig = {
     General: {
         IsBusyTimeoutMs: item('plugin-config.is-busy-timeout', 750),
         DisableAntialiasing: item('plugin-config.disable-antialiasing', false),
-        PixelScale: item('plugin-config.pixel-scale', 1),
+        PixelScale: item<number | undefined>('plugin-config.pixel-scale', void 0),
         EnableWboit: item('plugin-config.enable-wboit', false)
     },
     State: {