Skip to content

Commit

Permalink
Renamed atom => atomNode, see #64
Browse files Browse the repository at this point in the history
  • Loading branch information
samreid committed Feb 13, 2018
1 parent 74a2982 commit 1a7e87d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions js/friction/view/magnifier/AtomCanvasNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,15 @@ define( function( require ) {

// render each of the atoms on the canvas
for ( var i = 0; i < this.atomCanvasNodeAtoms.length; i++ ) {
var atom = this.atomCanvasNodeAtoms[ i ];
var atomNode = this.atomCanvasNodeAtoms[ i ];
context.drawImage(
this.particleImageCanvas,
atom.isTopAtom ? 0 : PARTICLE_IMAGE_SIZE,
atomNode.isTopAtom ? 0 : PARTICLE_IMAGE_SIZE,
0,
PARTICLE_IMAGE_SIZE,
PARTICLE_IMAGE_SIZE,
atom.currentX - particleImageSize / 2,
atom.currentY - particleImageSize / 2,
atomNode.currentX - particleImageSize / 2,
atomNode.currentY - particleImageSize / 2,
particleImageSize,
particleImageSize
);
Expand Down
6 changes: 3 additions & 3 deletions js/friction/view/magnifier/MagnifierNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -326,11 +326,11 @@ define( function( require ) {
var offset = layer[ i ].offset || 0;
evaporate = layer[ i ].evaporate || false;
for ( var n = 0; n < layer[ i ].num; n++ ) {
var atom = new AtomNode( model, { y: y, x: x + ( offset + n ) * dx, color: color } );
var atomNode = new AtomNode( model, { y: y, x: x + ( offset + n ) * dx, color: color } );
if ( evaporate ) {
row.push( atom );
row.push( atomNode );
}
self.atomCanvasNode.registerAtom( atom );
self.atomCanvasNode.registerAtom( atomNode );
}
}
if ( evaporate ) {
Expand Down

0 comments on commit 1a7e87d

Please sign in to comment.