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

Cleanup of new graphical options

Browse Source
This commit is contained in:
Anuken 2019-04-02 17:18:55 -04:00
parent d9692004cc
commit 3f6aeac33d
23 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/bundles/bundle_cs.properties
View File

@ -410,6 +410,7 @@ category.optional = Volitelné vylepšení
setting.landscape.name = Lock Landscape
setting.shadows.name = Shadows
setting.animatedwater.name = Animated Water
setting.animatedshields.name = Animated Shields
setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
setting.indicators.name = Indikátor pro spojence
setting.autotarget.name = Automaticky zaměřuje

1
core/assets/bundles/bundle_de.properties
View File

@ -410,6 +410,7 @@ category.optional = Optional Enhancements
setting.landscape.name = Lock Landscape
setting.shadows.name = Shadows
setting.animatedwater.name = Animated Water
setting.animatedshields.name = Animated Shields
setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
setting.indicators.name = Ally Indicators
setting.autotarget.name = Auto-Zielauswahl

1
core/assets/bundles/bundle_es.properties
View File

@ -410,6 +410,7 @@ category.optional = Mejoras Opcionales
setting.landscape.name = Lock Landscape
setting.shadows.name = Shadows
setting.animatedwater.name = Animated Water
setting.animatedshields.name = Animated Shields
setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
setting.indicators.name = Ally Indicators
setting.autotarget.name = Auto apuntado

1
core/assets/bundles/bundle_fr.properties
View File

@ -410,6 +410,7 @@ category.optional = Optional Enhancements
setting.landscape.name = Lock Landscape
setting.shadows.name = Shadows
setting.animatedwater.name = Animated Water
setting.animatedshields.name = Animated Shields
setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
setting.indicators.name = Ally Indicators
setting.autotarget.name = Visée automatique

1
core/assets/bundles/bundle_fr_BE.properties
View File

@ -410,6 +410,7 @@ category.optional = Améliorations facultatives
setting.landscape.name = Lock Landscape
setting.shadows.name = Shadows
setting.animatedwater.name = Animated Water
setting.animatedshields.name = Animated Shields
setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
setting.indicators.name = Indicateurs d'alliés
setting.autotarget.name = Visée automatique

1
core/assets/bundles/bundle_in_ID.properties
View File

@ -410,6 +410,7 @@ category.optional = Optional Enhancements
setting.landscape.name = Lock Landscape
setting.shadows.name = Shadows
setting.animatedwater.name = Animated Water
setting.animatedshields.name = Animated Shields
setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
setting.indicators.name = Ally Indicators
setting.autotarget.name = Auto-Target

1
core/assets/bundles/bundle_it.properties
View File

@ -410,6 +410,7 @@ category.optional = Optional Enhancements
setting.landscape.name = Lock Landscape
setting.shadows.name = Shadows
setting.animatedwater.name = Animated Water
setting.animatedshields.name = Animated Shields
setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
setting.indicators.name = Ally Indicators
setting.autotarget.name = Auto-Target

1
core/assets/bundles/bundle_ja.properties
View File

@ -410,6 +410,7 @@ category.optional = 機能強化オプション
setting.landscape.name = Lock Landscape
setting.shadows.name = Shadows
setting.animatedwater.name = 水のアニメーション
setting.animatedshields.name = Animated Shields
setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
setting.indicators.name = 味方の方角表示
setting.autotarget.name = 自動ターゲット

1
core/assets/bundles/bundle_ko.properties
View File

@ -410,6 +410,7 @@ category.optional = 보조 아이템
setting.landscape.name = 가로화면으로 고정
setting.shadows.name = 그림자
setting.animatedwater.name = 움직이는 물
setting.animatedshields.name = Animated Shields
setting.antialias.name = 안티에일리어싱[LIGHT_GRAY] (재시작 필요)[]
setting.indicators.name = 아군/적 인디게이터 표시
setting.autotarget.name = 자동 조준

1
core/assets/bundles/bundle_nl.properties
View File

@ -410,6 +410,7 @@ category.optional = Optional Enhancements
setting.landscape.name = Lock Landscape
setting.shadows.name = Shadows
setting.animatedwater.name = Animated Water
setting.animatedshields.name = Animated Shields
setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
setting.indicators.name = Ally Indicators
setting.autotarget.name = Auto-Target

1
core/assets/bundles/bundle_pl.properties
View File

@ -410,6 +410,7 @@ category.optional = Ulepszenia Nieobowiąskowe
setting.landscape.name = Lock Landscape
setting.shadows.name = Shadows
setting.animatedwater.name = Animated Water
setting.animatedshields.name = Animated Shields
setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
setting.indicators.name = Wskaźniki Przyjaciół
setting.autotarget.name = Automatyczne Celowanie

1
core/assets/bundles/bundle_pt_BR.properties
View File

@ -410,6 +410,7 @@ category.optional = Melhoras opcionais
setting.landscape.name = Lock Landscape
setting.shadows.name = Shadows
setting.animatedwater.name = Animated Water
setting.animatedshields.name = Animated Shields
setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
setting.indicators.name = Ally Indicators
setting.autotarget.name = Alvo automatico

1
core/assets/bundles/bundle_ru.properties
View File

@ -410,6 +410,7 @@ category.optional = Дополнительные улучшения
setting.landscape.name = Lock Landscape
setting.shadows.name = Shadows
setting.animatedwater.name = Анимированная вода
setting.animatedshields.name = Animated Shields
setting.antialias.name = Сглаживание[LIGHT_GRAY] (требует перезапуска)[]
setting.indicators.name = Показывать в сторону союзников и врагов
setting.autotarget.name = Авто-стрельба

