mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

collision: don't calculate player coords if we have it

Browse Source
This commit is contained in:
vieron
2012-07-23 10:53:57 +02:00
parent 60a873a131
commit 1507974e07
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/jquery.collision.js
View File

@@ -118,18 +118,18 @@
} }
}; };
fn.find_collisions = function(){ fn.find_collisions = function(player_data_coords){
var self = this; var self = this;
var colliders_coords = []; var colliders_coords = [];
var colliders_data = []; var colliders_data = [];
var $colliders = (this.colliders || this.$colliders); var $colliders = (this.colliders || this.$colliders);
var count = $colliders.length; var count = $colliders.length;
var player_coords = self.$element.coords().update(player_data_coords || false).get();
while(count--){ while(count--){
var $collider = self.$colliders ? $($colliders[count]) : $colliders[count]; var $collider = self.$colliders ? $($colliders[count]) : $colliders[count];
var player_coords = self.$element.coords().update().get();
var $collider_coords_ins = ($collider.isCoords) ? var $collider_coords_ins = ($collider.isCoords) ?
$collider.update() : $collider.coords(); $collider : $collider.coords();
var collider_coords = $collider_coords_ins.get(); var collider_coords = $collider_coords_ins.get();
var overlaps = self.overlaps(player_coords, collider_coords); var overlaps = self.overlaps(player_coords, collider_coords);
@@ -169,8 +169,8 @@
}; };
fn.get_closest_colliders = function(){ fn.get_closest_colliders = function(player_data_coords){
var colliders = this.find_collisions(); var colliders = this.find_collisions(player_data_coords);
var min_area = 100; var min_area = 100;
colliders.sort(function(a, b){ colliders.sort(function(a, b){