diff --git a/src/mol-geo/representation/structure/visual/carbohydrate-link-cylinder.ts b/src/mol-geo/representation/structure/visual/carbohydrate-link-cylinder.ts
index 0bebb4471114e9413bbce503881f0c0f89db3fe5..1d449f218c0271843443e7fa7f005c9e1a798e24 100644
--- a/src/mol-geo/representation/structure/visual/carbohydrate-link-cylinder.ts
+++ b/src/mol-geo/representation/structure/visual/carbohydrate-link-cylinder.ts
@@ -6,19 +6,17 @@
import { ValueCell } from 'mol-util/value-cell'
-import { createMeshRenderObject, MeshRenderObject } from 'mol-gl/render-object'
+import { MeshRenderObject } from 'mol-gl/render-object'
import { Unit, Structure, Link, StructureElement } from 'mol-model/structure';
import { DefaultStructureProps, StructureVisual } from '..';
import { RuntimeContext } from 'mol-task'
-import { createIdentityTransform, createColors } from './util/common';
-import { MeshValues } from 'mol-gl/renderable';
-import { getMeshData } from '../../../util/mesh-data';
+import { createColors, createStructureMeshRenderObject } from './util/common';
import { Mesh } from '../../../shape/mesh';
import { PickingId } from '../../../util/picking';
-import { createMarkers, MarkerAction, MarkerData, applyMarkerAction } from '../../../util/marker-data';
+import { MarkerAction, MarkerData, applyMarkerAction } from '../../../util/marker-data';
import { Loci, EmptyLoci, isEveryLoci } from 'mol-model/loci';
import { SizeTheme } from '../../../theme';
-import { createMeshValues, updateMeshValues, updateRenderableState, createRenderableState, DefaultMeshProps } from '../../util';
+import { updateMeshValues, updateRenderableState, DefaultMeshProps } from '../../util';
import { Vec3 } from 'mol-math/linear-algebra';
import { deepEqual } from 'mol-util';
import { LocationIterator } from './util/location-iterator';
@@ -77,29 +75,10 @@ export function CarbohydrateLinkVisual(): StructureVisual<CarbohydrateLinkProps>
currentProps = Object.assign({}, DefaultCarbohydrateLinkProps, props)
currentStructure = structure
- const { colorTheme } = { ...DefaultCarbohydrateLinkProps, ...props }
- const elementCount = structure.carbohydrates.links.length
- const instanceCount = 1
-
mesh = await createCarbohydrateLinkCylinderMesh(ctx, currentStructure, currentProps, mesh)
- const transforms = createIdentityTransform()
- const color = createColors(CarbohydrateLinkIterator(structure), colorTheme)
- const marker = createMarkers(instanceCount * elementCount)
-
- const counts = { drawCount: mesh.triangleCount * 3, elementCount, instanceCount }
-
- const values: MeshValues = {
- ...getMeshData(mesh),
- ...color,
- ...marker,
- aTransform: transforms,
- elements: mesh.indexBuffer,
- ...createMeshValues(currentProps, counts)
- }
- const state = createRenderableState(currentProps)
-
- renderObject = createMeshRenderObject(values, state)
+ const locationIt = CarbohydrateLinkIterator(structure)
+ renderObject = createStructureMeshRenderObject(structure, mesh, locationIt, currentProps)
},
async update(ctx: RuntimeContext, props: CarbohydrateLinkProps) {
const newProps = Object.assign({}, currentProps, props)
diff --git a/src/mol-geo/representation/structure/visual/carbohydrate-symbol-mesh.ts b/src/mol-geo/representation/structure/visual/carbohydrate-symbol-mesh.ts
index 806964cf9474783a013146c38fa45d00c9f8e8b7..327de3198ad30db947a50228afed17bca7d789e3 100644
--- a/src/mol-geo/representation/structure/visual/carbohydrate-symbol-mesh.ts
+++ b/src/mol-geo/representation/structure/visual/carbohydrate-symbol-mesh.ts
@@ -6,19 +6,17 @@
import { ValueCell } from 'mol-util/value-cell'
-import { createMeshRenderObject, MeshRenderObject } from 'mol-gl/render-object'
+import { MeshRenderObject } from 'mol-gl/render-object'
import { Unit, Structure, StructureElement } from 'mol-model/structure';
import { DefaultStructureProps, StructureVisual } from '..';
import { RuntimeContext } from 'mol-task'
-import { createIdentityTransform, createColors } from './util/common';
-import { MeshValues } from 'mol-gl/renderable';
-import { getMeshData } from '../../../util/mesh-data';
+import { createColors, createStructureMeshRenderObject } from './util/common';
import { Mesh } from '../../../shape/mesh';
import { PickingId } from '../../../util/picking';
-import { createMarkers, MarkerAction, MarkerData, applyMarkerAction } from '../../../util/marker-data';
+import { MarkerAction, MarkerData, applyMarkerAction } from '../../../util/marker-data';
import { Loci, EmptyLoci, isEveryLoci } from 'mol-model/loci';
import { SizeTheme } from '../../../theme';
-import { createMeshValues, updateMeshValues, updateRenderableState, createRenderableState, DefaultMeshProps } from '../../util';
+import { updateMeshValues, updateRenderableState, DefaultMeshProps } from '../../util';
import { MeshBuilder } from '../../../shape/mesh-builder';
import { Vec3, Mat4 } from 'mol-math/linear-algebra';
import { getSaccharideShape, SaccharideShapes } from 'mol-model/structure/structure/carbohydrates/constants';
@@ -140,29 +138,10 @@ export function CarbohydrateSymbolVisual(): StructureVisual<CarbohydrateSymbolPr
currentProps = Object.assign({}, DefaultCarbohydrateSymbolProps, props)
currentStructure = structure
- const { colorTheme } = { ...DefaultCarbohydrateSymbolProps, ...props }
- const instanceCount = 1
- const elementCount = currentStructure.elementCount
-
mesh = await createCarbohydrateSymbolMesh(ctx, currentStructure, mesh)
- const transforms = createIdentityTransform()
- const color = createColors(CarbohydrateElementIterator(structure), colorTheme)
- const marker = createMarkers(instanceCount * elementCount)
-
- const counts = { drawCount: mesh.triangleCount * 3, elementCount, instanceCount }
-
- const values: MeshValues = {
- ...getMeshData(mesh),
- ...color,
- ...marker,
- aTransform: transforms,
- elements: mesh.indexBuffer,
- ...createMeshValues(currentProps, counts)
- }
- const state = createRenderableState(currentProps)
-
- renderObject = createMeshRenderObject(values, state)
+ const locationIt = CarbohydrateElementIterator(structure)
+ renderObject = createStructureMeshRenderObject(structure, mesh, locationIt, currentProps)
},
async update(ctx: RuntimeContext, props: CarbohydrateSymbolProps) {
const newProps = Object.assign({}, currentProps, props)
diff --git a/src/mol-geo/representation/structure/visual/element-sphere.ts b/src/mol-geo/representation/structure/visual/element-sphere.ts
index f1680f02cdbbb12c9a90c768ae80fe2c3569a4f5..48735943bc5b26ac60c5ae747f043b5ce374f3a0 100644
--- a/src/mol-geo/representation/structure/visual/element-sphere.ts
+++ b/src/mol-geo/representation/structure/visual/element-sphere.ts
@@ -7,21 +7,19 @@
import { ValueCell } from 'mol-util/value-cell'
-import { createMeshRenderObject, MeshRenderObject } from 'mol-gl/render-object'
+import { MeshRenderObject } from 'mol-gl/render-object'
import { Unit } from 'mol-model/structure';
import { DefaultStructureProps, UnitsVisual } from '..';
import { RuntimeContext } from 'mol-task'
-import { createTransforms, createColors } from './util/common';
+import { createColors, createUnitsMeshRenderObject } from './util/common';
import { createElementSphereMesh, markElement, getElementRadius, getElementLoci } from './util/element';
import { deepEqual } from 'mol-util';
-import { MeshValues } from 'mol-gl/renderable';
-import { getMeshData } from '../../../util/mesh-data';
import { Mesh } from '../../../shape/mesh';
import { PickingId } from '../../../util/picking';
-import { createMarkers, MarkerAction } from '../../../util/marker-data';
+import { MarkerAction } from '../../../util/marker-data';
import { Loci } from 'mol-model/loci';
import { SizeTheme } from '../../../theme';
-import { createMeshValues, updateMeshValues, updateRenderableState, createRenderableState, DefaultMeshProps } from '../../util';
+import { updateMeshValues, updateRenderableState, DefaultMeshProps } from '../../util';
import { StructureElementIterator } from './util/location-iterator';
export const DefaultElementSphereProps = {
@@ -45,9 +43,7 @@ export function ElementSphereVisual(): UnitsVisual<ElementSphereProps> {
currentProps = Object.assign({}, DefaultElementSphereProps, props)
currentGroup = group
- const { detail, colorTheme, sizeTheme, unitKinds } = { ...DefaultElementSphereProps, ...props }
- const instanceCount = group.units.length
- const elementCount = group.elements.length
+ const { detail, sizeTheme, unitKinds } = { ...DefaultElementSphereProps, ...props }
const unit = group.units[0]
const radius = getElementRadius(unit, sizeTheme)
@@ -55,23 +51,8 @@ export function ElementSphereVisual(): UnitsVisual<ElementSphereProps> {
? await createElementSphereMesh(ctx, unit, radius, detail, mesh)
: Mesh.createEmpty(mesh)
- const transforms = createTransforms(group)
- const color = createColors(StructureElementIterator.fromGroup(group), colorTheme)
- const marker = createMarkers(instanceCount * elementCount)
-
- const counts = { drawCount: mesh.triangleCount * 3, elementCount, instanceCount }
-
- const values: MeshValues = {
- ...getMeshData(mesh),
- ...color,
- ...marker,
- aTransform: transforms,
- elements: mesh.indexBuffer,
- ...createMeshValues(currentProps, counts),
- }
- const state = createRenderableState(currentProps)
-
- renderObject = createMeshRenderObject(values, state)
+ const locationIt = StructureElementIterator.fromGroup(group)
+ renderObject = createUnitsMeshRenderObject(group, mesh, locationIt, currentProps)
},
async update(ctx: RuntimeContext, props: ElementSphereProps) {
const newProps = Object.assign({}, currentProps, props)
diff --git a/src/mol-geo/representation/structure/visual/inter-unit-link-cylinder.ts b/src/mol-geo/representation/structure/visual/inter-unit-link-cylinder.ts
index 1282c57a0f6b53220379af3bfa7786afaaeddb97..654e3ab70bd242c92920438f93b0b687303e2220 100644
--- a/src/mol-geo/representation/structure/visual/inter-unit-link-cylinder.ts
+++ b/src/mol-geo/representation/structure/visual/inter-unit-link-cylinder.ts
@@ -6,21 +6,19 @@
import { ValueCell } from 'mol-util/value-cell'
-import { createMeshRenderObject, MeshRenderObject } from 'mol-gl/render-object'
+import { MeshRenderObject } from 'mol-gl/render-object'
import { Link, Structure, StructureElement } from 'mol-model/structure';
import { DefaultStructureProps, StructureVisual } from '..';
import { RuntimeContext } from 'mol-task'
import { LinkCylinderProps, DefaultLinkCylinderProps, createLinkCylinderMesh } from './util/link';
-import { MeshValues } from 'mol-gl/renderable';
-import { getMeshData } from '../../../util/mesh-data';
import { Mesh } from '../../../shape/mesh';
import { PickingId } from '../../../util/picking';
import { Vec3 } from 'mol-math/linear-algebra';
import { Loci, isEveryLoci, EmptyLoci } from 'mol-model/loci';
-import { MarkerAction, applyMarkerAction, createMarkers, MarkerData } from '../../../util/marker-data';
+import { MarkerAction, applyMarkerAction, MarkerData } from '../../../util/marker-data';
import { SizeTheme } from '../../../theme';
-import { createIdentityTransform, createColors } from './util/common';
-import { updateMeshValues, updateRenderableState, createMeshValues, createRenderableState } from '../../util';
+import { createColors, createStructureMeshRenderObject } from './util/common';
+import { updateMeshValues, updateRenderableState } from '../../util';
import { LinkIterator } from './util/location-iterator';
import { deepEqual } from 'mol-util';
@@ -65,29 +63,10 @@ export function InterUnitLinkVisual(): StructureVisual<InterUnitLinkProps> {
currentProps = Object.assign({}, DefaultInterUnitLinkProps, props)
currentStructure = structure
- const { colorTheme } = { ...DefaultInterUnitLinkProps, ...props }
- const elementCount = structure.links.bondCount
- const instanceCount = 1
-
mesh = await createInterUnitLinkCylinderMesh(ctx, structure, currentProps)
- const transforms = createIdentityTransform()
- const color = createColors(LinkIterator.fromStructure(structure), colorTheme) // TODO
- const marker = createMarkers(instanceCount * elementCount)
-
- const counts = { drawCount: mesh.triangleCount * 3, elementCount, instanceCount }
-
- const values: MeshValues = {
- ...getMeshData(mesh),
- ...color,
- ...marker,
- aTransform: transforms,
- elements: mesh.indexBuffer,
- ...createMeshValues(currentProps, counts),
- }
- const state = createRenderableState(currentProps)
-
- renderObject = createMeshRenderObject(values, state)
+ const locationIt = LinkIterator.fromStructure(structure)
+ renderObject = createStructureMeshRenderObject(structure, mesh, locationIt, currentProps)
},
async update(ctx: RuntimeContext, props: InterUnitLinkProps) {
const newProps = Object.assign({}, currentProps, props)
diff --git a/src/mol-geo/representation/structure/visual/intra-unit-link-cylinder.ts b/src/mol-geo/representation/structure/visual/intra-unit-link-cylinder.ts
index fc4dcaf3eec07b10bbe092245590bbcca8c047c5..34db658a14585d37db1cb0c745c23551cf73907c 100644
--- a/src/mol-geo/representation/structure/visual/intra-unit-link-cylinder.ts
+++ b/src/mol-geo/representation/structure/visual/intra-unit-link-cylinder.ts
@@ -7,22 +7,20 @@
import { ValueCell } from 'mol-util/value-cell'
-import { createMeshRenderObject, MeshRenderObject } from 'mol-gl/render-object'
+import { MeshRenderObject } from 'mol-gl/render-object'
import { Unit, Link, StructureElement } from 'mol-model/structure';
import { UnitsVisual, DefaultStructureProps } from '..';
import { RuntimeContext } from 'mol-task'
import { DefaultLinkCylinderProps, LinkCylinderProps, createLinkCylinderMesh } from './util/link';
-import { MeshValues } from 'mol-gl/renderable';
-import { getMeshData } from '../../../util/mesh-data';
import { Mesh } from '../../../shape/mesh';
import { PickingId } from '../../../util/picking';
import { Vec3 } from 'mol-math/linear-algebra';
// import { createUniformColor } from '../../../util/color-data';
import { Loci, isEveryLoci, EmptyLoci } from 'mol-model/loci';
-import { MarkerAction, applyMarkerAction, createMarkers, MarkerData } from '../../../util/marker-data';
+import { MarkerAction, applyMarkerAction, MarkerData } from '../../../util/marker-data';
import { SizeTheme } from '../../../theme';
-import { createTransforms, createColors } from './util/common';
-import { createMeshValues, createRenderableState, updateMeshValues, updateRenderableState, DefaultMeshProps } from '../../util';
+import { createColors, createUnitsMeshRenderObject } from './util/common';
+import { updateMeshValues, updateRenderableState, DefaultMeshProps } from '../../util';
import { LinkIterator } from './util/location-iterator';
import { deepEqual } from 'mol-util';
@@ -83,30 +81,11 @@ export function IntraUnitLinkVisual(): UnitsVisual<IntraUnitLinkProps> {
currentProps = Object.assign({}, DefaultIntraUnitLinkProps, props)
currentGroup = group
- const { colorTheme } = { ...DefaultIntraUnitLinkProps, ...props }
const unit = group.units[0]
- const elementCount = Unit.isAtomic(unit) ? unit.links.edgeCount * 2 : 0
- const instanceCount = group.units.length
-
mesh = await createIntraUnitLinkCylinderMesh(ctx, unit, currentProps)
- const transforms = createTransforms(group)
- const color = createColors(LinkIterator.fromGroup(currentGroup), colorTheme)
- const marker = createMarkers(instanceCount * elementCount)
-
- const counts = { drawCount: mesh.triangleCount * 3, elementCount, instanceCount }
-
- const values: MeshValues = {
- ...getMeshData(mesh),
- ...color,
- ...marker,
- aTransform: transforms,
- elements: mesh.indexBuffer,
- ...createMeshValues(currentProps, counts),
- }
- const state = createRenderableState(currentProps)
-
- renderObject = createMeshRenderObject(values, state)
+ const locationIt = LinkIterator.fromGroup(group)
+ renderObject = createUnitsMeshRenderObject(group, mesh, locationIt, currentProps)
},
async update(ctx: RuntimeContext, props: IntraUnitLinkProps) {
const newProps = Object.assign({}, currentProps, props)
diff --git a/src/mol-geo/representation/structure/visual/nucleotide-block-mesh.ts b/src/mol-geo/representation/structure/visual/nucleotide-block-mesh.ts
index 9a4ec8d3b7973667448955b35b04bf3808564a3f..7f76cf611897476eea4ae232a9b88c3cceb9d616 100644
--- a/src/mol-geo/representation/structure/visual/nucleotide-block-mesh.ts
+++ b/src/mol-geo/representation/structure/visual/nucleotide-block-mesh.ts
@@ -6,20 +6,18 @@
import { ValueCell } from 'mol-util/value-cell'
-import { createMeshRenderObject, MeshRenderObject } from 'mol-gl/render-object'
+import { MeshRenderObject } from 'mol-gl/render-object'
import { Unit } from 'mol-model/structure';
import { DefaultStructureProps, UnitsVisual } from '..';
import { RuntimeContext } from 'mol-task'
-import { createTransforms, createColors } from './util/common';
+import { createColors, createUnitsMeshRenderObject } from './util/common';
import { deepEqual } from 'mol-util';
-import { MeshValues } from 'mol-gl/renderable';
-import { getMeshData } from '../../../util/mesh-data';
import { Mesh } from '../../../shape/mesh';
import { PickingId } from '../../../util/picking';
-import { createMarkers, MarkerAction } from '../../../util/marker-data';
+import { MarkerAction } from '../../../util/marker-data';
import { Loci } from 'mol-model/loci';
import { SizeTheme } from '../../../theme';
-import { createMeshValues, updateMeshValues, updateRenderableState, createRenderableState, DefaultMeshProps } from '../../util';
+import { updateMeshValues, updateRenderableState, DefaultMeshProps } from '../../util';
import { MeshBuilder } from '../../../shape/mesh-builder';
import { getElementLoci, markElement } from './util/element';
import { Vec3, Mat4 } from 'mol-math/linear-algebra';
@@ -135,34 +133,15 @@ export function NucleotideBlockVisual(): UnitsVisual<NucleotideBlockProps> {
currentProps = Object.assign({}, DefaultNucleotideBlockProps, props)
currentGroup = group
- const { colorTheme, unitKinds } = { ...DefaultNucleotideBlockProps, ...props }
- const instanceCount = group.units.length
- const elementCount = group.elements.length
+ const { unitKinds } = { ...DefaultNucleotideBlockProps, ...props }
const unit = group.units[0]
mesh = unitKinds.includes(unit.kind)
? await createNucleotideBlockMesh(ctx, unit, mesh)
: Mesh.createEmpty(mesh)
- // console.log(mesh)
-
- const transforms = createTransforms(group)
- const color = createColors(StructureElementIterator.fromGroup(group), colorTheme)
- const marker = createMarkers(instanceCount * elementCount)
-
- const counts = { drawCount: mesh.triangleCount * 3, elementCount, instanceCount }
-
- const values: MeshValues = {
- ...getMeshData(mesh),
- ...color,
- ...marker,
- aTransform: transforms,
- elements: mesh.indexBuffer,
- ...createMeshValues(currentProps, counts),
- aColor: ValueCell.create(new Float32Array(mesh.vertexCount * 3))
- }
- const state = createRenderableState(currentProps)
- renderObject = createMeshRenderObject(values, state)
+ const locationIt = StructureElementIterator.fromGroup(group)
+ renderObject = createUnitsMeshRenderObject(group, mesh, locationIt, currentProps)
},
async update(ctx: RuntimeContext, props: NucleotideBlockProps) {
const newProps = Object.assign({}, currentProps, props)
diff --git a/src/mol-geo/representation/structure/visual/polymer-backbone-cylinder.ts b/src/mol-geo/representation/structure/visual/polymer-backbone-cylinder.ts
index 518e0ce126dbf1cc9803773baae3ebac0577d683..2956a9d8ea5e60f66fa74eaa141fe7365d547adc 100644
--- a/src/mol-geo/representation/structure/visual/polymer-backbone-cylinder.ts
+++ b/src/mol-geo/representation/structure/visual/polymer-backbone-cylinder.ts
@@ -6,20 +6,18 @@
import { ValueCell } from 'mol-util/value-cell'
-import { createMeshRenderObject, MeshRenderObject } from 'mol-gl/render-object'
+import { MeshRenderObject } from 'mol-gl/render-object'
import { Unit } from 'mol-model/structure';
import { DefaultStructureProps, UnitsVisual } from '..';
import { RuntimeContext } from 'mol-task'
-import { createTransforms, createColors } from './util/common';
+import { createColors, createUnitsMeshRenderObject } from './util/common';
import { deepEqual } from 'mol-util';
-import { MeshValues } from 'mol-gl/renderable';
-import { getMeshData } from '../../../util/mesh-data';
import { Mesh } from '../../../shape/mesh';
import { PickingId } from '../../../util/picking';
-import { createMarkers, MarkerAction } from '../../../util/marker-data';
+import { MarkerAction } from '../../../util/marker-data';
import { Loci } from 'mol-model/loci';
import { SizeTheme } from '../../../theme';
-import { createMeshValues, updateMeshValues, updateRenderableState, createRenderableState, DefaultMeshProps } from '../../util';
+import { updateMeshValues, updateRenderableState, DefaultMeshProps } from '../../util';
import { MeshBuilder } from '../../../shape/mesh-builder';
import { getPolymerElementCount, PolymerBackboneIterator } from './util/polymer';
import { getElementLoci, markElement } from './util/element';
@@ -81,34 +79,15 @@ export function PolymerBackboneVisual(): UnitsVisual<PolymerBackboneProps> {
currentProps = Object.assign({}, DefaultPolymerBackboneProps, props)
currentGroup = group
- const { colorTheme, unitKinds } = { ...DefaultPolymerBackboneProps, ...props }
- const instanceCount = group.units.length
- const elementCount = group.elements.length
+ const { unitKinds } = { ...DefaultPolymerBackboneProps, ...props }
const unit = group.units[0]
mesh = unitKinds.includes(unit.kind)
? await createPolymerBackboneCylinderMesh(ctx, unit, mesh)
: Mesh.createEmpty(mesh)
- // console.log(mesh)
-
- const transforms = createTransforms(group)
- const color = createColors(StructureElementIterator.fromGroup(group), colorTheme)
- const marker = createMarkers(instanceCount * elementCount)
-
- const counts = { drawCount: mesh.triangleCount * 3, elementCount, instanceCount }
-
- const values: MeshValues = {
- ...getMeshData(mesh),
- ...color,
- ...marker,
- aTransform: transforms,
- elements: mesh.indexBuffer,
- ...createMeshValues(currentProps, counts),
- aColor: ValueCell.create(new Float32Array(mesh.vertexCount * 3))
- }
- const state = createRenderableState(currentProps)
- renderObject = createMeshRenderObject(values, state)
+ const locationIt = StructureElementIterator.fromGroup(group)
+ renderObject = createUnitsMeshRenderObject(group, mesh, locationIt, currentProps)
},
async update(ctx: RuntimeContext, props: PolymerBackboneProps) {
const newProps = Object.assign({}, currentProps, props)
diff --git a/src/mol-geo/representation/structure/visual/polymer-direction-wedge.ts b/src/mol-geo/representation/structure/visual/polymer-direction-wedge.ts
index 9069d6f38697bf1cb4d744cd470cdc633ba17ae3..926d767756de74bfecf28d04d94fca2ba19e13be 100644
--- a/src/mol-geo/representation/structure/visual/polymer-direction-wedge.ts
+++ b/src/mol-geo/representation/structure/visual/polymer-direction-wedge.ts
@@ -6,22 +6,20 @@
import { ValueCell } from 'mol-util/value-cell'
-import { createMeshRenderObject, MeshRenderObject } from 'mol-gl/render-object'
+import { MeshRenderObject } from 'mol-gl/render-object'
import { Unit, StructureElement } from 'mol-model/structure';
import { DefaultStructureProps, UnitsVisual } from '..';
import { RuntimeContext } from 'mol-task'
-import { createTransforms, createColors } from './util/common';
+import { createColors, createUnitsMeshRenderObject } from './util/common';
import { markElement } from './util/element';
import { deepEqual } from 'mol-util';
-import { MeshValues } from 'mol-gl/renderable';
-import { getMeshData } from '../../../util/mesh-data';
import { Mesh } from '../../../shape/mesh';
import { PickingId } from '../../../util/picking';
import { OrderedSet } from 'mol-data/int';
-import { createMarkers, MarkerAction } from '../../../util/marker-data';
+import { MarkerAction } from '../../../util/marker-data';
import { Loci, EmptyLoci } from 'mol-model/loci';
import { SizeTheme } from '../../../theme';
-import { createMeshValues, updateMeshValues, updateRenderableState, createRenderableState, DefaultMeshProps } from '../../util';
+import { updateMeshValues, updateRenderableState, DefaultMeshProps } from '../../util';
import { MeshBuilder } from '../../../shape/mesh-builder';
import { getPolymerElementCount, PolymerTraceIterator, createCurveSegmentState, interpolateCurveSegment } from './util/polymer';
import { Vec3, Mat4 } from 'mol-math/linear-algebra';
@@ -109,32 +107,15 @@ export function PolymerDirectionVisual(): UnitsVisual<PolymerDirectionProps> {
currentProps = Object.assign({}, DefaultPolymerDirectionProps, props)
currentGroup = group
- const { colorTheme, unitKinds } = { ...DefaultPolymerDirectionProps, ...props }
- const instanceCount = group.units.length
- const elementCount = group.elements.length
+ const { unitKinds } = { ...DefaultPolymerDirectionProps, ...props }
const unit = group.units[0]
mesh = unitKinds.includes(unit.kind)
? await createPolymerDirectionWedgeMesh(ctx, unit, mesh)
: Mesh.createEmpty(mesh)
- const transforms = createTransforms(group)
- const color = createColors(StructureElementIterator.fromGroup(group), colorTheme)
- const marker = createMarkers(instanceCount * elementCount)
-
- const counts = { drawCount: mesh.triangleCount * 3, elementCount, instanceCount }
-
- const values: MeshValues = {
- ...getMeshData(mesh),
- ...color,
- ...marker,
- aTransform: transforms,
- elements: mesh.indexBuffer,
- ...createMeshValues(currentProps, counts),
- }
- const state = createRenderableState(currentProps)
-
- renderObject = createMeshRenderObject(values, state)
+ const locationIt = StructureElementIterator.fromGroup(group)
+ renderObject = createUnitsMeshRenderObject(group, mesh, locationIt, currentProps)
},
async update(ctx: RuntimeContext, props: PolymerDirectionProps) {
const newProps = Object.assign({}, currentProps, props)
diff --git a/src/mol-geo/representation/structure/visual/polymer-gap-cylinder.ts b/src/mol-geo/representation/structure/visual/polymer-gap-cylinder.ts
index 4940c5f5318b55a8b8c93cedb6f4e1730208736e..5c9dc9668a7c7515b6c7e234398e9a5ad26fb7df 100644
--- a/src/mol-geo/representation/structure/visual/polymer-gap-cylinder.ts
+++ b/src/mol-geo/representation/structure/visual/polymer-gap-cylinder.ts
@@ -6,20 +6,18 @@
import { ValueCell } from 'mol-util/value-cell'
-import { createMeshRenderObject, MeshRenderObject } from 'mol-gl/render-object'
+import { MeshRenderObject } from 'mol-gl/render-object'
import { Unit } from 'mol-model/structure';
import { DefaultStructureProps, UnitsVisual } from '..';
import { RuntimeContext } from 'mol-task'
-import { createTransforms, createColors } from './util/common';
+import { createColors, createUnitsMeshRenderObject } from './util/common';
import { deepEqual } from 'mol-util';
-import { MeshValues } from 'mol-gl/renderable';
-import { getMeshData } from '../../../util/mesh-data';
import { Mesh } from '../../../shape/mesh';
import { PickingId } from '../../../util/picking';
-import { createMarkers, MarkerAction } from '../../../util/marker-data';
+import { MarkerAction } from '../../../util/marker-data';
import { Loci } from 'mol-model/loci';
import { SizeTheme } from '../../../theme';
-import { createMeshValues, updateMeshValues, updateRenderableState, createRenderableState, DefaultMeshProps } from '../../util';
+import { updateMeshValues, updateRenderableState, DefaultMeshProps } from '../../util';
import { MeshBuilder } from '../../../shape/mesh-builder';
import { getPolymerGapCount, PolymerGapIterator } from './util/polymer';
import { getElementLoci, markElement } from './util/element';
@@ -87,34 +85,15 @@ export function PolymerGapVisual(): UnitsVisual<PolymerGapProps> {
currentProps = Object.assign({}, DefaultPolymerGapProps, props)
currentGroup = group
- const { colorTheme, unitKinds } = { ...DefaultPolymerGapProps, ...props }
- const instanceCount = group.units.length
- const elementCount = group.elements.length
+ const { unitKinds } = { ...DefaultPolymerGapProps, ...props }
const unit = group.units[0]
mesh = unitKinds.includes(unit.kind)
? await createPolymerGapCylinderMesh(ctx, unit, mesh)
: Mesh.createEmpty(mesh)
- // console.log(mesh)
-
- const transforms = createTransforms(group)
- const color = createColors(StructureElementIterator.fromGroup(group), colorTheme)
- const marker = createMarkers(instanceCount * elementCount)
-
- const counts = { drawCount: mesh.triangleCount * 3, elementCount, instanceCount }
-
- const values: MeshValues = {
- ...getMeshData(mesh),
- ...color,
- ...marker,
- aTransform: transforms,
- elements: mesh.indexBuffer,
- ...createMeshValues(currentProps, counts),
- aColor: ValueCell.create(new Float32Array(mesh.vertexCount * 3))
- }
- const state = createRenderableState(currentProps)
- renderObject = createMeshRenderObject(values, state)
+ const locationIt = StructureElementIterator.fromGroup(group)
+ renderObject = createUnitsMeshRenderObject(group, mesh, locationIt, currentProps)
},
async update(ctx: RuntimeContext, props: PolymerGapProps) {
const newProps = Object.assign({}, currentProps, props)
diff --git a/src/mol-geo/representation/structure/visual/polymer-trace-mesh.ts b/src/mol-geo/representation/structure/visual/polymer-trace-mesh.ts
index 3b37589e8d3e3a580c196f553b1c64c0dcce3d46..472f4366e296ea3d8619855c7a98dbc8294dcc48 100644
--- a/src/mol-geo/representation/structure/visual/polymer-trace-mesh.ts
+++ b/src/mol-geo/representation/structure/visual/polymer-trace-mesh.ts
@@ -6,22 +6,20 @@
import { ValueCell } from 'mol-util/value-cell'
-import { createMeshRenderObject, MeshRenderObject } from 'mol-gl/render-object'
+import { MeshRenderObject } from 'mol-gl/render-object'
import { Unit, StructureElement } from 'mol-model/structure';
import { DefaultStructureProps, UnitsVisual } from '..';
import { RuntimeContext } from 'mol-task'
-import { createTransforms, createColors } from './util/common';
+import { createColors, createUnitsMeshRenderObject } from './util/common';
import { markElement } from './util/element';
import { deepEqual } from 'mol-util';
-import { MeshValues } from 'mol-gl/renderable';
-import { getMeshData } from '../../../util/mesh-data';
import { Mesh } from '../../../shape/mesh';
import { PickingId } from '../../../util/picking';
import { OrderedSet } from 'mol-data/int';
-import { createMarkers, MarkerAction } from '../../../util/marker-data';
+import { MarkerAction } from '../../../util/marker-data';
import { Loci, EmptyLoci } from 'mol-model/loci';
import { SizeTheme } from '../../../theme';
-import { createMeshValues, updateMeshValues, updateRenderableState, createRenderableState, DefaultMeshProps } from '../../util';
+import { updateMeshValues, updateRenderableState, DefaultMeshProps } from '../../util';
import { MeshBuilder } from '../../../shape/mesh-builder';
import { getPolymerElementCount, PolymerTraceIterator, createCurveSegmentState, interpolateCurveSegment } from './util/polymer';
import { SecondaryStructureType, MoleculeType } from 'mol-model/structure/model/types';
@@ -102,32 +100,15 @@ export function PolymerTraceVisual(): UnitsVisual<PolymerTraceProps> {
currentProps = Object.assign({}, DefaultPolymerTraceProps, props)
currentGroup = group
- const { colorTheme, unitKinds } = { ...DefaultPolymerTraceProps, ...props }
- const instanceCount = group.units.length
- const elementCount = group.elements.length
+ const { unitKinds } = { ...DefaultPolymerTraceProps, ...props }
const unit = group.units[0]
mesh = unitKinds.includes(unit.kind)
? await createPolymerTraceMesh(ctx, unit, mesh)
: Mesh.createEmpty(mesh)
- const transforms = createTransforms(group)
- const color = createColors(StructureElementIterator.fromGroup(group), colorTheme)
- const marker = createMarkers(instanceCount * elementCount)
-
- const counts = { drawCount: mesh.triangleCount * 3, elementCount, instanceCount }
-
- const values: MeshValues = {
- ...getMeshData(mesh),
- ...color,
- ...marker,
- aTransform: transforms,
- elements: mesh.indexBuffer,
- ...createMeshValues(currentProps, counts),
- }
- const state = createRenderableState(currentProps)
-
- renderObject = createMeshRenderObject(values, state)
+ const locationIt = StructureElementIterator.fromGroup(group)
+ renderObject = createUnitsMeshRenderObject(group, mesh, locationIt, currentProps)
},
async update(ctx: RuntimeContext, props: PolymerTraceProps) {
const newProps = Object.assign({}, currentProps, props)
diff --git a/src/mol-geo/representation/structure/visual/util/common.ts b/src/mol-geo/representation/structure/visual/util/common.ts
index d4264354fee2a72890d394307d57debcdd9aa364..25fd7d1041333757915aedc8d86f8a0663074760 100644
--- a/src/mol-geo/representation/structure/visual/util/common.ts
+++ b/src/mol-geo/representation/structure/visual/util/common.ts
@@ -5,7 +5,7 @@
* @author David Sehnal <david.sehnal@gmail.com>
*/
-import { Unit } from 'mol-model/structure';
+import { Unit, Structure } from 'mol-model/structure';
import { Mat4 } from 'mol-math/linear-algebra'
import { createUniformColor, ColorData } from '../../../../util/color-data';
@@ -17,6 +17,13 @@ import { elementIndexColorData, elementSymbolColorData, instanceIndexColorData,
import { ValueCell, defaults } from 'mol-util';
import { LocationIterator } from './location-iterator';
import { carbohydrateSymbolColorData } from '../../../../theme/structure/color/carbohydrate-symbol';
+import { Mesh } from '../../../../shape/mesh';
+import { MeshValues } from 'mol-gl/renderable';
+import { getMeshData } from '../../../../util/mesh-data';
+import { MeshProps, createMeshValues, createRenderableState } from '../../../util';
+import { StructureProps } from '../..';
+import { createMarkers } from '../../../../util/marker-data';
+import { createMeshRenderObject } from 'mol-gl/render-object';
export function createTransforms({ units }: Unit.SymmetryGroup, transforms?: ValueCell<Float32Array>) {
const unitCount = units.length
@@ -51,18 +58,6 @@ export function createColors(locationIt: LocationIterator, props: ColorTheme, co
}
}
-// export function createLinkColors(group: Unit.SymmetryGroup, props: ColorTheme, colorData?: ColorData): ColorData {
-// switch (props.name) {
-// case 'atom-index':
-// case 'chain-id':
-// case 'element-symbol':
-// case 'instance-index':
-// return chainIdLinkColorData({ group, vertexMap }, colorData)
-// case 'uniform':
-// return createUniformColor(props, colorData)
-// }
-// }
-
export function createSizes(group: Unit.SymmetryGroup, vertexMap: VertexMap, props: SizeTheme): SizeData {
switch (props.name) {
case 'uniform':
@@ -70,4 +65,45 @@ export function createSizes(group: Unit.SymmetryGroup, vertexMap: VertexMap, pro
case 'physical':
return physicalSizeData(defaults(props.factor, 1), { group, vertexMap })
}
+}
+
+type StructureMeshProps = Required<MeshProps & StructureProps>
+
+function _createMeshValues(transforms: ValueCell<Float32Array>, mesh: Mesh, locationIt: LocationIterator, props: StructureMeshProps): MeshValues {
+ const { instanceCount, elementCount } = locationIt
+ const color = createColors(locationIt, props.colorTheme)
+ const marker = createMarkers(instanceCount * elementCount)
+
+ const counts = { drawCount: mesh.triangleCount * 3, elementCount, instanceCount }
+
+ return {
+ ...getMeshData(mesh),
+ ...color,
+ ...marker,
+ aTransform: transforms,
+ elements: mesh.indexBuffer,
+ ...createMeshValues(props, counts)
+ }
+}
+
+export function createStructureMeshValues(structure: Structure, mesh: Mesh, locationIt: LocationIterator, props: StructureMeshProps): MeshValues {
+ const transforms = createIdentityTransform()
+ return _createMeshValues(transforms, mesh, locationIt, props)
+}
+
+export function createUnitsMeshValues(group: Unit.SymmetryGroup, mesh: Mesh, locationIt: LocationIterator, props: StructureMeshProps): MeshValues {
+ const transforms = createTransforms(group)
+ return _createMeshValues(transforms, mesh, locationIt, props)
+}
+
+export function createStructureMeshRenderObject(structure: Structure, mesh: Mesh, locationIt: LocationIterator, props: StructureMeshProps) {
+ const values = createStructureMeshValues(structure, mesh, locationIt, props)
+ const state = createRenderableState(props)
+ return createMeshRenderObject(values, state)
+}
+
+export function createUnitsMeshRenderObject(group: Unit.SymmetryGroup, mesh: Mesh, locationIt: LocationIterator, props: StructureMeshProps) {
+ const values = createUnitsMeshValues(group, mesh, locationIt, props)
+ const state = createRenderableState(props)
+ return createMeshRenderObject(values, state)
}
\ No newline at end of file