|
@@ -344,13 +344,17 @@
|
|
|
|
|
|
objects = [];
|
|
|
|
|
|
- loader.load( url, function ( geometry, geometryBonds ) {
|
|
|
+ loader.load( url, function ( pdb ) {
|
|
|
|
|
|
- var offset = geometry.center();
|
|
|
+ var geometryAtoms = pdb.geometryAtoms;
|
|
|
+ var geometryBonds = pdb.geometryBonds;
|
|
|
+ var json = pdb.json;
|
|
|
+
|
|
|
+ var offset = geometryAtoms.center();
|
|
|
geometryBonds.translate( offset.x, offset.y, offset.z );
|
|
|
|
|
|
- var positions = geometry.getAttribute( 'position' );
|
|
|
- var colors = geometry.getAttribute( 'color' );
|
|
|
+ var positions = geometryAtoms.getAttribute( 'position' );
|
|
|
+ var colors = geometryAtoms.getAttribute( 'color' );
|
|
|
|
|
|
var position = new THREE.Vector3();
|
|
|
var color = new THREE.Color();
|
|
@@ -365,7 +369,8 @@
|
|
|
color.g = colors.getY( i );
|
|
|
color.b = colors.getZ( i );
|
|
|
|
|
|
- var element = geometry.elements[ i ];
|
|
|
+ var atom = json.atoms[ i ];
|
|
|
+ var element = atom[ 4 ];
|
|
|
|
|
|
if ( ! colorSpriteMap[ element ] ) {
|
|
|
|