Skip to content
Snippets Groups Projects
Commit 9dd3a466 authored by Alexander Rose's avatar Alexander Rose
Browse files

fix remaining absolute shader imports

parent 52a59696
Branches
Tags
No related merge requests found
...@@ -11,7 +11,6 @@ import Scene from '../../mol-gl/scene'; ...@@ -11,7 +11,6 @@ import Scene from '../../mol-gl/scene';
import { BoundingSphereHelper } from '../helper/bounding-sphere-helper'; import { BoundingSphereHelper } from '../helper/bounding-sphere-helper';
import { createTexture, Texture } from '../../mol-gl/webgl/texture'; import { createTexture, Texture } from '../../mol-gl/webgl/texture';
export class DrawPass { export class DrawPass {
colorTarget: RenderTarget colorTarget: RenderTarget
depthTexture: Texture depthTexture: Texture
......
...@@ -19,6 +19,9 @@ import { Camera } from '../../mol-canvas3d/camera'; ...@@ -19,6 +19,9 @@ import { Camera } from '../../mol-canvas3d/camera';
import { PostprocessingPass } from './postprocessing'; import { PostprocessingPass } from './postprocessing';
import { DrawPass } from './draw'; import { DrawPass } from './draw';
import quad_vert from '../../mol-gl/shader/quad.vert'
import compose_frag from '../../mol-gl/shader/compose.frag'
const ComposeSchema = { const ComposeSchema = {
...QuadSchema, ...QuadSchema,
tColor: TextureSpec('texture', 'rgba', 'ubyte', 'nearest'), tColor: TextureSpec('texture', 'rgba', 'ubyte', 'nearest'),
...@@ -37,10 +40,7 @@ function getComposeRenderable(ctx: WebGLContext, colorTexture: Texture): Compose ...@@ -37,10 +40,7 @@ function getComposeRenderable(ctx: WebGLContext, colorTexture: Texture): Compose
} }
const schema = { ...ComposeSchema } const schema = { ...ComposeSchema }
const shaderCode = ShaderCode( const shaderCode = ShaderCode(quad_vert, compose_frag)
require('mol-gl/shader/quad.vert').default,
require('mol-gl/shader/compose.frag').default
)
const renderItem = createComputeRenderItem(ctx, 'triangles', shaderCode, schema, values) const renderItem = createComputeRenderItem(ctx, 'triangles', shaderCode, schema, values)
return createComputeRenderable(renderItem, values) return createComputeRenderable(renderItem, values)
......
...@@ -18,6 +18,9 @@ import { createRenderTarget, RenderTarget } from '../../mol-gl/webgl/render-targ ...@@ -18,6 +18,9 @@ import { createRenderTarget, RenderTarget } from '../../mol-gl/webgl/render-targ
import { DrawPass } from './draw'; import { DrawPass } from './draw';
import { Camera } from '../../mol-canvas3d/camera'; 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 = { const PostprocessingSchema = {
...QuadSchema, ...QuadSchema,
tColor: TextureSpec('texture', 'rgba', 'ubyte', 'nearest'), tColor: TextureSpec('texture', 'rgba', 'ubyte', 'nearest'),
...@@ -89,10 +92,7 @@ function getPostprocessingRenderable(ctx: WebGLContext, colorTexture: Texture, d ...@@ -89,10 +92,7 @@ function getPostprocessingRenderable(ctx: WebGLContext, colorTexture: Texture, d
} }
const schema = { ...PostprocessingSchema } const schema = { ...PostprocessingSchema }
const shaderCode = ShaderCode( const shaderCode = ShaderCode(quad_vert, postprocessing_frag)
require('mol-gl/shader/quad.vert').default,
require('mol-gl/shader/postprocessing.frag').default
)
const renderItem = createComputeRenderItem(ctx, 'triangles', shaderCode, schema, values) const renderItem = createComputeRenderItem(ctx, 'triangles', shaderCode, schema, values)
return createComputeRenderable(renderItem, values) return createComputeRenderable(renderItem, values)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment