mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-22 05:38:19 +07:00
Code Issues Packages Projects Releases Wiki Activity

Removed camera clamping for custom maps

Browse Source
This commit is contained in:
Anuken
2018-09-04 19:55:39 -04:00
parent ae6d2fb363
commit 6893a30ffb
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,13 +160,8 @@ public class Renderer extends RendererModule{
}else if(!mobile){ }else if(!mobile){
setCamera(position.x + 0.0001f, position.y + 0.0001f); setCamera(position.x + 0.0001f, position.y + 0.0001f);
} }
camera.position.x = Mathf.clamp(camera.position.x, -tilesize / 2f, world.width() * tilesize - tilesize / 2f);
if(world.getSector() == null){ camera.position.y = Mathf.clamp(camera.position.y, -tilesize / 2f, world.height() * tilesize - tilesize / 2f);
clampCamera(-tilesize / 2f, -tilesize / 2f + 1, world.width() * tilesize - tilesize / 2f, world.height() * tilesize - tilesize / 2f);
}else{
camera.position.x = Mathf.clamp(camera.position.x, -tilesize / 2f, world.width() * tilesize - tilesize / 2f);
camera.position.y = Mathf.clamp(camera.position.y, -tilesize / 2f, world.height() * tilesize - tilesize / 2f);
}
float prex = camera.position.x, prey = camera.position.y; float prex = camera.position.x, prey = camera.position.y;
updateShake(0.75f); updateShake(0.75f);

8
core/src/io/anuke/mindustry/entities/Unit.java
View File

@ -242,10 +242,12 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
Effects.effect(floor.walkEffect, floor.liquidColor, x, y); Effects.effect(floor.walkEffect, floor.liquidColor, x, y);
} }
status.handleApply(this, floor.status, floor.statusIntensity); if(onLiquid){
status.handleApply(this, floor.status, floor.statusIntensity);
if(floor.damageTaken > 0f){ if(floor.damageTaken > 0f){
damagePeriodic(floor.damageTaken); damagePeriodic(floor.damageTaken);
}
} }
if(onLiquid && floor.drownTime > 0){ if(onLiquid && floor.drownTime > 0){

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

@ -29,13 +29,14 @@ import static io.anuke.mindustry.Vars.*;
/**Used for rendering fog of war. A framebuffer is used for this.*/ /**Used for rendering fog of war. A framebuffer is used for this.*/
public class FogRenderer implements Disposable{ public class FogRenderer implements Disposable{
private static final int extraPadding = 3; private static final int extraPadding = 3;
private static final int shadowPadding = 1; private static final int fshadowPadding = 1;
private TextureRegion region = new TextureRegion(); private TextureRegion region = new TextureRegion();
private FrameBuffer buffer; private FrameBuffer buffer;
private ByteBuffer pixelBuffer; private ByteBuffer pixelBuffer;
private Array<Tile> changeQueue = new Array<>(); private Array<Tile> changeQueue = new Array<>();
private int padding; private int padding;
private int shadowPadding;
private Rectangle rect = new Rectangle(); private Rectangle rect = new Rectangle();
private boolean dirty; private boolean dirty;
@ -44,6 +45,7 @@ public class FogRenderer implements Disposable{
dispose(); dispose();
padding = world.getSector() != null ? mapPadding + extraPadding : 0; padding = world.getSector() != null ? mapPadding + extraPadding : 0;
shadowPadding = world.getSector() != null ? fshadowPadding : -1;
buffer = new FrameBuffer(Format.RGBA8888, world.width() + padding*2, world.height() + padding*2, false); buffer = new FrameBuffer(Format.RGBA8888, world.width() + padding*2, world.height() + padding*2, false);
changeQueue.clear(); changeQueue.clear();