bartek/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add support for disposing GUIs"

Browse Source 
This reverts commit 9bc79e940e.
This commit is contained in:
Bartłomiej Przemysław Pluta
2021-04-09 23:10:30 +02:00
parent 9bc79e940e
commit 1b9641862b
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/bartlomiejpluta/base/api/context/Context.java
View File

@@ -47,8 +47,6 @@ public interface Context extends Updatable, Renderable, Disposable {
GUI newGUI(); GUI newGUI();
void disposeGUI(GUI gui);
Sound createSound(String soundUid); Sound createSound(String soundUid);
void withDatabase(UncheckedConsumer<Connection, SQLException> consumer); void withDatabase(UncheckedConsumer<Connection, SQLException> consumer);

19
engine/src/main/java/com/bartlomiejpluta/base/engine/context/model/DefaultContext.java
View File

@@ -38,7 +38,6 @@ import lombok.extern.slf4j.Slf4j;
import java.sql.Connection; import java.sql.Connection;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
@@ -101,7 +100,7 @@ public class DefaultContext implements Context {
@Getter @Getter
private boolean paused; private boolean paused;
private final List<GUI> guis = new ArrayList<>(); private final List<GUI> guis = new LinkedList<>();
private final List<Sound> sounds = new LinkedList<>(); private final List<Sound> sounds = new LinkedList<>();
private final EventHandler eventHandler = new EventHandler(); private final EventHandler eventHandler = new EventHandler();
@@ -171,12 +170,6 @@ public class DefaultContext implements Context {
return gui; return gui;
} }
@Override
public void disposeGUI(GUI gui) {
guis.remove(gui);
gui.dispose();
}
@Override @Override
public Sound createSound(String soundUid) { public Sound createSound(String soundUid) {
return soundManager.loadObject(soundUid); return soundManager.loadObject(soundUid);
@@ -281,7 +274,6 @@ public class DefaultContext implements Context {
} }
} }
@SuppressWarnings("ForLoopReplaceableByForEach")
@Override @Override
public void update(float dt) { public void update(float dt) {
gameRunner.update(dt); gameRunner.update(dt);
@@ -296,8 +288,8 @@ public class DefaultContext implements Context {
} }
} }
for (int i = 0; i < guis.size(); ++i) { for (var gui : guis) {
guis.get(i).update(dt); gui.update(dt);
} }
for (var iterator = sounds.iterator(); iterator.hasNext(); ) { for (var iterator = sounds.iterator(); iterator.hasNext(); ) {
@@ -309,15 +301,14 @@ public class DefaultContext implements Context {
} }
} }
@SuppressWarnings("ForLoopReplaceableByForEach")
@Override @Override
public void render(Screen screen, Camera camera, ShaderManager shaderManager) { public void render(Screen screen, Camera camera, ShaderManager shaderManager) {
if (map != null) { if (map != null) {
map.render(screen, camera, shaderManager); map.render(screen, camera, shaderManager);
} }
for (int i = 0; i < guis.size(); ++i) { for (var gui : guis) {
guis.get(i).render(screen, camera, shaderManager); gui.render(screen, camera, shaderManager);
} }
if (mapHandler != null) { if (mapHandler != null) {