diff --git a/src/mol-canvas3d/passes/draw.ts b/src/mol-canvas3d/passes/draw.ts index 4c3150c19b3de414dc422c3f14b19fec72fd1718..7fd53fd90c73e74b2a4bac3e9c730286971569a8 100644 --- a/src/mol-canvas3d/passes/draw.ts +++ b/src/mol-canvas3d/passes/draw.ts @@ -11,7 +11,6 @@ import Scene from '../../mol-gl/scene'; import { BoundingSphereHelper } from '../helper/bounding-sphere-helper'; import { createTexture, Texture } from '../../mol-gl/webgl/texture'; - export class DrawPass { colorTarget: RenderTarget depthTexture: Texture diff --git a/src/mol-canvas3d/passes/multi-sample.ts b/src/mol-canvas3d/passes/multi-sample.ts index ee9ff4dee07f0b9614d28cc6c21715c3d7f3e521..4f2ea9524789c56adf556ac7a5c1e25a2fe69b39 100644 --- a/src/mol-canvas3d/passes/multi-sample.ts +++ b/src/mol-canvas3d/passes/multi-sample.ts @@ -19,6 +19,9 @@ import { Camera } from '../../mol-canvas3d/camera'; import { PostprocessingPass } from './postprocessing'; import { DrawPass } from './draw'; +import quad_vert from '../../mol-gl/shader/quad.vert' +import compose_frag from '../../mol-gl/shader/compose.frag' + const ComposeSchema = { ...QuadSchema, tColor: TextureSpec('texture', 'rgba', 'ubyte', 'nearest'), @@ -37,10 +40,7 @@ function getComposeRenderable(ctx: WebGLContext, colorTexture: Texture): Compose } const schema = { ...ComposeSchema } - const shaderCode = ShaderCode( - require('mol-gl/shader/quad.vert').default, - require('mol-gl/shader/compose.frag').default - ) + const shaderCode = ShaderCode(quad_vert, compose_frag) const renderItem = createComputeRenderItem(ctx, 'triangles', shaderCode, schema, values) return createComputeRenderable(renderItem, values) diff --git a/src/mol-canvas3d/passes/postprocessing.ts b/src/mol-canvas3d/passes/postprocessing.ts index 7d184a44aaa115bd5c4b060eac1f6bfca14e8ac9..ac172180e6b08dae5bd72aebe6efd9b74fec75bb 100644 --- a/src/mol-canvas3d/passes/postprocessing.ts +++ b/src/mol-canvas3d/passes/postprocessing.ts @@ -18,6 +18,9 @@ import { createRenderTarget, RenderTarget } from '../../mol-gl/webgl/render-targ import { DrawPass } from './draw'; import { Camera } from '../../mol-canvas3d/camera'; +import quad_vert from '../../mol-gl/shader/quad.vert' +import postprocessing_frag from '../../mol-gl/shader/postprocessing.frag' + const PostprocessingSchema = { ...QuadSchema, tColor: TextureSpec('texture', 'rgba', 'ubyte', 'nearest'), @@ -89,10 +92,7 @@ function getPostprocessingRenderable(ctx: WebGLContext, colorTexture: Texture, d } const schema = { ...PostprocessingSchema } - const shaderCode = ShaderCode( - require('mol-gl/shader/quad.vert').default, - require('mol-gl/shader/postprocessing.frag').default - ) + const shaderCode = ShaderCode(quad_vert, postprocessing_frag) const renderItem = createComputeRenderItem(ctx, 'triangles', shaderCode, schema, values) return createComputeRenderable(renderItem, values)