Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup, optimization

Browse Source
This commit is contained in:
Anuken
2020-05-01 16:35:18 -04:00
parent 3101fc8056
commit 135b87fdb2
20 changed files with 138 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/entities/EntityCollisions.java
View File

@@ -114,7 +114,7 @@ public class EntityCollisions{
group.each(s -> {
s.updateLastPosition();
//tree.insert(s);
tree.insert(s);
});
}
@@ -205,7 +205,7 @@ public class EntityCollisions{
}
@SuppressWarnings("unchecked")
public void collideGroups(EntityGroup<? extends Hitboxc> groupa, EntityGroup<? extends Hitboxc> groupb){
public <T extends Hitboxc> void collide(EntityGroup<T> groupa){
groupa.each(solid -> {
solid.hitbox(r1);
@@ -216,7 +216,9 @@ public class EntityCollisions{
r2.merge(r1);
arrOut.clear();
groupb.tree().getIntersect(arrOut, r2);
//get all targets based on what entity wants to collide with
solid.getCollisions(tree -> tree.intersect(r2, arrOut));
for(Hitboxc sc : arrOut){
sc.hitbox(r1);