Browse Source

fix remaining absolute shader imports

Alexander Rose 5 years ago
parent
commit
9dd3a4665b

+ 0 - 1
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

+ 4 - 4
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)

+ 4 - 4
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)