mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-12 03:37:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

Possible minimap fix

Browse Source
This commit is contained in:
Anuken 2018-11-08 23:19:47 -05:00
parent 6342cc41ac
commit e9783ecccc
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/io/anuke/mindustry/ui/Minimap.java
View File

@ -1,21 +1,17 @@
package io.anuke.mindustry.ui; package io.anuke.mindustry.ui;
import com.badlogic.gdx.graphics.Texture.TextureFilter; import com.badlogic.gdx.graphics.Texture.TextureFilter;
import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
import io.anuke.mindustry.graphics.Shaders; import io.anuke.mindustry.graphics.Shaders;
import io.anuke.ucore.core.Core; import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Graphics; import io.anuke.ucore.core.Graphics;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.scene.Element; import io.anuke.ucore.scene.Element;
import io.anuke.ucore.scene.event.InputEvent; import io.anuke.ucore.scene.event.InputEvent;
import io.anuke.ucore.scene.event.InputListener; import io.anuke.ucore.scene.event.InputListener;
import io.anuke.ucore.scene.style.TextureRegionDrawable;
import io.anuke.ucore.scene.ui.Image;
import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.scene.ui.layout.Table;
import static io.anuke.mindustry.Vars.renderer; import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.Vars.showFog;
import static io.anuke.mindustry.Vars.world;
public class Minimap extends Table{ public class Minimap extends Table{
@ -25,14 +21,15 @@ public class Minimap extends Table{
margin(5); margin(5);
marginBottom(10); marginBottom(10);
Image image = new Image(new TextureRegionDrawable(new TextureRegion())){ TextureRegion r = new TextureRegion();
Element elem = new Element(){
@Override @Override
public void draw(Batch batch, float parentAlpha){ public void draw(){
if(renderer.minimap.getRegion() == null) return; if(renderer.minimap.getRegion() == null) return;
TextureRegionDrawable draw = (TextureRegionDrawable) getDrawable(); Draw.crect(renderer.minimap.getRegion(), x, y, width, height);
draw.getRegion().setRegion(renderer.minimap.getRegion());
super.draw(batch, parentAlpha);
if(renderer.minimap.getTexture() != null){ if(renderer.minimap.getTexture() != null){
renderer.minimap.drawEntities(x, y, width, height); renderer.minimap.drawEntities(x, y, width, height);
} }
@ -40,7 +37,7 @@ public class Minimap extends Table{
if(showFog){ if(showFog){
renderer.fog.getTexture().setFilter(TextureFilter.Nearest, TextureFilter.Nearest); renderer.fog.getTexture().setFilter(TextureFilter.Nearest, TextureFilter.Nearest);
TextureRegion r = draw.getRegion(); r.setRegion(renderer.minimap.getRegion());
float pad = renderer.fog.getPadding(); float pad = renderer.fog.getPadding();
float px = r.getU() * world.width() + pad; float px = r.getU() * world.width() + pad;
@ -55,7 +52,7 @@ public class Minimap extends Table{
r.setV2(1f - py2 / (world.height() + pad*2f)); r.setV2(1f - py2 / (world.height() + pad*2f));
Graphics.shader(Shaders.fog); Graphics.shader(Shaders.fog);
super.draw(batch, parentAlpha); Draw.crect(r, x, y, width, height);
Graphics.shader(); Graphics.shader();
renderer.fog.getTexture().setFilter(TextureFilter.Linear, TextureFilter.Linear); renderer.fog.getTexture().setFilter(TextureFilter.Linear, TextureFilter.Linear);
@ -70,7 +67,7 @@ public class Minimap extends Table{
} }
}); });
image.update(() -> { elem.update(() -> {
Element e = Core.scene.hit(Graphics.mouse().x, Graphics.mouse().y, true); Element e = Core.scene.hit(Graphics.mouse().x, Graphics.mouse().y, true);
if(e != null && e.isDescendantOf(this)){ if(e != null && e.isDescendantOf(this)){
@ -79,6 +76,7 @@ public class Minimap extends Table{
Core.scene.setScrollFocus(null); Core.scene.setScrollFocus(null);
} }
}); });
add(image).size(140f, 140f);
add(elem).size(140f, 140f);
} }
} }