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

Fixed glitchy interpolation and block bars

Browse Source
This commit is contained in:
Anuken
2018-02-03 22:59:46 -05:00
parent 618fe6894e
commit 2ba38c2ee3
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/core/Renderer.java
View File

@@ -411,7 +411,7 @@ public class Renderer extends RendererModule{
if(target.entity != null) { if(target.entity != null) {
int bot = 0, top = 0; int bot = 0, top = 0;
for (BlockBar bar : tile.block().bars) { for (BlockBar bar : target.block().bars) {
float offset = Mathf.sign(bar.top) * (target.block().height / 2f * tilesize + 3f + 4f * ((bar.top ? top : bot))) + float offset = Mathf.sign(bar.top) * (target.block().height / 2f * tilesize + 3f + 4f * ((bar.top ? top : bot))) +
(bar.top ? -1f : 0f); (bar.top ? -1f : 0f);

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

@@ -277,7 +277,7 @@ public class Player extends SyncEntity{
interpolator.time = 0f; interpolator.time = 0f;
interpolator.last.set(this.x, this.y); interpolator.last.set(this.x, this.y);
interpolator.target.set(x, y); interpolator.target.set(x, y);
interpolator.spacing = Math.max(((TimeUtils.timeSinceMillis(time) / 1000f) * 60f), 1f); interpolator.spacing = Math.max(((TimeUtils.timeSinceMillis(time) / 1000f) * 60f), 4f);
} }
@Override @Override

2
core/src/io/anuke/mindustry/entities/enemies/Enemy.java
View File

@@ -142,7 +142,7 @@ public class Enemy extends SyncEntity {
interpolator.time = 0f; interpolator.time = 0f;
interpolator.last.set(this.x, this.y); interpolator.last.set(this.x, this.y);
interpolator.target.set(x, y); interpolator.target.set(x, y);
interpolator.spacing = Math.max(((TimeUtils.timeSinceMillis(time) / 1000f) * 60f), 1f); interpolator.spacing = Math.max(((TimeUtils.timeSinceMillis(time) / 1000f) * 60f), 4f);
} }
@Override @Override

3
core/src/io/anuke/mindustry/io/versions/Save15.java
View File

@@ -19,7 +19,6 @@ import io.anuke.mindustry.world.blocks.Blocks;
import io.anuke.mindustry.world.blocks.types.BlockPart; import io.anuke.mindustry.world.blocks.types.BlockPart;
import io.anuke.mindustry.world.blocks.types.Rock; import io.anuke.mindustry.world.blocks.types.Rock;
import io.anuke.ucore.core.Core; import io.anuke.ucore.core.Core;
import io.anuke.ucore.util.Log;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
@@ -191,8 +190,6 @@ public class Save15 extends SaveFileVersion {
Tile tile = world.tile(pos % world.width(), pos / world.width()); Tile tile = world.tile(pos % world.width(), pos / world.width());
Log.info("Load tile {0} {1}", pos, blockid > Block.getAllBlocks().size || blockid < 0 ? null : Block.getByID(blockid));
tile.setBlock(map.get(blockid)); tile.setBlock(map.get(blockid));
if(blockid == Blocks.blockpart.id){ if(blockid == Blocks.blockpart.id){