Skip to content
Snippets Groups Projects
Commit f2e7e2ea authored by giagitom's avatar giagitom
Browse files

Fix unequeal aromatic dashes

parent 01c4c631
No related branches found
No related tags found
No related merge requests found
...@@ -309,6 +309,9 @@ export function createLinkCylinderImpostors(ctx: VisualContext, linkBuilder: Lin ...@@ -309,6 +309,9 @@ export function createLinkCylinderImpostors(ctx: VisualContext, linkBuilder: Lin
const aromaticOffset = linkRadius + aromaticScale * linkRadius + aromaticScale * linkRadius * aromaticSpacing; const aromaticOffset = linkRadius + aromaticScale * linkRadius + aromaticScale * linkRadius * aromaticSpacing;
v3setMagnitude(tmpV12, v3sub(tmpV12, vb, va), linkRadius * 0.5);
v3add(va, va, tmpV12);
v3setMagnitude(vShift, vShift, aromaticOffset); v3setMagnitude(vShift, vShift, aromaticOffset);
v3sub(va, va, vShift); v3sub(va, va, vShift);
v3sub(vm, vm, vShift); v3sub(vm, vm, vShift);
...@@ -414,13 +417,18 @@ export function createLinkLines(ctx: VisualContext, linkBuilder: LinkBuilderProp ...@@ -414,13 +417,18 @@ export function createLinkLines(ctx: VisualContext, linkBuilder: LinkBuilderProp
if (linkStyle === LinkStyle.Aromatic || linkStyle === LinkStyle.MirroredAromatic) { if (linkStyle === LinkStyle.Aromatic || linkStyle === LinkStyle.MirroredAromatic) {
builder.add(va[0], va[1], va[2], vm[0], vm[1], vm[2], edgeIndex); builder.add(va[0], va[1], va[2], vm[0], vm[1], vm[2], edgeIndex);
v3setMagnitude(vShift, vShift, absOffset * aromaticOffsetFactor); const aromaticOffset = absOffset * aromaticOffsetFactor;
v3setMagnitude(tmpV12, v3sub(tmpV12, vb, va), aromaticOffset * 0.5);
v3add(va, va, tmpV12);
v3setMagnitude(vShift, vShift, aromaticOffset);
v3sub(va, va, vShift); v3sub(va, va, vShift);
v3sub(vm, vm, vShift); v3sub(vm, vm, vShift);
builder.addFixedCountDashes(va, vm, aromaticDashCount, edgeIndex); builder.addFixedCountDashes(va, vm, aromaticDashCount, edgeIndex);
if (linkStyle === LinkStyle.MirroredAromatic) { if (linkStyle === LinkStyle.MirroredAromatic) {
v3setMagnitude(vShift, vShift, absOffset * aromaticOffsetFactor * 2); v3setMagnitude(vShift, vShift, aromaticOffset * 2);
v3add(va, va, vShift); v3add(va, va, vShift);
v3add(vm, vm, vShift); v3add(vm, vm, vShift);
builder.addFixedCountDashes(va, vm, aromaticDashCount, edgeIndex); builder.addFixedCountDashes(va, vm, aromaticDashCount, edgeIndex);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment