From fc0ca27a65f16cd9f45ed9872a24f073451c0ed0 Mon Sep 17 00:00:00 2001
From: Alexander Rose <alex.rose@rcsb.org>
Date: Fri, 2 Nov 2018 17:59:50 -0700
Subject: [PATCH] volume repr refactoring cont'd
---
src/mol-repr/volume/direct-volume.ts | 104 +++++++------------------
src/mol-repr/volume/isosurface-mesh.ts | 2 +-
2 files changed, 29 insertions(+), 77 deletions(-)
diff --git a/src/mol-repr/volume/direct-volume.ts b/src/mol-repr/volume/direct-volume.ts
index 5ec65ef71..3f7c67849 100644
--- a/src/mol-repr/volume/direct-volume.ts
+++ b/src/mol-repr/volume/direct-volume.ts
@@ -7,7 +7,7 @@
import { VolumeData } from 'mol-model/volume'
import { RuntimeContext } from 'mol-task'
import { VolumeVisual, VolumeRepresentation } from './index';
-import { DirectVolumeRenderObject, createDirectVolumeRenderObject } from 'mol-gl/render-object';
+import { createDirectVolumeRenderObject } from 'mol-gl/render-object';
import { Loci, EmptyLoci } from 'mol-model/loci';
import { paramDefaultValues } from 'mol-util/parameter';
import { Vec3, Mat4 } from 'mol-math/linear-algebra';
@@ -15,12 +15,12 @@ import { Box3D } from 'mol-math/geometry';
import { WebGLContext } from 'mol-gl/webgl/context';
import { createTexture } from 'mol-gl/webgl/texture';
import { LocationIterator } from 'mol-geo/util/location-iterator';
-import { NullLocation } from 'mol-model/location';
import { createIdentityTransform } from 'mol-geo/geometry/transform-data';
import { DirectVolume } from 'mol-geo/geometry/direct-volume/direct-volume';
-import { Geometry, createRenderableState, updateRenderableState } from 'mol-geo/geometry/geometry';
+import { Geometry, createRenderableState } from 'mol-geo/geometry/geometry';
import { PickingId } from 'mol-geo/geometry/picking';
import { MarkerAction } from 'mol-geo/geometry/marker-data';
+import { VisualUpdateState } from 'mol-repr/util';
function getBoundingBox(gridDimension: Vec3, transform: Mat4) {
const bbox = Box3D.empty()
@@ -168,6 +168,18 @@ export function createDirectVolume3d(ctx: RuntimeContext, webgl: WebGLContext, v
return DirectVolume.create(bbox, gridDimension, transform, texture, directVolume)
}
+//
+
+export async function createDirectVolume(ctx: RuntimeContext, volume: VolumeData, props: DirectVolumeProps, directVolume?: DirectVolume) {
+ const { webgl } = props
+ if (webgl === undefined) throw new Error('DirectVolumeVisual requires `webgl` in props')
+
+ return webgl.isWebGL2 ?
+ await createDirectVolume3d(ctx, webgl, volume, directVolume) :
+ await createDirectVolume2d(ctx, webgl, volume, directVolume)
+}
+
+
//
export const DirectVolumeParams = {
@@ -178,81 +190,21 @@ export const DefaultDirectVolumeProps = paramDefaultValues(DirectVolumeParams)
export type DirectVolumeProps = typeof DefaultDirectVolumeProps
export function DirectVolumeVisual(): VolumeVisual<DirectVolumeProps> {
- let currentProps = DefaultDirectVolumeProps
- let renderObject: DirectVolumeRenderObject
- let currentVolume: VolumeData
- let directVolume: DirectVolume
-
- async function create(ctx: RuntimeContext, volume: VolumeData, props: Partial<DirectVolumeProps> = {}) {
- const { webgl } = props
- if (webgl === undefined) throw new Error('DirectVolumeVisual requires `webgl` in props')
-
- currentProps = { ...DefaultDirectVolumeProps, ...props }
- if (props.isoValueRelative) {
- // currentProps.isoValueAbsolute = VolumeIsoValue.calcAbsolute(currentVolume.dataStats, props.isoValueRelative)
- }
-
- const state = createRenderableState(currentProps)
- const locationIt = LocationIterator(1, 1, () => NullLocation)
- const transform = createIdentityTransform()
-
- if (webgl.isWebGL2) {
- directVolume = await createDirectVolume3d(ctx, webgl, volume, directVolume)
- const values = await DirectVolume.createValues(ctx, directVolume, transform, locationIt, currentProps)
- renderObject = createDirectVolumeRenderObject(values, state)
- } else {
- directVolume = await createDirectVolume2d(ctx, webgl, volume, directVolume)
- const values = await DirectVolume.createValues(ctx, directVolume, transform, locationIt, currentProps)
- renderObject = createDirectVolumeRenderObject(values, state)
- }
- }
-
- async function update(ctx: RuntimeContext, props: Partial<DirectVolumeProps> = {}) {
- const { webgl } = props
- if (webgl === undefined) throw new Error('DirectVolumeVisual requires `webgl` in props')
-
- const newProps = { ...currentProps, ...props }
- if (props.isoValueRelative) {
- // newProps.isoValueAbsolute = VolumeIsoValue.calcAbsolute(currentVolume.dataStats, props.isoValueRelative)
- }
-
- console.log('newProps.isoValueAbsolute', newProps.isoValueAbsolute)
-
- DirectVolume.updateValues(renderObject.values, newProps)
- updateRenderableState(renderObject.state, newProps)
-
- currentProps = newProps
- }
-
- return {
- get renderObject () { return renderObject },
- async createOrUpdate(ctx: RuntimeContext, props: Partial<DirectVolumeProps> = {}, volume?: VolumeData) {
- if (!volume && !currentVolume) {
- throw new Error('missing volume')
- } else if (volume && (!currentVolume || !renderObject)) {
- currentVolume = volume
- await create(ctx, volume, props)
- } else if (volume && volume !== currentVolume) {
- currentVolume = volume
- await create(ctx, volume, props)
- } else {
- await update(ctx, props)
- }
-
- currentProps = { ...DefaultDirectVolumeProps, ...props }
- },
- getLoci(pickingId: PickingId) {
- // TODO
- return EmptyLoci
+ return VolumeVisual<DirectVolumeProps>({
+ defaultProps: DefaultDirectVolumeProps,
+ createGeometry: createDirectVolume,
+ getLoci: () => EmptyLoci,
+ mark: () => false,
+ setUpdateState: (state: VisualUpdateState, newProps: DirectVolumeProps, currentProps: DirectVolumeProps) => {
},
- mark(loci: Loci, action: MarkerAction) {
- // TODO
- return false
+ createRenderObject: async (ctx: RuntimeContext, geometry: DirectVolume, locationIt: LocationIterator, props: DirectVolumeProps) => {
+ const transform = createIdentityTransform()
+ const values = await DirectVolume.createValues(ctx, geometry, transform, locationIt, props)
+ const state = createRenderableState(props)
+ return createDirectVolumeRenderObject(values, state)
},
- destroy() {
- // TODO
- }
- }
+ updateValues: DirectVolume.updateValues
+ })
}
export function DirectVolumeRepresentation(): VolumeRepresentation<DirectVolumeProps> {
diff --git a/src/mol-repr/volume/isosurface-mesh.ts b/src/mol-repr/volume/isosurface-mesh.ts
index 0dd1b600d..fb8be424e 100644
--- a/src/mol-repr/volume/isosurface-mesh.ts
+++ b/src/mol-repr/volume/isosurface-mesh.ts
@@ -48,7 +48,7 @@ export const IsosurfaceParams = {
export const DefaultIsosurfaceProps = paramDefaultValues(IsosurfaceParams)
export type IsosurfaceProps = typeof DefaultIsosurfaceProps
-export function IsosurfaceVisual(): VolumeVisual<IsosurfaceProps> {
+export function IsosurfaceVisual(): VolumeVisual<IsosurfaceProps> {
return VolumeVisual<IsosurfaceProps>({
defaultProps: DefaultIsosurfaceProps,
createGeometry: createVolumeIsosurface,
--
GitLab