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

Reduced multithreaded conveyor corruption, improved interpolation

Browse Source
This commit is contained in:
Anuken
2018-02-07 21:06:26 -05:00
parent f4227b99ff
commit 757f4f5a53
12 changed files with 118 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/entities/Bullet.java
+12 -7
View File
@@ -9,21 +9,26 @@ import io.anuke.ucore.util.Mathf;
import static io.anuke.mindustry.Vars.*;
public class Bullet extends BulletEntity{
public boolean absorbed = false;
public Bullet(BulletType type, Entity owner, float x, float y, float angle){
super(type, owner, angle);
set(x, y);
this.type = type;
}
public void absorb(){
absorbed = true;
remove();
}
public void draw(){
type.draw(this);
//interpolate position linearly at low tick speeds
if(SyncEntity.isSmoothing()){
x += threads.getFramesSinceUpdate() * velocity.x;
y += threads.getFramesSinceUpdate() * velocity.y;
type.draw(this);
x -= threads.getFramesSinceUpdate() * velocity.x;
y -= threads.getFramesSinceUpdate() * velocity.y;
}else{
type.draw(this);
}
}
public float drawSize(){
core/src/io/anuke/mindustry/entities/Player.java
+3 -21
View File
@@ -2,7 +2,6 @@ package io.anuke.mindustry.entities;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.TimeUtils;
import io.anuke.mindustry.graphics.Fx;
import io.anuke.mindustry.graphics.Shaders;
import io.anuke.mindustry.net.Net;
@@ -275,32 +274,15 @@ public class Player extends SyncEntity{
this.health = health;
this.dashing = dashing == 1;
interpolator.targetrot = angle;
interpolator.time = 0f;
interpolator.last.set(this.x, this.y);
interpolator.target.set(x, y);
interpolator.spacing = Math.min(Math.max(((TimeUtils.timeSinceMillis(time) / 1000f) * 60f), 4f), 10);
interpolator.read(this.x, this.y, x, y, angle, time);
}
@Override
public void interpolate() {
super.interpolate();
Interpolator i = interpolator;
i.time += 1f / i.spacing * Timers.delta();
Mathf.lerp2(movement.set(i.last), i.target, i.time);
x = movement.x;
y = movement.y;
if(i.target.dst(x, y) > 128){
set(i.target.x, i.target.y);
i.time = 0f;
i.last.set(i.target);
}
angle = Mathf.lerpAngDelta(angle, i.targetrot, 0.6f);
float tx = x + Angles.trnsx(angle + 180f, 3f);
float ty = y + Angles.trnsy(angle + 180f, 3f);
core/src/io/anuke/mindustry/entities/SyncEntity.java
+55 -20
View File
@@ -2,8 +2,11 @@ package io.anuke.mindustry.entities;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.utils.ObjectIntMap;
import com.badlogic.gdx.utils.TimeUtils;
import io.anuke.mindustry.entities.enemies.Enemy;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.entities.DestructibleEntity;
import io.anuke.ucore.util.Mathf;
@@ -16,9 +19,8 @@ public abstract class SyncEntity extends DestructibleEntity{
protected transient Interpolator interpolator = new Interpolator();
//for interpolating at low tick speeds.
private transient Vector2 tpos = new Vector2(-999, -999);
private transient float tang = 0f;
//smoothed position/angle
private Vector3 spos = new Vector3();
public float angle;
@@ -27,12 +29,23 @@ public abstract class SyncEntity extends DestructibleEntity{
setWriteSize(Player.class, 4 + 4 + 4 + 2 + 1);
}
public static boolean isSmoothing(){
return threads.isEnabled() && threads.getFPS() <= Gdx.graphics.getFramesPerSecond() / 2f;
}
public abstract void writeSpawn(ByteBuffer data);
public abstract void readSpawn(ByteBuffer data);
public abstract void write(ByteBuffer data);
public abstract void read(ByteBuffer data, long time);
public abstract void interpolate();
public void interpolate(){
interpolator.update();
x = interpolator.pos.x;
y = interpolator.pos.y;
angle = interpolator.angle;
}
@Override
public final void draw(){
@@ -40,15 +53,13 @@ public abstract class SyncEntity extends DestructibleEntity{
//interpolates data at low tick speeds.
if(isSmoothing()){
if(tpos.dst(x, y) > 100){
tpos.set(x, y);
if(Vector2.dst(spos.x, spos.y, x, y) > 128){
spos.set(x, y, angle);
}
tpos.x = Mathf.lerpDelta(tpos.x, x, 0.3f);
tpos.y = Mathf.lerpDelta(tpos.y, y, 0.3f);
tang = Mathf.lerpAngDelta(tang, angle, 0.3f);
this.x = tpos.x;
this.y = tpos.y;
this.angle = tang;
this.x = spos.x = Mathf.lerpDelta(spos.x, x, 0.2f);
this.y = spos.y = Mathf.lerpDelta(spos.y, y, 0.2f);
this.angle = spos.z = Mathf.lerpAngDelta(spos.z, angle, 0.3f);
}
drawSmooth();
@@ -58,12 +69,8 @@ public abstract class SyncEntity extends DestructibleEntity{
this.angle = angle;
}
private boolean isSmoothing(){
return threads.isEnabled() && threads.getFPS() <= Gdx.graphics.getFramesPerSecond() / 2f;
}
public Vector2 getDrawPosition(){
return isSmoothing() ? tpos : tpos.set(x, y);
public Vector3 getDrawPosition(){
return isSmoothing() ? spos : spos.set(x, y, angle);
}
public void drawSmooth(){}
@@ -91,12 +98,40 @@ public abstract class SyncEntity extends DestructibleEntity{
return (T)this;
}
public class Interpolator {
public static class Interpolator {
//used for movement
public Vector2 target = new Vector2();
public Vector2 last = new Vector2();
public Vector2 vec = new Vector2();
public float targetrot;
public float spacing = 1f;
public float time;
//current state
public Vector2 pos = new Vector2();
public float angle;
public void read(float cx, float cy, float x, float y, float angle, long sent){
targetrot = angle;
time = 0f;
last.set(cx, cy);
target.set(x, y);
spacing = Math.min(Math.max(((TimeUtils.timeSinceMillis(sent) / 1000f) * 60f), 4f), 10);
}
public void update(){
time += 1f / spacing * Timers.delta();
Mathf.lerp2(pos.set(last), target, time);
angle = Mathf.lerpAngDelta(angle, targetrot, 0.6f);
if(target.dst(pos) > 128){
pos.set(target);
last.set(target);
time = 0f;
}
}
}
}
core/src/io/anuke/mindustry/entities/enemies/Enemy.java
+4 -22
View File
@@ -2,17 +2,17 @@ package io.anuke.mindustry.entities.enemies;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.TimeUtils;
import io.anuke.mindustry.entities.Bullet;
import io.anuke.mindustry.entities.BulletType;
import io.anuke.mindustry.entities.SyncEntity;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.net.NetEvents;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.entities.Entity;
import io.anuke.ucore.entities.SolidEntity;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.util.*;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Timer;
import io.anuke.ucore.util.Translator;
import java.nio.ByteBuffer;
@@ -141,25 +141,7 @@ public class Enemy extends SyncEntity {
this.health = health;
interpolator.targetrot = angle / 2f;
interpolator.time = 0f;
interpolator.last.set(this.x, this.y);
interpolator.target.set(x, y);
interpolator.spacing = Math.min(Math.max(((TimeUtils.timeSinceMillis(time) / 1000f) * 60f), 4f), 10f);
}
@Override
public void interpolate() {
Interpolator i = interpolator;
i.time += 1f / i.spacing * Timers.delta();
Mathf.lerp2(i.vec.set(i.last), i.target, i.time);
x = i.vec.x;
y = i.vec.y;
angle = Mathf.lerpAngDelta(angle, i.targetrot, 0.6f);
interpolator.read(this.x, this.y, x, y, angle, time);
}
public void shoot(BulletType bullet){