Removed unnecessary dispose()

This commit is contained in:
Anuken
2021-03-18 16:14:53 -04:00
parent a06e0a325b
commit 9384d661c1
8 changed files with 2 additions and 62 deletions

View File

@@ -117,7 +117,6 @@ public class AssetsProcess extends BaseProcessor{
void processSounds(String classname, String path, String rtype) throws Exception{ void processSounds(String classname, String path, String rtype) throws Exception{
TypeSpec.Builder type = TypeSpec.classBuilder(classname).addModifiers(Modifier.PUBLIC); TypeSpec.Builder type = TypeSpec.classBuilder(classname).addModifiers(Modifier.PUBLIC);
MethodSpec.Builder dispose = MethodSpec.methodBuilder("dispose").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
MethodSpec.Builder loadBegin = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC); MethodSpec.Builder loadBegin = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
HashSet<String> names = new HashSet<>(); HashSet<String> names = new HashSet<>();
@@ -137,8 +136,6 @@ public class AssetsProcess extends BaseProcessor{
String filename = "\"" + filepath + "\""; String filename = "\"" + filepath + "\"";
loadBegin.addStatement("arc.Core.assets.load(" + filename + ", " + rtype + ".class).loaded = a -> " + name + " = (" + rtype + ")a", filepath, filepath.replace(".ogg", ".mp3")); loadBegin.addStatement("arc.Core.assets.load(" + filename + ", " + rtype + ".class).loaded = a -> " + name + " = (" + rtype + ")a", filepath, filepath.replace(".ogg", ".mp3"));
dispose.addStatement("arc.Core.assets.unload(" + filename + ")");
dispose.addStatement(name + " = null");
type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.audio." + rtype.substring(rtype.lastIndexOf(".") + 1) + "()").build()); type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.audio." + rtype.substring(rtype.lastIndexOf(".") + 1) + "()").build());
}); });
@@ -147,7 +144,6 @@ public class AssetsProcess extends BaseProcessor{
} }
type.addMethod(loadBegin.build()); type.addMethod(loadBegin.build());
type.addMethod(dispose.build());
JavaFile.builder(packageName, type.build()).build().writeTo(BaseProcessor.filer); JavaFile.builder(packageName, type.build()).build().writeTo(BaseProcessor.filer);
} }

View File

@@ -431,11 +431,7 @@ public class Control implements ApplicationListener, Loadable{
music.stop(); music.stop();
} }
content.dispose();
net.dispose(); net.dispose();
Musics.dispose();
Sounds.dispose();
if(ui != null && ui.editor != null) ui.editor.dispose();
} }
@Override @Override

View File

@@ -115,17 +115,6 @@ public class Renderer implements ApplicationListener{
@Override @Override
public void dispose(){ public void dispose(){
minimap.dispose();
effectBuffer.dispose();
blocks.dispose();
if(planets != null){
planets.dispose();
planets = null;
}
if(bloom != null){
bloom.dispose();
bloom = null;
}
Events.fire(new DisposeEvent()); Events.fire(new DisposeEvent());
} }

View File

@@ -63,15 +63,6 @@ public class Schematics implements Loadable{
private long lastClearTime; private long lastClearTime;
public Schematics(){ public Schematics(){
Events.on(DisposeEvent.class, e -> {
previews.each((schem, m) -> m.dispose());
previews.clear();
shadowBuffer.dispose();
if(errorTexture != null){
errorTexture.dispose();
errorTexture = null;
}
});
Events.on(ClientLoadEvent.class, event -> { Events.on(ClientLoadEvent.class, event -> {
errorTexture = new Texture("sprites/error.png"); errorTexture = new Texture("sprites/error.png");

View File

@@ -19,7 +19,7 @@ import mindustry.world.blocks.power.*;
import static arc.Core.*; import static arc.Core.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class BlockRenderer implements Disposable{ public class BlockRenderer{
public static final int crackRegions = 8, maxCrackSize = 9; public static final int crackRegions = 8, maxCrackSize = 9;
private static final int initialRequests = 32 * 32; private static final int initialRequests = 32 * 32;
@@ -300,11 +300,4 @@ public class BlockRenderer implements Disposable{
} }
@Override
public void dispose(){
shadows.dispose();
dark.dispose();
shadows = dark = null;
floor.dispose();
}
} }

View File

@@ -19,7 +19,7 @@ import mindustry.world.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class MinimapRenderer implements Disposable{ public class MinimapRenderer{
private static final float baseSize = 16f; private static final float baseSize = 16f;
private final Seq<Unit> units = new Seq<>(); private final Seq<Unit> units = new Seq<>();
private Pixmap pixmap; private Pixmap pixmap;
@@ -170,16 +170,6 @@ public class MinimapRenderer implements Disposable{
return color.rgba(); return color.rgba();
} }
@Override
public void dispose(){
if(pixmap != null && texture != null){
pixmap.dispose();
texture.dispose();
texture = null;
pixmap = null;
}
}
public void drawLabel(float x, float y, String text, Color color){ public void drawLabel(float x, float y, String text, Color color){
Font font = Fonts.outline; Font font = Fonts.outline;
GlyphLayout l = Pools.obtain(GlyphLayout.class, GlyphLayout::new); GlyphLayout l = Pools.obtain(GlyphLayout.class, GlyphLayout::new);

View File

@@ -48,15 +48,6 @@ public class ModsDialog extends BaseDialog{
super("@mods"); super("@mods");
addCloseButton(); addCloseButton();
Events.on(DisposeEvent.class, e -> {
textureCache.each((key, val) -> {
if(val.texture.width == val.width){
val.texture.dispose();
}
});
textureCache.clear();
});
browser = new BaseDialog("@mods.browser"); browser = new BaseDialog("@mods.browser");
browser.cont.table(table -> { browser.cont.table(table -> {

View File

@@ -24,12 +24,6 @@ public class MenuFragment extends Fragment{
private Button currentMenu; private Button currentMenu;
private MenuRenderer renderer; private MenuRenderer renderer;
public MenuFragment(){
Events.on(DisposeEvent.class, event -> {
renderer.dispose();
});
}
@Override @Override
public void build(Group parent){ public void build(Group parent){
renderer = new MenuRenderer(); renderer = new MenuRenderer();