AA turret placement overlap fix
This commit is contained in:
@@ -588,7 +588,7 @@ public class Renderer implements ApplicationListener{
|
|||||||
camera.height = h;
|
camera.height = h;
|
||||||
camera.position.x = w / 2f + tilesize / 2f;
|
camera.position.x = w / 2f + tilesize / 2f;
|
||||||
camera.position.y = h / 2f + tilesize / 2f;
|
camera.position.y = h / 2f + tilesize / 2f;
|
||||||
buffer.begin();
|
buffer.begin(Color.clear);
|
||||||
draw();
|
draw();
|
||||||
Draw.flush();
|
Draw.flush();
|
||||||
byte[] lines = ScreenUtils.getFrameBufferPixels(0, 0, w, h, true);
|
byte[] lines = ScreenUtils.getFrameBufferPixels(0, 0, w, h, true);
|
||||||
|
|||||||
@@ -172,7 +172,7 @@ public class Schematics implements Loadable{
|
|||||||
public void savePreview(Schematic schematic, Fi file){
|
public void savePreview(Schematic schematic, Fi file){
|
||||||
FrameBuffer buffer = getBuffer(schematic);
|
FrameBuffer buffer = getBuffer(schematic);
|
||||||
Draw.flush();
|
Draw.flush();
|
||||||
buffer.begin();
|
buffer.begin(Color.clear);
|
||||||
Pixmap pixmap = ScreenUtils.getFrameBufferPixmap(0, 0, buffer.getWidth(), buffer.getHeight());
|
Pixmap pixmap = ScreenUtils.getFrameBufferPixmap(0, 0, buffer.getWidth(), buffer.getHeight());
|
||||||
file.writePng(pixmap);
|
file.writePng(pixmap);
|
||||||
buffer.end();
|
buffer.end();
|
||||||
|
|||||||
@@ -125,8 +125,7 @@ public class BlockRenderer{
|
|||||||
|
|
||||||
shadows.getTexture().setFilter(TextureFilter.linear, TextureFilter.linear);
|
shadows.getTexture().setFilter(TextureFilter.linear, TextureFilter.linear);
|
||||||
shadows.resize(world.width(), world.height());
|
shadows.resize(world.width(), world.height());
|
||||||
shadows.begin();
|
shadows.begin(Color.white);
|
||||||
Core.graphics.clear(Color.white);
|
|
||||||
Draw.proj().setOrtho(0, 0, shadows.getWidth(), shadows.getHeight());
|
Draw.proj().setOrtho(0, 0, shadows.getWidth(), shadows.getHeight());
|
||||||
|
|
||||||
Draw.color(blendShadowColor);
|
Draw.color(blendShadowColor);
|
||||||
@@ -161,8 +160,7 @@ public class BlockRenderer{
|
|||||||
public void updateShadows(boolean ignoreBuildings, boolean ignoreTerrain){
|
public void updateShadows(boolean ignoreBuildings, boolean ignoreTerrain){
|
||||||
shadows.getTexture().setFilter(TextureFilter.linear, TextureFilter.linear);
|
shadows.getTexture().setFilter(TextureFilter.linear, TextureFilter.linear);
|
||||||
shadows.resize(world.width(), world.height());
|
shadows.resize(world.width(), world.height());
|
||||||
shadows.begin();
|
shadows.begin(Color.white);
|
||||||
Core.graphics.clear(Color.white);
|
|
||||||
Draw.proj().setOrtho(0, 0, shadows.getWidth(), shadows.getHeight());
|
Draw.proj().setOrtho(0, 0, shadows.getWidth(), shadows.getHeight());
|
||||||
|
|
||||||
Draw.color(blendShadowColor);
|
Draw.color(blendShadowColor);
|
||||||
@@ -182,10 +180,9 @@ public class BlockRenderer{
|
|||||||
darkEvents.clear();
|
darkEvents.clear();
|
||||||
dark.getTexture().setFilter(TextureFilter.linear);
|
dark.getTexture().setFilter(TextureFilter.linear);
|
||||||
dark.resize(world.width(), world.height());
|
dark.resize(world.width(), world.height());
|
||||||
dark.begin();
|
|
||||||
|
|
||||||
//fill darkness with black when map area is limited
|
//fill darkness with black when map area is limited
|
||||||
Core.graphics.clear(state.rules.limitMapArea ? Color.black : Color.white);
|
dark.begin(state.rules.limitMapArea ? Color.black : Color.white);
|
||||||
|
|
||||||
Draw.proj().setOrtho(0, 0, dark.getWidth(), dark.getHeight());
|
Draw.proj().setOrtho(0, 0, dark.getWidth(), dark.getHeight());
|
||||||
|
|
||||||
//clear out initial starting area
|
//clear out initial starting area
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package mindustry.graphics;
|
package mindustry.graphics;
|
||||||
|
|
||||||
import arc.*;
|
|
||||||
import arc.graphics.*;
|
import arc.graphics.*;
|
||||||
import arc.graphics.gl.*;
|
import arc.graphics.gl.*;
|
||||||
import arc.math.*;
|
import arc.math.*;
|
||||||
@@ -99,8 +98,7 @@ public class CacheLayer{
|
|||||||
public void begin(){
|
public void begin(){
|
||||||
if(!renderer.animateWater) return;
|
if(!renderer.animateWater) return;
|
||||||
|
|
||||||
renderer.effectBuffer.begin();
|
renderer.effectBuffer.begin(Color.clear);
|
||||||
Core.graphics.clear(Color.clear);
|
|
||||||
renderer.blocks.floor.beginDraw();
|
renderer.blocks.floor.beginDraw();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -54,7 +54,9 @@ public class ContinuousLiquidTurret extends ContinuousTurret{
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
ammoTypes.each((item, type) -> placeOverlapRange = Math.max(placeOverlapRange, range + type.rangeChange + placeOverlapMargin));
|
if(targetGround){
|
||||||
|
ammoTypes.each((item, type) -> placeOverlapRange = Math.max(placeOverlapRange, range + type.rangeChange + placeOverlapMargin));
|
||||||
|
}
|
||||||
|
|
||||||
super.init();
|
super.init();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -91,7 +91,9 @@ public class ItemTurret extends Turret{
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
ammoTypes.each((item, type) -> placeOverlapRange = Math.max(placeOverlapRange, range + type.rangeChange + placeOverlapMargin));
|
if(targetGround){
|
||||||
|
ammoTypes.each((item, type) -> placeOverlapRange = Math.max(placeOverlapRange, range + type.rangeChange + placeOverlapMargin));
|
||||||
|
}
|
||||||
|
|
||||||
super.init();
|
super.init();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,7 +54,9 @@ public class LiquidTurret extends Turret{
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
ammoTypes.each((item, type) -> placeOverlapRange = Math.max(placeOverlapRange, range + type.rangeChange + placeOverlapMargin));
|
if(targetGround){
|
||||||
|
ammoTypes.each((item, type) -> placeOverlapRange = Math.max(placeOverlapRange, range + type.rangeChange + placeOverlapMargin));
|
||||||
|
}
|
||||||
|
|
||||||
super.init();
|
super.init();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user