From 9a0c87695f09d0df39a19edf7b0d97ebdb2ddbe3 Mon Sep 17 00:00:00 2001 From: JonStargaryen <sebastian.bittrich@rcsb.org> Date: Mon, 24 May 2021 11:45:38 -0700 Subject: [PATCH] cleanup --- src/extensions/anvil/algorithm.ts | 7 ------- src/extensions/anvil/representation.ts | 5 ++++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/extensions/anvil/algorithm.ts b/src/extensions/anvil/algorithm.ts index ef1fb48a3..597d8728c 100644 --- a/src/extensions/anvil/algorithm.ts +++ b/src/extensions/anvil/algorithm.ts @@ -151,18 +151,11 @@ export async function calculate(runtime: RuntimeContext, structure: Structure, p const normalVector = Vec3.zero(); const center = Vec3.zero(); - const jitter = [0.001, 0.001, 0.001] as Vec3; Vec3.sub(normalVector, membrane.planePoint1, membrane.planePoint2); Vec3.normalize(normalVector, normalVector); - // prevent degenerate matrices (e.g., 5cbg - assembly 1 which is oriented along the y-axis) - if (Math.abs(normalVector[0]) === 1 || Math.abs(normalVector[1]) === 1 || Math.abs(normalVector[2]) === 1) { - Vec3.add(normalVector, normalVector, jitter); - } - Vec3.add(center, membrane.planePoint1, membrane.planePoint2); Vec3.scale(center, center, 0.5); - Vec3.add(center, center, jitter); const extent = adjustExtent(ctx, membrane, center); return { diff --git a/src/extensions/anvil/representation.ts b/src/extensions/anvil/representation.ts index 029e66d1e..f85d266bf 100644 --- a/src/extensions/anvil/representation.ts +++ b/src/extensions/anvil/representation.ts @@ -119,8 +119,11 @@ function getLayerCircle(builder: LinesBuilder, p: Vec3, centroid: Vec3, normal: } const tmpMat = Mat4(); +const tmpV = Vec3(); +const jitter = Vec3.create(0.001, 0.001, 0.001); function getCircle(p: Vec3, centroid: Vec3, normal: Vec3, radius: number) { - Mat4.targetTo(tmpMat, p, centroid, normal); + Vec3.add(tmpV, centroid, jitter); + Mat4.targetTo(tmpMat, p, tmpV, normal); Mat4.setTranslation(tmpMat, p); Mat4.mul(tmpMat, tmpMat, Mat4.rotX90); -- GitLab