From 710c7b8ac4e29a3ad84906133cfee4fad3d546cc Mon Sep 17 00:00:00 2001
From: Alexander Rose <alexander.rose@weirdbyte.de>
Date: Sat, 1 Dec 2018 23:53:09 -0800
Subject: [PATCH] bounding sphere helper improvements
---
.../helper/bounding-sphere-helper.ts | 34 ++++++++-----------
src/mol-geo/geometry/mesh/mesh.ts | 18 ++++++----
src/mol-gl/renderable.ts | 10 +++++-
3 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/src/mol-canvas3d/helper/bounding-sphere-helper.ts b/src/mol-canvas3d/helper/bounding-sphere-helper.ts
index b0bf34749..cf86f9073 100644
--- a/src/mol-canvas3d/helper/bounding-sphere-helper.ts
+++ b/src/mol-canvas3d/helper/bounding-sphere-helper.ts
@@ -12,9 +12,9 @@ import { ParamDefinition as PD } from 'mol-util/param-definition';
import Scene from 'mol-gl/scene';
import { WebGLContext } from 'mol-gl/webgl/context';
import { Sphere3D } from 'mol-math/geometry';
-import { Vec3, Mat4 } from 'mol-math/linear-algebra';
import { Color } from 'mol-util/color';
import { ColorNames } from 'mol-util/color/tables';
+import { TransformData } from 'mol-geo/geometry/transform-data';
export const DebugHelperParams = {
sceneBoundingSpheres: PD.Boolean(false, { description: 'Show scene bounding spheres.' }),
@@ -52,7 +52,12 @@ export class BoundingSphereHelper {
if (ro.type === 'mesh' || ro.type === 'lines' || ro.type === 'points') {
const instanceData = this.instancesData.get(ro)
- const newInstanceData = updateBoundingSphereData(this.scene, ro.values.invariantBoundingSphere.ref.value, instanceData, ColorNames.skyblue, ro.values.aTransform.ref.value, ro.values.instanceCount.ref.value)
+ const newInstanceData = updateBoundingSphereData(this.scene, r.invariantBoundingSphere, instanceData, ColorNames.skyblue, {
+ aTransform: ro.values.aTransform,
+ uInstanceCount: ro.values.uInstanceCount,
+ instanceCount: ro.values.instanceCount,
+ aInstance: ro.values.aInstance,
+ })
if (newInstanceData) this.instancesData.set(ro, newInstanceData)
}
@@ -65,6 +70,8 @@ export class BoundingSphereHelper {
this.objectsData.delete(ro)
}
})
+
+ this.scene.update()
}
syncVisibility() {
@@ -98,30 +105,19 @@ export class BoundingSphereHelper {
}
}
-function updateBoundingSphereData(scene: Scene, boundingSphere: Sphere3D, data: BoundingSphereData | undefined, color: Color, transform?: Float32Array, transformCount?: number) {
+function updateBoundingSphereData(scene: Scene, boundingSphere: Sphere3D, data: BoundingSphereData | undefined, color: Color, transform?: TransformData) {
if (!data || !Sphere3D.exactEquals(data.boundingSphere, boundingSphere)) {
if (data) scene.remove(data.renderObject)
- const renderObject = createBoundingSphereRenderObject(boundingSphere, color, transform, transformCount)
+ const renderObject = createBoundingSphereRenderObject(boundingSphere, color, transform)
scene.add(renderObject)
- return { boundingSphere, renderObject }
+ return { boundingSphere: Sphere3D.clone(boundingSphere), renderObject }
}
}
-const tmpCenter = Vec3.zero()
-const tmpM = Mat4.identity()
-function createBoundingSphereRenderObject(boundingSphere: Sphere3D, color: Color, transform?: Float32Array, transformCount?: number) {
+function createBoundingSphereRenderObject(boundingSphere: Sphere3D, color: Color, transform?: TransformData) {
const builderState = MeshBuilder.createState(1024, 512)
- if (transform && transformCount) {
- // TODO create instanced mesh?
- for (let i = 0, _i = transformCount; i < _i; ++i) {
- Mat4.fromArray(tmpM, transform, i * 16)
- Vec3.transformMat4(tmpCenter, boundingSphere.center, tmpM)
- if (boundingSphere.radius) addSphere(builderState, tmpCenter, boundingSphere.radius, 1)
- }
- } else {
- if (boundingSphere.radius) addSphere(builderState, boundingSphere.center, boundingSphere.radius, 2)
- }
+ if (boundingSphere.radius) addSphere(builderState, boundingSphere.center, boundingSphere.radius, 2)
const mesh = MeshBuilder.getMesh(builderState)
- const values = Mesh.createValuesSimple(mesh, { alpha: 0.1, doubleSided: false }, color)
+ const values = Mesh.createValuesSimple(mesh, { alpha: 0.1, doubleSided: false }, color, transform)
return createMeshRenderObject(values, { visible: true, pickable: false, opaque: false })
}
\ No newline at end of file
diff --git a/src/mol-geo/geometry/mesh/mesh.ts b/src/mol-geo/geometry/mesh/mesh.ts
index f5e8180ba..6f4956b4e 100644
--- a/src/mol-geo/geometry/mesh/mesh.ts
+++ b/src/mol-geo/geometry/mesh/mesh.ts
@@ -350,6 +350,10 @@ export namespace Mesh {
export function createValues(mesh: Mesh, transform: TransformData, locationIt: LocationIterator, theme: Theme, props: PD.Values<Params>): MeshValues {
const { instanceCount, groupCount } = locationIt
+ if (instanceCount !== transform.instanceCount.ref.value) {
+ throw new Error('instanceCount values in TransformData and LocationIterator differ')
+ }
+
const color = createColors(locationIt, theme.color)
const marker = createMarkers(instanceCount * groupCount)
@@ -357,7 +361,7 @@ export namespace Mesh {
const { boundingSphere, invariantBoundingSphere } = calculateBoundingSphere(
mesh.vertexBuffer.ref.value, mesh.vertexCount,
- transform.aTransform.ref.value, transform.instanceCount.ref.value
+ transform.aTransform.ref.value, instanceCount
)
return {
@@ -378,17 +382,19 @@ export namespace Mesh {
}
}
- export function createValuesSimple(mesh: Mesh, props: Partial<PD.Values<Params>>, colorValue = ColorNames.grey): MeshValues {
+ export function createValuesSimple(mesh: Mesh, props: Partial<PD.Values<Params>>, colorValue = ColorNames.grey, transform?: TransformData): MeshValues {
const p = { ...PD.getDefaultValues(Params), ...props }
- const transform = createIdentityTransform()
+ if (!transform) transform = createIdentityTransform()
+ const instanceCount = transform.instanceCount.ref.value
+ const groupCount = 1
const color = createValueColor(colorValue)
- const marker = createMarkers(1)
+ const marker = createMarkers(instanceCount * groupCount)
- const counts = { drawCount: mesh.triangleCount * 3, groupCount: 1, instanceCount: 1 }
+ const counts = { drawCount: mesh.triangleCount * 3, groupCount, instanceCount }
const { boundingSphere, invariantBoundingSphere } = calculateBoundingSphere(
mesh.vertexBuffer.ref.value, mesh.vertexCount,
- transform.aTransform.ref.value, transform.instanceCount.ref.value
+ transform.aTransform.ref.value, instanceCount
)
return {
diff --git a/src/mol-gl/renderable.ts b/src/mol-gl/renderable.ts
index 34198cee0..c92cdbf8d 100644
--- a/src/mol-gl/renderable.ts
+++ b/src/mol-gl/renderable.ts
@@ -21,6 +21,7 @@ export interface Renderable<T extends RenderableValues> {
readonly values: T
readonly state: RenderableState
readonly boundingSphere: Sphere3D
+ readonly invariantBoundingSphere: Sphere3D
render: (variant: RenderVariant) => void
getProgram: (variant: RenderVariant) => Program
@@ -29,7 +30,8 @@ export interface Renderable<T extends RenderableValues> {
}
export function createRenderable<T extends Values<RenderableSchema>>(renderItem: RenderItem, values: T, state: RenderableState): Renderable<T> {
- let boundingSphere: Sphere3D = Sphere3D.create(Vec3.zero(), 50)
+ const boundingSphere: Sphere3D = Sphere3D.create(Vec3.zero(), 0)
+ const invariantBoundingSphere: Sphere3D = Sphere3D.create(Vec3.zero(), 0)
return {
values,
@@ -40,6 +42,12 @@ export function createRenderable<T extends Values<RenderableSchema>>(renderItem:
}
return boundingSphere
},
+ get invariantBoundingSphere () {
+ if (values.invariantBoundingSphere) {
+ Sphere3D.copy(invariantBoundingSphere, values.invariantBoundingSphere.ref.value)
+ }
+ return invariantBoundingSphere
+ },
render: (variant: RenderVariant) => {
if (values.uPickable) {
--
GitLab