Merge branch 'master' of github.com:3dmol/3Dmol.js

3dmol · Feb 28, 2024 · a64b4ec · a64b4ec
2 parents 11bb7c6 + 26a69d1
commit a64b4ec
Show file tree

Hide file tree

Showing 24 changed files with 529 additions and 357 deletions.
diff --git a/py3Dmol/README.md b/py3Dmol/README.md
@@ -23,12 +23,6 @@ From PyPI:
     pip install py3Dmol
 
 
-*Important:* In order to use with JupyterLab you must install the JupyterLab extension:
-
-    jupyter labextension install jupyterlab_3dmol
-
-
-
 Usage
 -----
 

diff --git a/src/GLModel.ts b/src/GLModel.ts
@@ -291,6 +291,11 @@ export class GLModel {
                 i2 = (i + 1) % atom2.bonds.length;
                 j2 = atom2.bonds[i2];
                 atom3 = this.atoms[j2];
+                if(atom3.index == atom.index) { // get distinct atom
+                    i2 = (i2 + 1) % atom2.bonds.length;
+                    j2 = atom2.bonds[i2];
+                    atom3 = this.atoms[j2];
+                }
                 p3 = new Vector3(atom3.x, atom3.y, atom3.z);
 
                 dir2 = p3.clone();
@@ -322,9 +327,6 @@ export class GLModel {
         v.normalize();
 
         return v;
-
-        //v.multiplyScalar(r * 1.5);
-
     };
 
     private addLine(vertexArray, colorArray, offset, p1: Vector3, p2: Vector3, c1: Color) {