Skip to content

Commit

Permalink
Merge pull request #53 in STRUC/icn3d from release210 to master
Browse files Browse the repository at this point in the history
* commit '9bc365bc16fe30374fa7ccbcc959f1f66c8666b9':
  speed up the rendering of assembly using instancing method
  speed up the rendering of assembly using instancing method
  speed up the rendering of assembly using instancing method
  • Loading branch information
jiywang3 committed May 21, 2018
2 parents 4b1bc52 + 9bc365b commit b427416
Show file tree
Hide file tree
Showing 31 changed files with 1,974 additions and 2,094 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ We provided two types of iCn3D widgets: [basic interface](https://www.ncbi.nlm.n

Either of these widgets could be easily added to your own web pages. Please see the [help page](https://www.ncbi.nlm.nih.gov/Structure/icn3d/docs/icn3d_help.html#HowToUse) for more details.

<b>Complete package</b> of iCn3D including Three.js and jQuery can be downloaded from [https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-2.0.3.zip](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-2.0.3.zip). The "Download ZIP" link in this page does not include third-party libraries.
<b>Complete package</b> of iCn3D including Three.js and jQuery can be downloaded from [https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-2.1.0.zip](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-2.1.0.zip). The "Download ZIP" link in this page does not include third-party libraries.

## Usage

Expand Down Expand Up @@ -77,6 +77,8 @@ gulp
```

## Change log
The production version [icn3d-2.1.0](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-2.1.0.zip) was release on May 21, 2018. The instancing method is used to display a biological assembly. It significantly improved the rendering speed by sending only the geometry of its assymmetruic unit to GPU and applying transformation matrices to display the assembly.

The production version [icn3d-2.0.3](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-2.0.3.zip) was release on May 2, 2018. Removed the "Description" field when saving a set of atoms. This made "Share Link" URL shorter. Made the size of stabilizer thicker for 3D printing.

The production version [icn3d-2.0.2](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-2.0.2.zip) was release on April 30, 2018. Reset WebGLRenderer when WebGL context is lost in Internet Explore 11.
Expand Down
18 changes: 13 additions & 5 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,22 @@ var common_js = [
"src/shader/SphereImpostor.vert",
"src/shader/CylinderImpostor.frag",
"src/shader/CylinderImpostor.vert",
"src/shader/SphereInstancing.frag",
"src/shader/SphereInstancing.vert",
"src/shader/CylinderInstancing.frag",
"src/shader/CylinderInstancing.vert",
"src/shader/Instancing.frag",
"src/shader/Instancing.vert",
"src/icn3d/icn3d.js",
"src/icn3d/loadpdb.js",
"src/icn3d/drawing.js",
"src/icn3d/display_common.js",
"src/icn3d/draw/drawing.js",
"src/icn3d/display/display_common.js",
"src/icn3d/draw/impostor.js",
"src/icn3d/other.js"
];

var simple_js = [
"src/icn3d/display_simple.js"
"src/icn3d/display/display_simple.js"
];

var full_js = [
Expand All @@ -130,8 +137,9 @@ var full_js = [
"src/surface/marchingcube.js",
"src/surface/ProteinSurface4.js",
"src/surface/setupsurface.js",
"src/icn3d/drawing_full.js",
"src/icn3d/display_full.js",
"src/icn3d/draw/drawing_full.js",
"src/icn3d/display/display_full.js",
"src/icn3d/draw/instancing.js",
"src/icn3d/other_full.js"
];

Expand Down
3 changes: 3 additions & 0 deletions icn3d.html
Original file line number Diff line number Diff line change
Expand Up @@ -1693,6 +1693,9 @@ <h3>Methods <a href="#Top"><span class="top">&nbsp;&nbsp;&nbsp;</span></a></h3>
<a name="log"></a>
<h2>Change Log:<img src="https://www.ncbi.nlm.nih.gov/Structure/IMG/spacer.gif" width="25" height="1" border="0"><a href="#Top"><img src="https://www.ncbi.nlm.nih.gov/Structure/IMG/arrowup_blue.gif" width="12" height="12" border="0" alt="back to top"></a></h2>

The production version <a href="https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-2.1.0.zip">icn3d-2.1.0</a> was release on May 21, 2018. The instancing method is used to display a biological assembly. It significantly improved the rendering speed by sending only the geometry of its assymmetruic unit to GPU and applying transformation matrices to display the assembly.
<br><br>

The production version <a href="https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-2.0.3.zip">icn3d-2.0.3</a> was release on May 2, 2018. Removed the "Description" field when saving a set of atoms. This made "Share Link" URL shorter. Made the size of stabilizer thicker for 3D printing.
<br><br>

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "icn3d",
"version": "2.0.3",
"version": "2.1.0",
"description": "iCn3D Structure Viewer",
"main": "index.html",
"scripts": {
Expand Down
Loading

0 comments on commit b427416

Please sign in to comment.