mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-14 17:57:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

Lowercase enums

Browse Source
This commit is contained in:
Anuken
2020-06-21 12:38:59 -04:00
parent 6f1a64db78
commit 4a8be42258
13 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/assets/sprites/fallback/sprites.atlas
View File

@ -1,7 +1,7 @@
sprites.png sprites.png
size: 2048,2048 size: 2048,2048
format: RGBA8888 format: rgba8888
filter: nearest,nearest filter: nearest,nearest
repeat: none repeat: none
core-silo core-silo
@ -539,7 +539,7 @@ reaper-cell
sprites2.png sprites2.png
size: 2048,2048 size: 2048,2048
format: RGBA8888 format: rgba8888
filter: nearest,nearest filter: nearest,nearest
repeat: none repeat: none
data-processor data-processor
@ -5774,7 +5774,7 @@ beam-weapon
sprites3.png sprites3.png
size: 2048,1024 size: 2048,1024
format: RGBA8888 format: rgba8888
filter: nearest,nearest filter: nearest,nearest
repeat: none repeat: none
rubble-1-0 rubble-1-0
@ -6060,7 +6060,7 @@ scorch-9-2
sprites4.png sprites4.png
size: 2048,512 size: 2048,512
format: RGBA8888 format: rgba8888
filter: nearest,nearest filter: nearest,nearest
repeat: none repeat: none
char1 char1
@ -7431,7 +7431,7 @@ water-edge
sprites5.png sprites5.png
size: 2048,1024 size: 2048,1024
format: RGBA8888 format: rgba8888
filter: nearest,nearest filter: nearest,nearest
repeat: none repeat: none
additive-reconstructor-icon-editor additive-reconstructor-icon-editor
@ -9544,7 +9544,7 @@ white-tree-icon-editor
sprites6.png sprites6.png
size: 2048,1024 size: 2048,1024
format: RGBA8888 format: rgba8888
filter: nearest,nearest filter: nearest,nearest
repeat: none repeat: none
alpha-bg alpha-bg

BIN
core/assets/sprites/fallback/sprites3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 126 KiB

After

Width:  |  Height:  |  Size: 128 KiB

10
core/assets/sprites/sprites.atlas
View File

@ -1,7 +1,7 @@
sprites.png sprites.png
size: 4096,2048 size: 4096,2048
format: RGBA8888 format: rgba8888
filter: nearest,nearest filter: nearest,nearest
repeat: none repeat: none
core-silo core-silo
@ -5768,7 +5768,7 @@ beam-weapon
sprites2.png sprites2.png
size: 4096,512 size: 4096,512
format: RGBA8888 format: rgba8888
filter: nearest,nearest filter: nearest,nearest
repeat: none repeat: none
rubble-1-0 rubble-1-0
@ -6054,7 +6054,7 @@ scorch-9-2
sprites3.png sprites3.png
size: 4096,256 size: 4096,256
format: RGBA8888 format: rgba8888
filter: nearest,nearest filter: nearest,nearest
repeat: none repeat: none
char1 char1
@ -7425,7 +7425,7 @@ water-edge
sprites4.png sprites4.png
size: 4096,512 size: 4096,512
format: RGBA8888 format: rgba8888
filter: nearest,nearest filter: nearest,nearest
repeat: none repeat: none
additive-reconstructor-icon-editor additive-reconstructor-icon-editor
@ -9538,7 +9538,7 @@ white-tree-icon-editor
sprites5.png sprites5.png
size: 4096,512 size: 4096,512
format: RGBA8888 format: rgba8888
filter: nearest,nearest filter: nearest,nearest
repeat: none repeat: none
alpha-bg alpha-bg

BIN
core/assets/sprites/sprites2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 126 KiB

After

Width:  |  Height:  |  Size: 129 KiB

2
core/src/mindustry/async/PhysicsProcess.java
View File

