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

Additional fixes

Browse Source
This commit is contained in:
Anuken
2018-12-23 23:58:24 -05:00
parent 44e4ffbe62
commit 22b7086bea
56 changed files with 350 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/io/anuke/mindustry/graphics/BlockRenderer.java
View File

@@ -48,8 +48,8 @@ public class BlockRenderer{
threads.runGraphics(() -> {
int avgx = Mathf.scl(camera.position.x, tilesize);
int avgy = Mathf.scl(camera.position.y, tilesize);
int rangex = (int) (camera.viewportWidth * camera.zoom / tilesize / 2) + 2;
int rangey = (int) (camera.viewportHeight * camera.zoom / tilesize / 2) + 2;
int rangex = (int) (camera.width / tilesize / 2) + 2;
int rangey = (int) (camera.height / tilesize / 2) + 2;
if(Math.abs(avgx - event.tile.x) <= rangex && Math.abs(avgy - event.tile.y) <= rangey){
lastCamY = lastCamX = -99; //invalidate camera position so blocks get updated
@@ -79,8 +79,8 @@ public class BlockRenderer{
int avgx = Mathf.scl(camera.position.x, tilesize);
int avgy = Mathf.scl(camera.position.y, tilesize);
int rangex = (int) (camera.viewportWidth * camera.zoom / tilesize / 2) + 2;
int rangey = (int) (camera.viewportHeight * camera.zoom / tilesize / 2) + 2;
int rangex = (int) (camera.width / tilesize / 2) + 2;
int rangey = (int) (camera.height / tilesize / 2) + 2;
if(avgx == lastCamX && avgy == lastCamY && lastRangeX == rangex && lastRangeY == rangey){
return;

2
core/src/io/anuke/mindustry/graphics/CacheLayer.java
View File

@@ -80,7 +80,7 @@ public enum CacheLayer{
Graphics.shader(shader);
Graphics.begin();
Draw.rect(renderer.effectSurface.texture(), Core.camera.position.x, Core.camera.position.y,
Core.camera.viewportWidth * Core.camera.zoom, -Core.camera.viewportHeight * Core.camera.zoom);
Core.camera.width , -Core.camera.height );
Graphics.end();
Graphics.shader();
renderer.blocks.beginFloor();

8
core/src/io/anuke/mindustry/graphics/FloorRenderer.java
View File

@@ -46,8 +46,8 @@ public class FloorRenderer{
OrthographicCamera camera = Core.camera;
int crangex = (int) (camera.viewportWidth * camera.zoom / (chunksize * tilesize)) + 1;
int crangey = (int) (camera.viewportHeight * camera.zoom / (chunksize * tilesize)) + 1;
int crangex = (int) (camera.width / (chunksize * tilesize)) + 1;
int crangey = (int) (camera.height / (chunksize * tilesize)) + 1;
int camx = Mathf.scl(camera.position.x, chunksize * tilesize);
int camy = Mathf.scl(camera.position.y, chunksize * tilesize);
@@ -123,8 +123,8 @@ public class FloorRenderer{
OrthographicCamera camera = Core.camera;
int crangex = (int) (camera.viewportWidth * camera.zoom / (chunksize * tilesize)) + 1;
int crangey = (int) (camera.viewportHeight * camera.zoom / (chunksize * tilesize)) + 1;
int crangex = (int) (camera.width / (chunksize * tilesize)) + 1;
int crangey = (int) (camera.height / (chunksize * tilesize)) + 1;
layer.begin();

4
core/src/io/anuke/mindustry/graphics/FogRenderer.java
View File

@@ -94,8 +94,8 @@ public class FogRenderer implements Disposable{
public void draw(){
if(buffer == null) return;
float vw = Core.camera.viewportWidth * Core.camera.zoom;
float vh = Core.camera.viewportHeight * Core.camera.zoom;
float vw = Core.camera.width ;
float vh = Core.camera.height ;
float px = Core.camera.position.x - vw / 2f;
float py = Core.camera.position.y - vh / 2f;

4
core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
View File

@@ -53,7 +53,7 @@ public class OverlayRenderer{
for(Player player : playerGroup.all()){
if(Core.settings.getBool("indicators") && player != players[0] && player.getTeam() == players[0].getTeam()){
if(!rect.setSize(Core.camera.viewportWidth * Core.camera.zoom * 0.9f, Core.camera.viewportHeight * Core.camera.zoom * 0.9f)
if(!rect.setSize(Core.camera.width * 0.9f, Core.camera.height * 0.9f)
.setCenter(Core.camera.position.x, Core.camera.position.y).contains(player.x, player.y)){
Tmp.v1.set(player.x, player.y).sub(Core.camera.position.x, Core.camera.position.y).setLength(indicatorLength);
@@ -87,7 +87,7 @@ public class OverlayRenderer{
if(buildFadeTime > 0.005f){
for(Team enemy : state.teams.enemiesOf(player.getTeam())){
for(Tile core : state.teams.get(enemy).cores){
float dst = Vector2.dst(player.x, player.y, core.drawx(), core.drawy());
float dst = Mathf.dst(player.x, player.y, core.drawx(), core.drawy());
if(dst < state.mode.enemyCoreBuildRadius * 1.5f){
Draw.color(Color.DARK_GRAY);
Lines.poly(core.drawx(), core.drawy() - 2, 200, state.mode.enemyCoreBuildRadius);

16
core/src/io/anuke/mindustry/graphics/Shaders.java
View File

@@ -175,10 +175,10 @@ public class Shaders{
shader.setUniformf("u_dp", Unit.dp.scl(1f));
shader.setUniformf("u_time", Time.time() / Unit.dp.scl(1f));
shader.setUniformf("u_offset",
Core.camera.position.x - Core.camera.viewportWidth / 2 * Core.camera.zoom,
Core.camera.position.y - Core.camera.viewportHeight / 2 * Core.camera.zoom);
shader.setUniformf("u_texsize", Core.camera.viewportWidth * Core.camera.zoom,
Core.camera.viewportHeight * Core.camera.zoom);
Core.camera.position.x - Core.camera.width / 2 ,
Core.camera.position.y - Core.camera.height / 2 );
shader.setUniformf("u_texsize", Core.camera.width ,
Core.camera.height );
}
}
@@ -191,10 +191,10 @@ public class Shaders{
@Override
public void apply(){
shader.setUniformf("camerapos",
Core.camera.position.x - Core.camera.viewportWidth / 2 * Core.camera.zoom,
Core.camera.position.y - Core.camera.viewportHeight / 2 * Core.camera.zoom);
shader.setUniformf("screensize", Core.camera.viewportWidth* Core.camera.zoom,
Core.camera.viewportHeight * Core.camera.zoom);
Core.camera.position.x - Core.camera.width / 2 ,
Core.camera.position.y - Core.camera.height / 2 );
shader.setUniformf("screensize", Core.camera.width,
Core.camera.height );
shader.setUniformf("time", Time.time());
}
}

2
core/src/io/anuke/mindustry/graphics/Trail.java
View File

@@ -23,7 +23,7 @@ public class Trail{
}
public void update(float curx, float cury){
if(Vector2.dst(curx, cury, lastX, lastY) >= maxJump){
if(Mathf.dst(curx, cury, lastX, lastY) >= maxJump){
points.clear();
}