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

Ignore .git in mods

Browse Source
This commit is contained in:
Anuken
2023-10-30 09:13:47 -04:00
parent a0a0b5942e
commit 55684e8b98
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,12 +111,12 @@ public final class FogRenderer{
dynamicFog.getTexture().setFilter(TextureFilter.linear); dynamicFog.getTexture().setFilter(TextureFilter.linear);
Draw.shader(Shaders.fog); Draw.shader(Shaders.fog);
Draw.color(state.rules.dynamicColor); Draw.color(state.rules.dynamicColor, 0.5f);
Draw.fbo(dynamicFog.getTexture(), world.width(), world.height(), tilesize); Draw.fbo(dynamicFog.getTexture(), world.width(), world.height(), tilesize);
//TODO ai check? //TODO ai check?
if(state.rules.staticFog){ if(state.rules.staticFog){
//TODO why does this require a half-tile offset while dynamic does not //TODO why does this require a half-tile offset while dynamic does not
Draw.color(state.rules.staticColor); Draw.color(state.rules.staticColor, 1f);
Draw.fbo(staticFog.getTexture(), world.width(), world.height(), tilesize, tilesize/2f); Draw.fbo(staticFog.getTexture(), world.width(), world.height(), tilesize, tilesize/2f);
} }
Draw.shader(); Draw.shader();

4
core/src/mindustry/graphics/MinimapRenderer.java
View File

@@ -193,7 +193,7 @@ public class MinimapRenderer{
Tmp.tr1.set(dynamicTex); Tmp.tr1.set(dynamicTex);
Tmp.tr1.set(region.u, 1f - region.v, region.u2, 1f - region.v2); Tmp.tr1.set(region.u, 1f - region.v, region.u2, 1f - region.v2);
Draw.color(state.rules.dynamicColor); Draw.color(state.rules.dynamicColor, 0.5f);
Draw.rect(Tmp.tr1, x + w/2f, y + h/2f, w, h); Draw.rect(Tmp.tr1, x + w/2f, y + h/2f, w, h);
if(state.rules.staticFog){ if(state.rules.staticFog){
@@ -201,7 +201,7 @@ public class MinimapRenderer{
Tmp.tr1.texture = staticTex; Tmp.tr1.texture = staticTex;
//must be black to fit with borders //must be black to fit with borders
Draw.color(0f, 0f, 0f, state.rules.staticColor.a); Draw.color(0f, 0f, 0f, 1f);
Draw.rect(Tmp.tr1, x + w/2f, y + h/2f, w, h); Draw.rect(Tmp.tr1, x + w/2f, y + h/2f, w, h);
} }

2
core/src/mindustry/mod/Mods.java
View File

@@ -38,7 +38,7 @@ public class Mods implements Loadable{
private @Nullable Scripts scripts; private @Nullable Scripts scripts;
private ContentParser parser = new ContentParser(); private ContentParser parser = new ContentParser();
private ObjectMap<String, Seq<Fi>> bundles = new ObjectMap<>(); private ObjectMap<String, Seq<Fi>> bundles = new ObjectMap<>();
private ObjectSet<String> specialFolders = ObjectSet.with("bundles", "sprites", "sprites-override"); private ObjectSet<String> specialFolders = ObjectSet.with("bundles", "sprites", "sprites-override", ".git");
private int totalSprites; private int totalSprites;
private ObjectFloatMap<String> textureResize = new ObjectFloatMap<>(); private ObjectFloatMap<String> textureResize = new ObjectFloatMap<>();