mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-09 23:37:51 +07:00
Code Issues Packages Projects Releases Wiki Activity

More bugfixes

Browse Source
This commit is contained in:
Anuken
2020-07-30 20:07:49 -04:00
parent 5ad2807958
commit 40edbe785c
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/maps/groundZero.msav
View File

Binary file not shown.

1
core/src/mindustry/entities/Predict.java
View File

@ -57,7 +57,6 @@ public class Predict{
ddx += ((Hitboxc)dst).deltaX(); ddx += ((Hitboxc)dst).deltaX();
ddy += ((Hitboxc)dst).deltaY(); ddy += ((Hitboxc)dst).deltaY();
} }
Log.info("attach dst = @, @ @", dst, ddx, ddy);
if(src instanceof Hitboxc){ if(src instanceof Hitboxc){
ddx -= ((Hitboxc)src).deltaX()/(Time.delta); ddx -= ((Hitboxc)src).deltaX()/(Time.delta);
ddy -= ((Hitboxc)src).deltaY()/(Time.delta); ddy -= ((Hitboxc)src).deltaY()/(Time.delta);

16
core/src/mindustry/entities/comp/HitboxComp.java
View File

@ -11,7 +11,7 @@ import mindustry.gen.*;
abstract class HitboxComp implements Posc, QuadTreeObject{ abstract class HitboxComp implements Posc, QuadTreeObject{
@Import float x, y; @Import float x, y;
transient float lastX, lastY, hitSize; transient float lastX, lastY, deltaX, deltaY, hitSize;
@Override @Override
public void update(){ public void update(){
@ -33,6 +33,8 @@ abstract class HitboxComp implements Posc, QuadTreeObject{
} }
void updateLastPosition(){ void updateLastPosition(){
deltaX = x - lastX;
deltaY = y - lastY;
lastX = x; lastX = x;
lastY = y; lastY = y;
} }
@ -41,20 +43,12 @@ abstract class HitboxComp implements Posc, QuadTreeObject{
} }
float deltaX(){
return x - lastX;
}
float deltaY(){
return y - lastY;
}
float deltaLen(){ float deltaLen(){
return Mathf.len(deltaX(), deltaY()); return Mathf.len(deltaX, deltaY);
} }
float deltaAngle(){ float deltaAngle(){
return Mathf.angle(deltaX(), deltaY()); return Mathf.angle(deltaX, deltaY);
} }
boolean collides(Hitboxc other){ boolean collides(Hitboxc other){