Skip to content

Commit

Permalink
Tabs to spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
emackey committed Dec 13, 2016
1 parent 1f06ae8 commit 0a4aa31
Showing 1 changed file with 33 additions and 33 deletions.
66 changes: 33 additions & 33 deletions Source/DataSources/EntityCluster.js
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ define([
var pointCollection = entityCluster._pointCollection;

if ((!defined(labelCollection) && !defined(billboardCollection) && !defined(pointCollection)) ||
(!entityCluster._clusterBillboards && !entityCluster._clusterLabels && !entityCluster._clusterPoints)) {
(!entityCluster._clusterBillboards && !entityCluster._clusterLabels && !entityCluster._clusterPoints)) {
return;
}

Expand Down Expand Up @@ -256,10 +256,10 @@ define([
getScreenSpacePositions(labelCollection, points, scene, occluder, entityCluster);
}
if (entityCluster._clusterBillboards) {
getScreenSpacePositions(billboardCollection, points, scene, occluder, entityCluster);
getScreenSpacePositions(billboardCollection, points, scene, occluder, entityCluster);
}
if (entityCluster._clusterPoints) {
getScreenSpacePositions(pointCollection, points, scene, occluder, entityCluster);
getScreenSpacePositions(pointCollection, points, scene, occluder, entityCluster);
}

var i;
Expand Down Expand Up @@ -471,48 +471,48 @@ define([
return this._clusterEvent;
}
},
/**
/**
* Gets or sets whether clustering billboard entities is enabled.
* @memberof EntityCluster.prototype
* @type {Boolean}
*/
clusterBillboards : {
get : function() {
return this._clusterBillboards;
},
set : function(value) {
this._clusterDirty = this._clusterDirty || value !== this._clusterBillboards;
this._clusterBillboards = value;
}
},
/**
clusterBillboards : {
get : function() {
return this._clusterBillboards;
},
set : function(value) {
this._clusterDirty = this._clusterDirty || value !== this._clusterBillboards;
this._clusterBillboards = value;
}
},
/**
* Gets or sets whether clustering labels entities is enabled.
* @memberof EntityCluster.prototype
* @type {Boolean}
*/
clusterLabels : {
get : function() {
return this._clusterLabels;
},
set : function(value) {
this._clusterDirty = this._clusterDirty || value !== this._clusterLabels;
this._clusterLabels = value;
}
},
/**
clusterLabels : {
get : function() {
return this._clusterLabels;
},
set : function(value) {
this._clusterDirty = this._clusterDirty || value !== this._clusterLabels;
this._clusterLabels = value;
}
},
/**
* Gets or sets whether clustering point entities is enabled.
* @memberof EntityCluster.prototype
* @type {Boolean}
*/
clusterPoints : {
get : function() {
return this._clusterPoints;
},
set : function(value) {
this._clusterDirty = this._clusterDirty || value !== this._clusterPoints;
this._clusterPoints = value;
}
}
clusterPoints : {
get : function() {
return this._clusterPoints;
},
set : function(value) {
this._clusterDirty = this._clusterDirty || value !== this._clusterPoints;
this._clusterPoints = value;
}
}
});

function createGetEntity(collectionProperty, CollectionConstructor, unusedIndicesProperty, entityIndexProperty) {
Expand Down

0 comments on commit 0a4aa31

Please sign in to comment.