浏览代码

Fixes and added changelog entry

giagitom 2 年之前
父节点
当前提交
5934f355c2
共有 3 个文件被更改,包括 4 次插入2 次删除
  1. 2 0
      CHANGELOG.md
  2. 1 1
      src/mol-geo/geometry/cylinders/cylinders-builder.ts
  3. 1 1
      src/mol-repr/structure/visual/util/link.ts

+ 2 - 0
CHANGELOG.md

@@ -6,6 +6,8 @@ Note that since we don't clearly distinguish between a public and private interf
 
 ## [Unreleased]
 
+- Add color interpolation to impostor cylinders
+
 ## [v3.35.0] - 2023-05-14
 
 - Enable odd dash count (1,3,5)

+ 1 - 1
src/mol-geo/geometry/cylinders/cylinders-builder.ts

@@ -64,7 +64,7 @@ export namespace CylindersBuilder {
                 if (interpolate) {
                     colorMode = Vec3.distance(start, tmpVecB) / (d * 2);
                 }
-                add(tmpVecA[0], tmpVecA[1], tmpVecA[2], tmpVecB[0], tmpVecB[1], tmpVecB[2], radiusScale, topCap, bottomCap, group);
+                add(tmpVecA[0], tmpVecA[1], tmpVecA[2], tmpVecB[0], tmpVecB[1], tmpVecB[2], radiusScale, topCap, bottomCap, colorMode, group);
                 Vec3.add(tmpVecA, tmpVecA, tmpDir);
             }
         };

+ 1 - 1
src/mol-repr/structure/visual/util/link.ts

@@ -297,7 +297,7 @@ export function createLinkCylinderImpostors(ctx: VisualContext, linkBuilder: Lin
             builder.add(va[0], va[1], va[2], vm[0], vm[1], vm[2], 1, linkCap, linkStub, colorModeFlag, edgeIndex);
         } else if (linkStyle === LinkStyle.Dashed) {
             v3scale(vm, v3add(vm, va, vb), 0.5);
-            builder.addFixedCountDashes(va, vm, dashCount, dashScale, dashCap, dashCap, linkStub, colorModeFlag, edgeIndex);
+            builder.addFixedCountDashes(va, vm, dashCount, dashScale, dashCap, dashCap, linkStub, interpolate, edgeIndex);
         } else if (linkStyle === LinkStyle.Double || linkStyle === LinkStyle.OffsetDouble || linkStyle === LinkStyle.Triple || linkStyle === LinkStyle.OffsetTriple || linkStyle === LinkStyle.Aromatic || linkStyle === LinkStyle.MirroredAromatic) {
             const order = (linkStyle === LinkStyle.Double || linkStyle === LinkStyle.OffsetDouble) ? 2 :
                 (linkStyle === LinkStyle.Triple || linkStyle === LinkStyle.OffsetTriple) ? 3 : 1.5;