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

Updated uCore references

Browse Source
This commit is contained in:
Anuken
2017-09-11 19:42:41 -04:00
parent 4c860a0315
commit 6861939f78
21 changed files with 48 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/io/anuke/mindustry/Control.java
View File

@@ -25,7 +25,6 @@ import io.anuke.ucore.entities.Entity;
import io.anuke.ucore.graphics.Atlas;
import io.anuke.ucore.modules.RendererModule;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Timers;
public class Control extends RendererModule{
public int rangex = 10, rangey = 10;
@@ -49,7 +48,7 @@ public class Control extends RendererModule{
Vars.debug = true;
}
cameraScale = baseCameraScale;
Core.cameraScale = baseCameraScale;
pixelate();
Gdx.input.setCatchBackKey(true);
@@ -59,7 +58,7 @@ public class Control extends RendererModule{
Inputs.addProcessor(new AndroidInput());
}
Draw.addSurface("shadow", cameraScale);
Draw.addSurface("shadow", Core.cameraScale);
atlas = new Atlas("sprites.atlas");
@@ -91,11 +90,11 @@ public class Control extends RendererModule{
}
public void setCameraScale(int scale){
this.cameraScale = scale;
Core.cameraScale = scale;
resize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
setCamera(player.x, player.y);
Draw.getSurface("pixel").setScale(cameraScale);
Draw.getSurface("shadow").setScale(cameraScale);
Draw.getSurface("pixel").setScale(Core.cameraScale);
Draw.getSurface("shadow").setScale(Core.cameraScale);
}
public void reset(){
@@ -384,7 +383,7 @@ public class Control extends RendererModule{
if(android){
camera.position.set((int)camera.position.x, (int)camera.position.y, 0);
if(Gdx.graphics.getHeight()/cameraScale % 2 == 1){
if(Gdx.graphics.getHeight()/Core.cameraScale % 2 == 1){
camera.position.add(0, -0.5f, 0);
}
}
@@ -427,8 +426,8 @@ public class Control extends RendererModule{
public void resize(int width, int height){
super.resize(width, height);
rangex = (int) (width / tilesize / cameraScale/2)+2;
rangey = (int) (height / tilesize / cameraScale/2)+2;
rangex = (int) (width / tilesize / Core.cameraScale/2)+2;
rangey = (int) (height / tilesize / Core.cameraScale/2)+2;
AndroidInput.mousex = Gdx.graphics.getWidth()/2;
AndroidInput.mousey = Gdx.graphics.getHeight()/2;

4
core/src/io/anuke/mindustry/Mindustry.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry;
import io.anuke.ucore.modules.Core;
import io.anuke.ucore.modules.ModuleCore;
public class Mindustry extends Core {
public class Mindustry extends ModuleCore {
public static String[] args = {};
@Override

14
core/src/io/anuke/mindustry/UI.java
View File

@@ -19,8 +19,7 @@ import io.anuke.mindustry.entities.Weapon;
import io.anuke.mindustry.input.AndroidInput;
import io.anuke.mindustry.resource.*;
import io.anuke.mindustry.ui.*;
import io.anuke.ucore.core.Draw;
import io.anuke.ucore.core.Settings;
import io.anuke.ucore.core.*;
import io.anuke.ucore.function.Listenable;
import io.anuke.ucore.function.VisibilityProvider;
import io.anuke.ucore.graphics.Hue;
@@ -33,7 +32,6 @@ import io.anuke.ucore.scene.builders.*;
import io.anuke.ucore.scene.event.InputEvent;
import io.anuke.ucore.scene.ui.*;
import io.anuke.ucore.scene.ui.layout.*;
import io.anuke.ucore.util.Timers;
public class UI extends SceneModule{
Table itemtable, weapontable, tools, loadingtable;
@@ -397,14 +395,14 @@ public class UI extends SceneModule{
int min = base-zoomScale*2;
int max = base+zoomScale;
new button("+", ()->{
if(control.cameraScale < max){
control.setCameraScale(control.cameraScale+zoomScale);
if(Core.cameraScale < max){
control.setCameraScale(Core.cameraScale+zoomScale);
}
}).size(Unit.dp.inPixels(40));
new button("-", ()->{
if(control.cameraScale > min){
control.setCameraScale(control.cameraScale-zoomScale);
if(Core.cameraScale > min){
control.setCameraScale(Core.cameraScale-zoomScale);
}
}).size(Unit.dp.inPixels(40));
@@ -522,7 +520,7 @@ public class UI extends SceneModule{
});
tools.update(()->{
tools.setPosition(AndroidInput.mousex, Gdx.graphics.getHeight()-AndroidInput.mousey-15*control.cameraScale, Align.top);
tools.setPosition(AndroidInput.mousex, Gdx.graphics.getHeight()-AndroidInput.mousey-15*Core.cameraScale, Align.top);
});
updateItems();

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

@@ -11,7 +11,6 @@ import io.anuke.mindustry.resource.Recipe;
import io.anuke.ucore.core.*;
import io.anuke.ucore.entities.DestructibleEntity;
import io.anuke.ucore.util.Angles;
import io.anuke.ucore.util.Timers;
public class Player extends DestructibleEntity{
public Weapon weapon;

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

@@ -11,9 +11,8 @@ import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Draw;
import io.anuke.ucore.core.Effects;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.entities.*;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Timers;
public class Enemy extends DestructibleEntity{
protected float speed = 0.3f;
@@ -123,11 +122,11 @@ public class Enemy extends DestructibleEntity{
move();
xvelocity = (x - lastx) / Mathf.delta();
yvelocity = (y - lasty) / Mathf.delta();
xvelocity = (x - lastx) / Timers.delta();
yvelocity = (y - lasty) / Timers.delta();
if(target == null){
direction.add(xvelocity * Mathf.delta(), yvelocity * Mathf.delta());
direction.add(xvelocity * Timers.delta(), yvelocity * Timers.delta());
direction.limit(speed*rotatespeed);
}else{
float angle = angleTo(target);

5
core/src/io/anuke/mindustry/entities/enemies/TestEnemy.java
View File

@@ -1,7 +1,6 @@
package io.anuke.mindustry.entities.enemies;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Timers;
import io.anuke.ucore.core.Timers;
public class TestEnemy extends Enemy{
boolean dir = false;
@@ -17,6 +16,6 @@ public class TestEnemy extends Enemy{
dir = !dir;
}
move(dir ? -0.3f * Mathf.delta() : 0.3f * Mathf.delta(), 0);
move(dir ? -0.3f * Timers.delta() : 0.3f * Timers.delta(), 0);
}
}

10
core/src/io/anuke/mindustry/input/AndroidInput.java
View File

@@ -13,9 +13,7 @@ import io.anuke.mindustry.resource.ItemStack;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.Blocks;
import io.anuke.mindustry.world.blocks.ProductionBlocks;
import io.anuke.ucore.core.Effects;
import io.anuke.ucore.core.Graphics;
import io.anuke.ucore.core.Sounds;
import io.anuke.ucore.core.*;
import io.anuke.ucore.scene.utils.Cursors;
import io.anuke.ucore.util.Mathf;
@@ -51,7 +49,7 @@ public class AndroidInput extends InputAdapter{
public static void breakBlock(){
Tile tile = selected();
player.breaktime += Mathf.delta();
player.breaktime += Timers.delta();
if(player.breaktime >= tile.block().breaktime){
if(tile.block().drops != null){
Inventory.addItem(tile.block().drops.item, tile.block().drops.amount);
@@ -101,7 +99,7 @@ public class AndroidInput extends InputAdapter{
if(Gdx.input.isTouched(0)
&& Mathf.near2d(lmousex, lmousey, Gdx.input.getX(0), Gdx.input.getY(0), 50)
&& !ui.hasMouse() && player.recipe == null){
warmup += Mathf.delta();
warmup += Timers.delta();
mousex = Gdx.input.getX(0);
mousey = Gdx.input.getY(0);
@@ -111,7 +109,7 @@ public class AndroidInput extends InputAdapter{
if(sel == null) return;
if(warmup > warmupDelay && sel.block() != ProductionBlocks.core && sel.breakable()){
player.breaktime += Mathf.delta();
player.breaktime += Timers.delta();
if(player.breaktime > selected().block().breaktime){
breakBlock();

14
core/src/io/anuke/mindustry/input/GestureHandler.java
View File

@@ -9,9 +9,7 @@ import com.badlogic.gdx.math.Vector2;
import io.anuke.mindustry.World;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.Blocks;
import io.anuke.ucore.core.Effects;
import io.anuke.ucore.core.Sounds;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.core.*;
public class GestureHandler extends GestureAdapter{
Vector2 pinch1 = new Vector2(-1, -1), pinch2 = pinch1.cpy();
@@ -21,7 +19,7 @@ public class GestureHandler extends GestureAdapter{
@Override
public boolean longPress(float x, float y){
Tile tile = World.cursorTile();
player.breaktime += Mathf.delta();
player.breaktime += Timers.delta();
if(player.breaktime >= tile.block().breaktime){
Effects.effect("break", tile.worldx(), tile.worldy());
Effects.shake(3f, 1f);
@@ -35,8 +33,8 @@ public class GestureHandler extends GestureAdapter{
@Override
public boolean pan(float x, float y, float deltaX, float deltaY){
if(player.recipe == null){
player.x -= deltaX*control.camera.zoom/control.cameraScale;
player.y += deltaY*control.camera.zoom/control.cameraScale;
player.x -= deltaX*control.camera.zoom/Core.cameraScale;
player.y += deltaY*control.camera.zoom/Core.cameraScale;
}else{
AndroidInput.mousex += deltaX;
AndroidInput.mousey += deltaY;
@@ -57,8 +55,8 @@ public class GestureHandler extends GestureAdapter{
Vector2 vec = (vector.set(pointer1).add(pointer2).scl(0.5f)).sub(pinch1.add(pinch2).scl(0.5f));
player.x -= vec.x*control.camera.zoom/control.cameraScale;
player.y += vec.y*control.camera.zoom/control.cameraScale;
player.x -= vec.x*control.camera.zoom/Core.cameraScale;
player.y += vec.y*control.camera.zoom/Core.cameraScale;
pinch1.set(pointer1);
pinch2.set(pointer2);

6
core/src/io/anuke/mindustry/input/Input.java
View File

@@ -12,9 +12,7 @@ import io.anuke.mindustry.resource.ItemStack;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.Blocks;
import io.anuke.mindustry.world.blocks.ProductionBlocks;
import io.anuke.ucore.core.Effects;
import io.anuke.ucore.core.Inputs;
import io.anuke.ucore.core.Sounds;
import io.anuke.ucore.core.*;
import io.anuke.ucore.scene.utils.Cursors;
import io.anuke.ucore.util.Mathf;
@@ -84,7 +82,7 @@ public class Input{
if(Inputs.buttonDown(Buttons.RIGHT) && World.cursorNear() && cursor.breakable()
&& cursor.block() != ProductionBlocks.core){
Tile tile = cursor;
player.breaktime += Mathf.delta();
player.breaktime += Timers.delta();
if(player.breaktime >= tile.block().breaktime){
if(tile.block().drops != null){
Inventory.addItem(tile.block().drops.item, tile.block().drops.amount);

2
core/src/io/anuke/mindustry/ui/LevelDialog.java
View File

@@ -7,9 +7,9 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.World;
import io.anuke.ucore.core.Settings;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.scene.ui.*;
import io.anuke.ucore.scene.ui.layout.Unit;
import io.anuke.ucore.util.Timers;
public class LevelDialog extends Dialog{
Label[] scores = new Label[maps.length];

8
core/src/io/anuke/mindustry/world/blocks/Conveyor.java
View File

@@ -14,8 +14,8 @@ import io.anuke.mindustry.resource.Item;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Draw;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Timers;
public class Conveyor extends Block{
float speed = 0.02f;
@@ -64,10 +64,10 @@ public class Conveyor extends Block{
}
if(canmove){
pos.pos += speed * Mathf.delta();
pos.y = MathUtils.lerp(pos.y, 0, 0.14f * Mathf.delta());
pos.pos += speed * Timers.delta();
pos.y = MathUtils.lerp(pos.y, 0, 0.14f * Timers.delta());
}else{
pos.y = MathUtils.lerp(pos.y, pos.seed/128f/3f, 0.1f * Mathf.delta());
pos.y = MathUtils.lerp(pos.y, pos.seed/128f/3f, 0.1f * Timers.delta());
}
if(pos.pos >= 1f && offloadDir(tile, pos.item)){

2
core/src/io/anuke/mindustry/world/blocks/Crafter.java
View File

@@ -4,7 +4,7 @@ import io.anuke.mindustry.resource.Item;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Effects;
import io.anuke.ucore.util.Timers;
import io.anuke.ucore.core.Timers;
public class Crafter extends Block{
protected Item[] requirements;

2
core/src/io/anuke/mindustry/world/blocks/Drill.java
View File

@@ -10,7 +10,7 @@ import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Draw;
import io.anuke.ucore.core.Effects;
import io.anuke.ucore.util.Timers;
import io.anuke.ucore.core.Timers;
public class Drill extends Block{
protected Block resource;

2
core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java
View File

@@ -10,7 +10,7 @@ import io.anuke.mindustry.resource.Item;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Effects;
import io.anuke.ucore.util.Timers;
import io.anuke.ucore.core.Timers;
public class ProductionBlocks{
public static final Block

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

@@ -5,10 +5,10 @@ import com.badlogic.gdx.math.MathUtils;
import io.anuke.mindustry.World;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Draw;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.graphics.Hue;
import io.anuke.ucore.util.Angles;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Timers;
public class RepairTurret extends Turret{
@@ -24,7 +24,7 @@ public class RepairTurret extends Turret{
if(entity.target != null){
float target = entity.angleTo(entity.target);
entity.rotation = Mathf.slerp(entity.rotation, target, 0.16f*Mathf.delta());
entity.rotation = Mathf.slerp(entity.rotation, target, 0.16f*Timers.delta());
if(Timers.get(tile, reload) && Angles.angleDist(target, entity.rotation) < 10){
entity.target.health++;

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

@@ -17,10 +17,10 @@ import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Draw;
import io.anuke.ucore.core.Effects;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.entities.Entities;
import io.anuke.ucore.util.Angles;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Timers;
public class Turret extends Block{
protected float range = 50f;
@@ -89,7 +89,7 @@ public class Turret extends Block{
if(enemy != null){
entity.rotation = MathUtils.lerpAngleDeg(entity.rotation,
Angles.predictAngle(tile.worldx(), tile.worldy(), enemy.x, enemy.y, enemy.xvelocity, enemy.yvelocity, bullet.speed),
0.2f*Mathf.delta());
0.2f*Timers.delta());
float reload = Vars.multiplier*this.reload;
if(Timers.get(tile, reload)){
Effects.sound(shootsound, entity);

2
core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java
View File

@@ -4,8 +4,8 @@ import io.anuke.mindustry.entities.BulletType;
import io.anuke.mindustry.resource.Item;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Timers;
public class WeaponBlocks{
public static Block

7
core/src/io/anuke/ucore/function/CollisionMap.java
View File

@@ -1,7 +0,0 @@
package io.anuke.ucore.function;
import io.anuke.ucore.aabb.Collider;
public interface CollisionMap{
public boolean valid(Collider c, float x, float y);
}

7
core/src/io/anuke/ucore/function/ContactFilter.java
View File

@@ -1,7 +0,0 @@
package io.anuke.ucore.function;
import io.anuke.ucore.aabb.Collider;
public interface ContactFilter{
public boolean collide(Collider a, Collider b);
}

7
core/src/io/anuke/ucore/function/ContactListener.java
View File

@@ -1,7 +0,0 @@
package io.anuke.ucore.function;
import io.anuke.ucore.aabb.Collider;
public interface ContactListener{
public void onContact(Collider a, Collider b);
}