This commit is contained in:
Anuken 2020-10-02 20:23:37 -04:00
parent 5861fe61b2
commit 43936b536e
12 changed files with 5 additions and 23 deletions

View File

@ -481,7 +481,7 @@ public class Control implements ApplicationListener, Loadable{
@Override @Override
public void update(){ public void update(){
//TODO find out why this happens on Android //this happens on Android and nobody knows why
if(assets == null) return; if(assets == null) return;
saves.update(); saves.update();

View File

@ -217,8 +217,6 @@ public class Renderer implements ApplicationListener{
pixelator.register(); pixelator.register();
} }
//TODO fx
Draw.draw(Layer.background, this::drawBackground); Draw.draw(Layer.background, this::drawBackground);
Draw.draw(Layer.floor, blocks.floor::drawFloor); Draw.draw(Layer.floor, blocks.floor::drawFloor);
Draw.draw(Layer.block - 1, blocks::drawShadows); Draw.draw(Layer.block - 1, blocks::drawShadows);

View File

@ -32,8 +32,6 @@ public class Lightning{
createLightningInternal(bullet, lastSeed++, bullet.team, color, damage, x, y, targetAngle, length); createLightningInternal(bullet, lastSeed++, bullet.team, color, damage, x, y, targetAngle, length);
} }
//TODO remote method
//@Remote(called = Loc.server, unreliable = true)
private static void createLightningInternal(Bullet hitter, int seed, Team team, Color color, float damage, float x, float y, float rotation, int length){ private static void createLightningInternal(Bullet hitter, int seed, Team team, Color color, float damage, float x, float y, float rotation, int length){
random.setSeed(seed); random.setSeed(seed);
hit.clear(); hit.clear();

View File

@ -58,7 +58,6 @@ public class ContinuousLaserBulletType extends BulletType{
@Override @Override
public void update(Bullet b){ public void update(Bullet b){
//TODO possible laser absorption from blocks
//damage every 5 ticks //damage every 5 ticks
if(b.timer(1, 5f)){ if(b.timer(1, 5f)){

View File

@ -105,7 +105,6 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc, Unitc{
Drawf.laser(team(), Core.atlas.find("minelaser"), Core.atlas.find("minelaser-end"), px, py, ex, ey, 0.75f); Drawf.laser(team(), Core.atlas.find("minelaser"), Core.atlas.find("minelaser-end"), px, py, ex, ey, 0.75f);
//TODO hack?
if(isLocal()){ if(isLocal()){
Lines.stroke(1f, Pal.accent); Lines.stroke(1f, Pal.accent);
Lines.poly(mineTile.worldx(), mineTile.worldy(), 4, tilesize / 2f * Mathf.sqrt2, Time.time()); Lines.poly(mineTile.worldx(), mineTile.worldy(), 4, tilesize / 2f * Mathf.sqrt2, Time.time());

View File

@ -17,7 +17,6 @@ import java.util.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class FloorRenderer implements Disposable{ public class FloorRenderer implements Disposable{
//TODO find out number with best performance
private static final int chunksize = mobile ? 16 : 32; private static final int chunksize = mobile ? 16 : 32;
private int[][][] cache; private int[][][] cache;

View File

@ -237,8 +237,6 @@ public class MenuRenderer implements Disposable{
} }
private void drawFlyers(){ private void drawFlyers(){
//TODO fix
if(true) return;
Draw.color(0f, 0f, 0f, 0.4f); Draw.color(0f, 0f, 0f, 0.4f);
TextureRegion icon = flyerType.icon(Cicon.full); TextureRegion icon = flyerType.icon(Cicon.full);

View File

@ -359,7 +359,6 @@ public class UnitType extends UnlockableContent{
drawPayload((Unit & Payloadc)unit); drawPayload((Unit & Payloadc)unit);
} }
//TODO
drawOcclusion(unit); drawOcclusion(unit);
Draw.z(z - outlineSpace); Draw.z(z - outlineSpace);
@ -623,7 +622,6 @@ public class UnitType extends UnlockableContent{
} }
} }
//TODO should be below/above legs
if(baseRegion.found()){ if(baseRegion.found()){
Draw.rect(baseRegion, unit.x, unit.y, rotation - 90); Draw.rect(baseRegion, unit.x, unit.y, rotation - 90);
} }

View File

@ -58,7 +58,6 @@ public class HudFragment extends Fragment{
showToast(Icon.warning, "Sector " + e.sector.id + " [scarlet]lost!"); showToast(Icon.warning, "Sector " + e.sector.id + " [scarlet]lost!");
}); });
//TODO full implementation
Events.on(ResetEvent.class, e -> { Events.on(ResetEvent.class, e -> {
coreItems.resetUsed(); coreItems.resetUsed();
coreItems.clear(); coreItems.clear();

View File

@ -36,7 +36,7 @@ public class PlayerListFragment extends Fragment{
rebuild(); rebuild();
content.pack(); content.pack();
content.act(Core.graphics.getDeltaTime()); content.act(Core.graphics.getDeltaTime());
//TODO hack //hacky
Core.scene.act(0f); Core.scene.act(0f);
} }
}); });
@ -115,13 +115,9 @@ public class PlayerListFragment extends Fragment{
t.defaults().size(bs); t.defaults().size(bs);
t.button(Icon.hammer, Styles.clearPartiali, t.button(Icon.hammer, Styles.clearPartiali,
() -> { () -> ui.showConfirm("@confirm", Core.bundle.format("confirmban", user.name()), () -> Call.adminRequest(user, AdminAction.ban)));
ui.showConfirm("@confirm", Core.bundle.format("confirmban", user.name()), () -> Call.adminRequest(user, AdminAction.ban));
});
t.button(Icon.cancel, Styles.clearPartiali, t.button(Icon.cancel, Styles.clearPartiali,
() -> { () -> ui.showConfirm("@confirm", Core.bundle.format("confirmkick", user.name()), () -> Call.adminRequest(user, AdminAction.kick)));
ui.showConfirm("@confirm", Core.bundle.format("confirmkick", user.name()), () -> Call.adminRequest(user, AdminAction.kick));
});
t.row(); t.row();

View File

@ -11,7 +11,6 @@ import mindustry.world.*;
import java.util.*; import java.util.*;
//TODO documentation
public interface Autotiler{ public interface Autotiler{
/** /**
@ -109,7 +108,6 @@ public interface Autotiler{
blendresult[0] = 0; blendresult[0] = 0;
blendresult[1] = blendresult[2] = 1; blendresult[1] = blendresult[2] = 1;
// TODO code refactoring maybe?
int num = int num =
(blends(tile, rotation, directional, 2, world) && blends(tile, rotation, directional, 1, world) && blends(tile, rotation, directional, 3, world)) ? 0 : (blends(tile, rotation, directional, 2, world) && blends(tile, rotation, directional, 1, world) && blends(tile, rotation, directional, 3, world)) ? 0 :
(blends(tile, rotation, directional, 1, world) && blends(tile, rotation, directional, 3, world)) ? 1 : (blends(tile, rotation, directional, 1, world) && blends(tile, rotation, directional, 3, world)) ? 1 :

View File

@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=8278e148026dab6b5f74ded2ed2be76a22418c76 archash=3cbc03589380d6686354b26ebe6a88541576551d