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

More unit assembler progress

Browse Source
This commit is contained in:
Anuken
2021-12-14 09:40:57 -05:00
parent bdc3b85346
commit b5ce9e1a38
9 changed files with 53 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ import arc.func.*;
import arc.math.*;
import arc.math.geom.*;
import arc.struct.*;
import arc.util.*;
import mindustry.content.*;
import mindustry.gen.*;
import mindustry.world.*;
@@ -94,9 +95,11 @@ public class EntityCollisions{
entity.trns(r1.x - r2.x, r1.y - r2.y);
}
public boolean overlapsTile(Rect rect){
public boolean overlapsTile(Rect rect, @Nullable SolidPred solidChecker){
if(solidChecker == null) return false;
rect.getCenter(vector);
int r = 1;
int r = Math.max(Math.round(r1.width / tilesize), 1);
//assumes tiles are centered
int tilex = Math.round(vector.x / tilesize);
@@ -105,10 +108,9 @@ public class EntityCollisions{
for(int dx = -r; dx <= r; dx++){
for(int dy = -r; dy <= r; dy++){
int wx = dx + tilex, wy = dy + tiley;
if(solid(wx, wy)){
r2.setSize(tilesize).setCenter(wx * tilesize, wy * tilesize);
if(solidChecker.solid(wx, wy)){
if(r2.overlaps(rect)){
if(r2.setCentered(wx * tilesize, wy * tilesize, tilesize).overlaps(rect)){
return true;
}
}