diff --git a/src/apps/viewer/index.html b/src/apps/viewer/index.html index e80c5bf462a5b3c48f4698b24abf0e6e569a0a80..9fe81219e16721be9b77f5bbba68b30dbf0bb317 100644 --- a/src/apps/viewer/index.html +++ b/src/apps/viewer/index.html @@ -45,7 +45,7 @@ return decodeURIComponent(((window.location.search || '').match(r) || [])[1] || ''); } - var debugMode = true; // getParam('debug-mode', '[^&]+').trim() === '1'; + var debugMode = getParam('debug-mode', '[^&]+').trim() === '1'; if (debugMode) molstar.setDebugMode(debugMode, debugMode); var disableAntialiasing = getParam('disable-antialiasing', '[^&]+').trim() === '1'; diff --git a/src/mol-gl/renderable/image.ts b/src/mol-gl/renderable/image.ts index 0ba595cca0e1d49c1cc73c7cba7964664b8cc6a2..82c5172132755ee064546fa403ebf7224f74b18a 100644 --- a/src/mol-gl/renderable/image.ts +++ b/src/mol-gl/renderable/image.ts @@ -7,7 +7,7 @@ import { Renderable, RenderableState, createRenderable } from '../renderable'; import { WebGLContext } from '../webgl/context'; import { createGraphicsRenderItem } from '../webgl/render-item'; -import { AttributeSpec, Values, GlobalUniformSchema, InternalSchema, TextureSpec, ElementsSpec, DefineSpec, InternalValues, BaseSchema, UniformSpec } from './schema'; +import { AttributeSpec, Values, GlobalUniformSchema, InternalSchema, TextureSpec, ElementsSpec, DefineSpec, InternalValues, BaseSchema, UniformSpec, GlobalTextureSchema } from './schema'; import { ImageShaderCode } from '../shader-code'; import { ValueCell } from '../../mol-util'; import { InterpolationTypeNames } from '../../mol-geo/geometry/image/image'; @@ -30,7 +30,7 @@ export type ImageSchema = typeof ImageSchema export type ImageValues = Values<ImageSchema> export function ImageRenderable(ctx: WebGLContext, id: number, values: ImageValues, state: RenderableState, materialId: number): Renderable<ImageValues> { - const schema = { ...GlobalUniformSchema, ...InternalSchema, ...ImageSchema }; + const schema = { ...GlobalUniformSchema, ...GlobalTextureSchema, ...InternalSchema, ...ImageSchema }; const internalValues: InternalValues = { uObjectId: ValueCell.create(id), }; diff --git a/src/mol-gl/renderable/lines.ts b/src/mol-gl/renderable/lines.ts index aa6c31bbb6f95e195880871fde0845aba2714344..a8272b29cca6434e272be5e0c043d2196894f2f0 100644 --- a/src/mol-gl/renderable/lines.ts +++ b/src/mol-gl/renderable/lines.ts @@ -7,7 +7,7 @@ import { Renderable, RenderableState, createRenderable } from '../renderable'; import { WebGLContext } from '../webgl/context'; import { createGraphicsRenderItem } from '../webgl/render-item'; -import { GlobalUniformSchema, BaseSchema, AttributeSpec, DefineSpec, Values, InternalSchema, SizeSchema, ElementsSpec, InternalValues } from './schema'; +import { GlobalUniformSchema, BaseSchema, AttributeSpec, DefineSpec, Values, InternalSchema, SizeSchema, ElementsSpec, InternalValues, GlobalTextureSchema } from './schema'; import { ValueCell } from '../../mol-util'; import { LinesShaderCode } from '../shader-code'; @@ -26,7 +26,7 @@ export type LinesSchema = typeof LinesSchema export type LinesValues = Values<LinesSchema> export function LinesRenderable(ctx: WebGLContext, id: number, values: LinesValues, state: RenderableState, materialId: number): Renderable<LinesValues> { - const schema = { ...GlobalUniformSchema, ...InternalSchema, ...LinesSchema }; + const schema = { ...GlobalUniformSchema, ...GlobalTextureSchema, ...InternalSchema, ...LinesSchema }; const internalValues: InternalValues = { uObjectId: ValueCell.create(id), }; diff --git a/src/mol-gl/renderable/points.ts b/src/mol-gl/renderable/points.ts index 4f50b314e84b77f8e55303936e283a08d2f14830..a97b8bb597525ae33dea1f87055b445a9f9f8abd 100644 --- a/src/mol-gl/renderable/points.ts +++ b/src/mol-gl/renderable/points.ts @@ -7,7 +7,7 @@ import { Renderable, RenderableState, createRenderable } from '../renderable'; import { WebGLContext } from '../webgl/context'; import { createGraphicsRenderItem } from '../webgl/render-item'; -import { GlobalUniformSchema, BaseSchema, AttributeSpec, UniformSpec, DefineSpec, Values, InternalSchema, SizeSchema, InternalValues } from './schema'; +import { GlobalUniformSchema, BaseSchema, AttributeSpec, UniformSpec, DefineSpec, Values, InternalSchema, SizeSchema, InternalValues, GlobalTextureSchema } from './schema'; import { PointsShaderCode } from '../shader-code'; import { ValueCell } from '../../mol-util'; @@ -23,7 +23,7 @@ export type PointsSchema = typeof PointsSchema export type PointsValues = Values<PointsSchema> export function PointsRenderable(ctx: WebGLContext, id: number, values: PointsValues, state: RenderableState, materialId: number): Renderable<PointsValues> { - const schema = { ...GlobalUniformSchema, ...InternalSchema, ...PointsSchema }; + const schema = { ...GlobalUniformSchema, ...GlobalTextureSchema, ...InternalSchema, ...PointsSchema }; const internalValues: InternalValues = { uObjectId: ValueCell.create(id), }; diff --git a/src/mol-gl/renderable/spheres.ts b/src/mol-gl/renderable/spheres.ts index fbc5d0ec6b7db04ae2ef7554d8324fdcb27d440f..ebb602fbf5d27f16ecf9aa0e6cfdea8d1ca0a461 100644 --- a/src/mol-gl/renderable/spheres.ts +++ b/src/mol-gl/renderable/spheres.ts @@ -7,7 +7,7 @@ import { Renderable, RenderableState, createRenderable } from '../renderable'; import { WebGLContext } from '../webgl/context'; import { createGraphicsRenderItem } from '../webgl/render-item'; -import { GlobalUniformSchema, BaseSchema, AttributeSpec, Values, InternalSchema, SizeSchema, InternalValues, ElementsSpec, ValueSpec, DefineSpec } from './schema'; +import { GlobalUniformSchema, BaseSchema, AttributeSpec, Values, InternalSchema, SizeSchema, InternalValues, ElementsSpec, ValueSpec, DefineSpec, GlobalTextureSchema } from './schema'; import { SpheresShaderCode } from '../shader-code'; import { ValueCell } from '../../mol-util'; @@ -26,7 +26,7 @@ export type SpheresSchema = typeof SpheresSchema export type SpheresValues = Values<SpheresSchema> export function SpheresRenderable(ctx: WebGLContext, id: number, values: SpheresValues, state: RenderableState, materialId: number): Renderable<SpheresValues> { - const schema = { ...GlobalUniformSchema, ...InternalSchema, ...SpheresSchema }; + const schema = { ...GlobalUniformSchema, ...GlobalTextureSchema, ...InternalSchema, ...SpheresSchema }; const internalValues: InternalValues = { uObjectId: ValueCell.create(id), }; diff --git a/src/mol-gl/renderable/text.ts b/src/mol-gl/renderable/text.ts index a655bf144271ed92f81c78e4654ab9e8b51df28c..a31ca9939613df91ec0d334b89d88e575da65729 100644 --- a/src/mol-gl/renderable/text.ts +++ b/src/mol-gl/renderable/text.ts @@ -7,7 +7,7 @@ import { Renderable, RenderableState, createRenderable } from '../renderable'; import { WebGLContext } from '../webgl/context'; import { createGraphicsRenderItem } from '../webgl/render-item'; -import { GlobalUniformSchema, BaseSchema, AttributeSpec, UniformSpec, Values, InternalSchema, SizeSchema, InternalValues, TextureSpec, ElementsSpec, ValueSpec } from './schema'; +import { GlobalUniformSchema, BaseSchema, AttributeSpec, UniformSpec, Values, InternalSchema, SizeSchema, InternalValues, TextureSpec, ElementsSpec, ValueSpec, GlobalTextureSchema } from './schema'; import { TextShaderCode } from '../shader-code'; import { ValueCell } from '../../mol-util'; @@ -35,7 +35,7 @@ export type TextSchema = typeof TextSchema export type TextValues = Values<TextSchema> export function TextRenderable(ctx: WebGLContext, id: number, values: TextValues, state: RenderableState, materialId: number): Renderable<TextValues> { - const schema = { ...GlobalUniformSchema, ...InternalSchema, ...TextSchema }; + const schema = { ...GlobalUniformSchema, ...GlobalTextureSchema, ...InternalSchema, ...TextSchema }; const internalValues: InternalValues = { uObjectId: ValueCell.create(id), }; diff --git a/src/mol-gl/renderable/texture-mesh.ts b/src/mol-gl/renderable/texture-mesh.ts index a0d9be2ba1ff06d5649f36b085a11f97dbbf13ef..062936f5f5578591d0cebf92f3b4b466a458b9f9 100644 --- a/src/mol-gl/renderable/texture-mesh.ts +++ b/src/mol-gl/renderable/texture-mesh.ts @@ -7,7 +7,7 @@ import { Renderable, RenderableState, createRenderable } from '../renderable'; import { WebGLContext } from '../webgl/context'; import { createGraphicsRenderItem } from '../webgl/render-item'; -import { GlobalUniformSchema, BaseSchema, DefineSpec, Values, InternalSchema, InternalValues, UniformSpec, TextureSpec } from './schema'; +import { GlobalUniformSchema, BaseSchema, DefineSpec, Values, InternalSchema, InternalValues, UniformSpec, TextureSpec, GlobalTextureSchema } from './schema'; import { MeshShaderCode } from '../shader-code'; import { ValueCell } from '../../mol-util'; @@ -28,7 +28,7 @@ export type TextureMeshSchema = typeof TextureMeshSchema export type TextureMeshValues = Values<TextureMeshSchema> export function TextureMeshRenderable(ctx: WebGLContext, id: number, values: TextureMeshValues, state: RenderableState, materialId: number): Renderable<TextureMeshValues> { - const schema = { ...GlobalUniformSchema, ...InternalSchema, ...TextureMeshSchema }; + const schema = { ...GlobalUniformSchema, ...GlobalTextureSchema, ...InternalSchema, ...TextureMeshSchema }; const internalValues: InternalValues = { uObjectId: ValueCell.create(id), };