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

Fixed low-FPS pad orbiting

Browse Source
This commit is contained in:
Anuken
2019-06-01 15:16:10 -04:00
parent 57544e615f
commit 88d5e1cca8
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/io/anuke/mindustry/entities/type/Player.java
View File

@@ -665,10 +665,10 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
attractDst = 0f; attractDst = 0f;
if(tapping){ if(tapping){
velocity.setAngle(Mathf.slerpDelta(velocity.angle(), angleTo(moveTarget), 0.1f)); velocity.setAngle(angleTo(moveTarget));
} }
if(dst(moveTarget) < 2f){ if(dst(moveTarget) <= 2f * Time.delta()){
if(tapping){ if(tapping){
Tile tile = ((TileEntity)moveTarget).tile; Tile tile = ((TileEntity)moveTarget).tile;
tile.block().tapped(tile, this); tile.block().tapped(tile, this);
@@ -680,7 +680,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
moveTarget = null; moveTarget = null;
} }
movement.set(targetX - x, targetY - y).limit(isBoosting && !mech.flying ? mech.boostSpeed : mech.speed); movement.set((targetX - x) / Time.delta(), (targetY - y) / Time.delta()).limit(isBoosting && !mech.flying ? mech.boostSpeed : mech.speed);
movement.setAngle(Mathf.slerp(movement.angle(), velocity.angle(), 0.05f)); movement.setAngle(Mathf.slerp(movement.angle(), velocity.angle(), 0.05f));
if(dst(targetX, targetY) < attractDst){ if(dst(targetX, targetY) < attractDst){

4
core/src/io/anuke/mindustry/world/blocks/units/MechPad.java
View File

@@ -81,8 +81,8 @@ public class MechPad extends Block{
protected static boolean checkValidTap(Tile tile, Player player){ protected static boolean checkValidTap(Tile tile, Player player){
MechFactoryEntity entity = tile.entity(); MechFactoryEntity entity = tile.entity();
return Math.abs(player.x - tile.drawx()) <= tile.block().size * tilesize / 2f && return Math.abs(player.x - tile.drawx()) <= tile.block().size * tilesize &&
Math.abs(player.y - tile.drawy()) <= tile.block().size * tilesize / 2f && entity.cons.valid() && entity.player == null; Math.abs(player.y - tile.drawy()) <= tile.block().size * tilesize && entity.cons.valid() && entity.player == null;
} }
@Override @Override