1
core/assets/bundles/bundle_tk.properties
View File

@ -410,6 +410,7 @@ category.optional = Optional Enhancements
setting.landscape.name = Lock Landscape
setting.shadows.name = Shadows
setting.animatedwater.name = Animated Water
setting.animatedshields.name = Animated Shields
setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
setting.indicators.name = Ally Indicators
setting.autotarget.name = Auto-Target

1
core/assets/bundles/bundle_tr.properties
View File

@ -410,6 +410,7 @@ category.optional = Optional Enhancements
setting.landscape.name = Lock Landscape
setting.shadows.name = Shadows
setting.animatedwater.name = Animated Water
setting.animatedshields.name = Animated Shields
setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
setting.indicators.name = Ally Indicators
setting.autotarget.name = Auto-Target

1
core/assets/bundles/bundle_uk_UA.properties
View File

@ -410,6 +410,7 @@ category.optional = Додаткові поліпшення
setting.landscape.name = Заблокований пейхаж
setting.shadows.name = Тіні
setting.animatedwater.name = Анімована вода
setting.animatedshields.name = Animated Shields
setting.antialias.name = Згладжування[LIGHT_GRAY] (потребує перезапуску)[]
setting.indicators.name = Показувати у сторону ворогів та союзників
setting.autotarget.name = Авто-стрільба

1
core/assets/bundles/bundle_zh_CN.properties
View File

@ -410,6 +410,7 @@ category.optional = 可选的增强物品
setting.landscape.name = 锁定地形
setting.shadows.name = 影子
setting.animatedwater.name = 流动的水
setting.animatedshields.name = Animated Shields
setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
setting.indicators.name = 队友指示器
setting.autotarget.name = 自动发射

1
core/assets/bundles/bundle_zh_TW.properties
View File

@ -410,6 +410,7 @@ category.optional = 可選的強化
setting.landscape.name = Lock Landscape
setting.shadows.name = Shadows
setting.animatedwater.name = 動畫水
setting.animatedshields.name = Animated Shields
setting.antialias.name = 消除鋸齒[LIGHT_GRAY]（需要重啟）[]
setting.indicators.name = 盟友指標
setting.autotarget.name = 自動射擊

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

@ -163,9 +163,8 @@ public class Renderer implements ApplicationListener{
graphics.clear(clearColor);
if(!graphics.isHidden() && (shieldBuffer.getWidth() != graphics.getWidth() || shieldBuffer.getHeight() != graphics.getHeight())){
if(!graphics.isHidden() && (Core.settings.getBool("animatedwater") || Core.settings.getBool("animatedshields")) && shieldBuffer.getWidth() != graphics.getWidth() || shieldBuffer.getHeight() != graphics.getHeight()){
shieldBuffer.resize(graphics.getWidth(), graphics.getHeight());
pixelator.rebind();
}
Draw.proj(camera.projection());
@ -212,7 +211,7 @@ public class Renderer implements ApplicationListener{
drawAndInterpolate(playerGroup, p -> true, Player::drawBuildRequests);
if(EntityDraw.countInBounds(shieldGroup) > 0){
if(settings.getBool("animatedshields") && !pixelator.enabled()){
if(settings.getBool("animatedshields")){
Draw.flush();
shieldBuffer.begin();
graphics.clear(Color.CLEAR);

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

@ -43,7 +43,7 @@ public enum CacheLayer{
}
void beginShader(){
if(!Core.settings.getBool("animatedwater") || renderer.pixelator.enabled()) return;
if(!Core.settings.getBool("animatedwater")) return;
renderer.blocks.floor.endc();
renderer.shieldBuffer.begin();
@ -52,7 +52,7 @@ public enum CacheLayer{
}
void endShader(Shader shader){
if(!Core.settings.getBool("animatedwater") || renderer.pixelator.enabled()) return;
if(!Core.settings.getBool("animatedwater")) return;
renderer.blocks.floor.endc();
renderer.shieldBuffer.end();

6
core/src/io/anuke/mindustry/graphics/Pixelator.java
View File

@ -14,6 +14,10 @@ public class Pixelator implements Disposable{
private FrameBuffer buffer = new FrameBuffer(2, 2);
public void drawPixelate(){
boolean hadShields = Core.settings.getBool("animatedshields");
boolean hadWater = Core.settings.getBool("animatedwater");
Core.settings.put("animatedwater", false);
Core.settings.put("animatedshields", false);
graphics.clear(0f, 0f, 0f, 1f);
float px = Core.camera.position.x, py = Core.camera.position.y;
@ -38,6 +42,8 @@ public class Pixelator implements Disposable{
Draw.blend();
Core.camera.position.set(px, py);
Core.settings.put("animatedwater", hadWater);
Core.settings.put("animatedshields", hadShields);
}
public void rebind(){

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

@ -213,7 +213,7 @@ public class SettingsMenuDialog extends SettingsDialog{
graphics.checkPref("fps", false);
graphics.checkPref("indicators", true);
graphics.checkPref("animatedwater", false);
graphics.checkPref("animatedshields", false);
graphics.checkPref("animatedshields", !mobile);
graphics.checkPref("lasers", true);
graphics.checkPref("pixelate", false);
}

3
core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java
View File

@ -277,11 +277,12 @@ public class ForceProjector extends Block {
float rad = realRadius(entity);
Draw.color(Pal.accent);
Lines.stroke(1.5f);
Draw.alpha(0.09f + 0.08f * entity.hit);
Fill.poly(x, y, 6, rad);
Draw.alpha(1f);
Lines.poly(x, y, 6, rad);
Draw.color();
Draw.reset();
}
@Override