From 9dd3a4665b6e5b065616a7338931b1483a717e06 Mon Sep 17 00:00:00 2001
From: Alexander Rose <alex.rose@rcsb.org>
Date: Tue, 4 Jun 2019 14:48:42 -0700
Subject: [PATCH] fix remaining absolute shader imports
---
src/mol-canvas3d/passes/draw.ts | 1 -
src/mol-canvas3d/passes/multi-sample.ts | 8 ++++----
src/mol-canvas3d/passes/postprocessing.ts | 8 ++++----
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/mol-canvas3d/passes/draw.ts b/src/mol-canvas3d/passes/draw.ts
index 4c3150c19..7fd53fd90 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 ee9ff4dee..4f2ea9524 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 7d184a44a..ac172180e 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)
--
GitLab