Skip to content

Commit

Permalink
Pull request #583: Fixed the VR view when only one controller is avai…
Browse files Browse the repository at this point in the history
…lable.

Merge in STRUC/icn3d from release3233 to master

* commit '5bc839b71f03fc71b158038b209e2a395fc6c8a0':
  Fixed the VR view when only one controller is available.
  • Loading branch information
jiywang3 committed Apr 6, 2023
2 parents a03cca1 + 5bc839b commit df506ff
Show file tree
Hide file tree
Showing 36 changed files with 1,208 additions and 340 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
## Change Log
[icn3d-3.23.3](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.23.3.zip) was release on April 6, 2023. Fixed the VR view when only one controller is available.

[icn3d-3.23.2](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.23.2.zip) was release on April 2, 2023. Added the document at https://pypi.org/project/icn3dpy/ for loading a local/remote PDB file or iCn3D PNG Image into iCn3D in Jupyter Notebook; added both "Load" and "Append" options when launching a structure.

[icn3d-3.23.1](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.23.1.zip) was release on March 22, 2023. Added the feature to scale in AR view of iCn3D; changed the default coloring to "AlphaFold Confidence" when lining from BLAST to iCn3D for AlphaFold structures; added the wildcard symbol "*" for atom name selection.
Expand Down
296 changes: 234 additions & 62 deletions build/icn3d.js

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions build/icn3d.min.js

Large diffs are not rendered by default.

296 changes: 234 additions & 62 deletions build/icn3d.module.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions dist/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
## Change Log
[icn3d-3.23.3](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.23.3.zip) was release on April 6, 2023. Fixed the VR view when only one controller is available.

[icn3d-3.23.2](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.23.2.zip) was release on April 2, 2023. Added the document at https://pypi.org/project/icn3dpy/ for loading a local/remote PDB file or iCn3D PNG Image into iCn3D in Jupyter Notebook; added both "Load" and "Append" options when launching a structure.

[icn3d-3.23.1](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.23.1.zip) was release on March 22, 2023. Added the feature to scale in AR view of iCn3D; changed the default coloring to "AlphaFold Confidence" when lining from BLAST to iCn3D for AlphaFold structures; added the wildcard symbol "*" for atom name selection.
Expand Down
6 changes: 3 additions & 3 deletions dist/full.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
<div id="div0"></div>

<link rel="stylesheet" href="lib/jquery-ui-1.13.2.min.css">
<link rel="stylesheet" href="icn3d_3.23.2.css">
<link rel="stylesheet" href="icn3d_3.23.3.css">
<script src="lib/jquery-3.5.0.min.js"></script>
<script src="lib/jquery-ui-1.13.2.min.js"></script>
<script src="lib/three_0.137.0.min.js"></script>
<script src="icn3d_3.23.2.min.js"></script>
<script src="icn3d_3.23.3.min.js"></script>

<script type="text/javascript">

Expand All @@ -40,7 +40,7 @@
alert("IE does NOT work with the current iCn3D version 3. The old iCn3D version 2 is used instead.");
}
else {
//$.getScript('icn3d_3.23.2.min.js', function() {
//$.getScript('icn3d_3.23.3.min.js', function() {
var version = 3;
await launchIcn3d(version); //await
//});
Expand Down
6 changes: 3 additions & 3 deletions dist/full2.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<div id="div1" style="float:left;"></div>

<link rel="stylesheet" href="lib/jquery-ui-1.13.2.min.css">
<link rel="stylesheet" href="icn3d_3.23.2.css">
<link rel="stylesheet" href="icn3d_3.23.3.css">
<script src="lib/jquery-3.5.0.min.js"></script>
<script src="lib/jquery-ui-1.13.2.min.js"></script>
<script src="lib/three_0.137.0.min.js"></script>
<script src="icn3d_3.23.2.min.js"></script>
<script src="icn3d_3.23.3.min.js"></script>

<script type="text/javascript">
$( document ).ready(async function() {
Expand All @@ -40,7 +40,7 @@
alert("IE does NOT work with the current iCn3D version 3. The old iCn3D version 2 is used instead.");
}
else {
//$.getScript('icn3d_3.23.2.min.js', function() {
//$.getScript('icn3d_3.23.3.min.js', function() {
var version = 3;
await launchIcn3d(version);
//});
Expand Down
6 changes: 3 additions & 3 deletions dist/full2_3.23.2.html → dist/full2_3.23.3.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<div id="div1" style="float:left;"></div>

<link rel="stylesheet" href="lib/jquery-ui-1.13.2.min.css">
<link rel="stylesheet" href="icn3d_3.23.2.css">
<link rel="stylesheet" href="icn3d_3.23.3.css">
<script src="lib/jquery-3.5.0.min.js"></script>
<script src="lib/jquery-ui-1.13.2.min.js"></script>
<script src="lib/three_0.137.0.min.js"></script>
<script src="icn3d_3.23.2.min.js"></script>
<script src="icn3d_3.23.3.min.js"></script>

<script type="text/javascript">
$( document ).ready(async function() {
Expand All @@ -40,7 +40,7 @@
alert("IE does NOT work with the current iCn3D version 3. The old iCn3D version 2 is used instead.");
}
else {
//$.getScript('icn3d_3.23.2.min.js', function() {
//$.getScript('icn3d_3.23.3.min.js', function() {
var version = 3;
await launchIcn3d(version);
//});
Expand Down
6 changes: 3 additions & 3 deletions dist/full_3.23.2.html → dist/full_3.23.3.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
<div id="div0"></div>

<link rel="stylesheet" href="lib/jquery-ui-1.13.2.min.css">
<link rel="stylesheet" href="icn3d_3.23.2.css">
<link rel="stylesheet" href="icn3d_3.23.3.css">
<script src="lib/jquery-3.5.0.min.js"></script>
<script src="lib/jquery-ui-1.13.2.min.js"></script>
<script src="lib/three_0.137.0.min.js"></script>
<script src="icn3d_3.23.2.min.js"></script>
<script src="icn3d_3.23.3.min.js"></script>

<script type="text/javascript">

Expand All @@ -40,7 +40,7 @@
alert("IE does NOT work with the current iCn3D version 3. The old iCn3D version 2 is used instead.");
}
else {
//$.getScript('icn3d_3.23.2.min.js', function() {
//$.getScript('icn3d_3.23.3.min.js', function() {
var version = 3;
await launchIcn3d(version); //await
//});
Expand Down
Binary file renamed dist/icn3d-3.23.2.zip → dist/icn3d-3.23.3.zip
Binary file not shown.
Loading

0 comments on commit df506ff

Please sign in to comment.