@ -22,7 +22,7 @@ public class PhysicsProcess implements AsyncProcess{
public PhysicsProcess(){ public PhysicsProcess(){
def = new BodyDef(); def = new BodyDef();
def.type = BodyType.DynamicBody; def.type = BodyType.dynamicBody;
//currently only enabled for units //currently only enabled for units
group = Groups.unit; group = Groups.unit;

2
core/src/mindustry/core/Renderer.java
View File

@ -339,7 +339,7 @@ public class Renderer implements ApplicationListener{
lines[i + 3] = (byte)255; lines[i + 3] = (byte)255;
} }
buffer.end(); buffer.end();
Pixmap fullPixmap = new Pixmap(w, h, Pixmap.Format.RGBA8888); Pixmap fullPixmap = new Pixmap(w, h, Pixmap.Format.rgba8888);
Buffers.copy(lines, 0, fullPixmap.getPixels(), lines.length); Buffers.copy(lines, 0, fullPixmap.getPixels(), lines.length);
Fi file = screenshotDirectory.child("screenshot-" + Time.millis() + ".png"); Fi file = screenshotDirectory.child("screenshot-" + Time.millis() + ".png");
PixmapIO.writePNG(file, fullPixmap); PixmapIO.writePNG(file, fullPixmap);

5
core/src/mindustry/editor/MapGenerateDialog.java
View File

@ -1,15 +1,14 @@
package mindustry.editor; package mindustry.editor;
import arc.*; import arc.*;
import arc.struct.*;
import arc.func.*; import arc.func.*;
import arc.graphics.*; import arc.graphics.*;
import arc.graphics.Pixmap.*;
import arc.math.*; import arc.math.*;
import arc.math.geom.*; import arc.math.geom.*;
import arc.scene.ui.*; import arc.scene.ui.*;
import arc.scene.ui.ImageButton.*; import arc.scene.ui.ImageButton.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*; import arc.util.*;
import arc.util.async.*; import arc.util.async.*;
import mindustry.game.*; import mindustry.game.*;
@ -158,7 +157,7 @@ public class MapGenerateDialog extends BaseDialog{
texture = null; texture = null;
} }
pixmap = new Pixmap(editor.width() / scaling, editor.height() / scaling, Format.RGBA8888); pixmap = new Pixmap(editor.width() / scaling, editor.height() / scaling);
texture = new Texture(pixmap); texture = new Texture(pixmap);
cont.clear(); cont.clear();

2
core/src/mindustry/graphics/LoadRenderer.java
View File

@ -35,7 +35,7 @@ public class LoadRenderer implements Disposable{
private Mesh mesh = MeshBuilder.buildHex(colorRed, 2, true, 1f); private Mesh mesh = MeshBuilder.buildHex(colorRed, 2, true, 1f);
private Camera3D cam = new Camera3D(); private Camera3D cam = new Camera3D();
private int lastLength = -1; private int lastLength = -1;
private FxProcessor fx = new FxProcessor(Format.RGBA8888, 2, 2, false, true); private FxProcessor fx = new FxProcessor(Format.rgba8888, 2, 2, false, true);
private WindowedMean renderTimes = new WindowedMean(20); private WindowedMean renderTimes = new WindowedMean(20);
private long lastFrameTime; private long lastFrameTime;

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

@ -66,7 +66,7 @@ public class MinimapRenderer implements Disposable{
texture.dispose(); texture.dispose();
} }
setZoom(4f); setZoom(4f);
pixmap = new Pixmap(world.width(), world.height(), Format.RGBA8888); pixmap = new Pixmap(world.width(), world.height(), Format.rgba8888);
texture = new Texture(pixmap); texture = new Texture(pixmap);
region = new TextureRegion(texture); region = new TextureRegion(texture);
} }

2
core/src/mindustry/graphics/MultiPacker.java
View File

@ -12,7 +12,7 @@ public class MultiPacker implements Disposable{
public MultiPacker(){ public MultiPacker(){
for(int i = 0; i < packers.length; i++){ for(int i = 0; i < packers.length; i++){
int pageSize = 2048; int pageSize = 2048;
packers[i] = new PixmapPacker(pageSize, pageSize, Format.RGBA8888, 2, true); packers[i] = new PixmapPacker(pageSize, pageSize, Format.rgba8888, 2, true);
} }
} }

6
core/src/mindustry/io/MapIO.java
View File

@ -72,8 +72,8 @@ public class MapIO{
SaveVersion ver = SaveIO.getSaveWriter(version); SaveVersion ver = SaveIO.getSaveWriter(version);
ver.region("meta", stream, counter, ver::readStringMap); ver.region("meta", stream, counter, ver::readStringMap);
Pixmap floors = new Pixmap(map.width, map.height, Format.RGBA8888); Pixmap floors = new Pixmap(map.width, map.height);
Pixmap walls = new Pixmap(map.width, map.height, Format.RGBA8888); Pixmap walls = new Pixmap(map.width, map.height);
int black = 255; int black = 255;
int shade = Color.rgba8888(0f, 0f, 0f, 0.5f); int shade = Color.rgba8888(0f, 0f, 0f, 0.5f);
CachedTile tile = new CachedTile(){ CachedTile tile = new CachedTile(){
@ -137,7 +137,7 @@ public class MapIO{
} }
public static Pixmap generatePreview(Tiles tiles){ public static Pixmap generatePreview(Tiles tiles){
Pixmap pixmap = new Pixmap(tiles.width, tiles.height, Format.RGBA8888); Pixmap pixmap = new Pixmap(tiles.width, tiles.height, Format.rgba8888);
for(int x = 0; x < pixmap.getWidth(); x++){ for(int x = 0; x < pixmap.getWidth(); x++){
for(int y = 0; y < pixmap.getHeight(); y++){ for(int y = 0; y < pixmap.getHeight(); y++){
Tile tile = tiles.getn(x, y); Tile tile = tiles.getn(x, y);

2
core/src/mindustry/ui/Fonts.java
View File

@ -110,7 +110,7 @@ public class Fonts{
/** Called from a static context for use in the loading screen.*/ /** Called from a static context for use in the loading screen.*/
public static void loadDefaultFont(){ public static void loadDefaultFont(){
UI.packer = new PixmapPacker(2048, 2048, Format.RGBA8888, 2, true); UI.packer = new PixmapPacker(2048, 2048, Format.rgba8888, 2, true);
FileHandleResolver resolver = new InternalFileHandleResolver(); FileHandleResolver resolver = new InternalFileHandleResolver();
Core.assets.setLoader(FreeTypeFontGenerator.class, new FreeTypeFontGeneratorLoader(resolver)); Core.assets.setLoader(FreeTypeFontGenerator.class, new FreeTypeFontGeneratorLoader(resolver));
Core.assets.setLoader(BitmapFont.class, null, new FreetypeFontLoader(resolver){ Core.assets.setLoader(BitmapFont.class, null, new FreetypeFontLoader(resolver){

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=f3f3e00f8b13a7fd63286302a083a23163057465 archash=23b2fc721fa7ebb52e2edb0ce72b87731050e76e