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

Introduce off heap garbage collector

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2021-02-01 12:38:11 +01:00
parent 71a1e47d24
commit b6439e010a
25 changed files with 103 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
engine/src/main/java/com/bartlomiejpluta/base/core/engine/DefaultGameEngine.java
View File

@@ -1,5 +1,6 @@
package com.bartlomiejpluta.base.core.engine;
import com.bartlomiejpluta.base.core.gc.OffHeapGarbageCollector;
import com.bartlomiejpluta.base.core.logic.GameLogic;
import com.bartlomiejpluta.base.core.thread.ThreadManager;
import com.bartlomiejpluta.base.core.time.ChronoMeter;
@@ -18,6 +19,7 @@ public class DefaultGameEngine implements GameEngine {
private final WindowManager windowManager;
private final ThreadManager threadManager;
private final GameLogic logic;
private final OffHeapGarbageCollector garbageCollector;
private final Thread thread;
private final Window window;
@@ -30,6 +32,7 @@ public class DefaultGameEngine implements GameEngine {
public DefaultGameEngine(WindowManager windowManager,
ThreadManager threadManager,
GameLogic logic,
OffHeapGarbageCollector garbageCollector,
@Value("${app.window.title}") String title,
@Value("${app.window.width}") int width,
@Value("${app.window.height}") int height,
@@ -37,6 +40,7 @@ public class DefaultGameEngine implements GameEngine {
this.windowManager = windowManager;
this.threadManager = threadManager;
this.logic = logic;
this.garbageCollector = garbageCollector;
this.window = windowManager.createWindow(title, width, height);
this.thread = threadManager.createThread(THREAD_NAME, this::run);
@@ -96,7 +100,8 @@ public class DefaultGameEngine implements GameEngine {
}
private void cleanUp() {
logic.cleanUp();
log.info("Performing off heap garbage collection");
garbageCollector.cleanUp();
}
@Override

5
engine/src/main/java/com/bartlomiejpluta/base/core/gc/Cleanable.java Executable file
View File

@@ -0,0 +1,5 @@
package com.bartlomiejpluta.base.core.gc;
public interface Cleanable {
void cleanUp();
}

22
engine/src/main/java/com/bartlomiejpluta/base/core/gc/DefaultOffHeapGarbageCollector.java Executable file
View File

@@ -0,0 +1,22 @@
package com.bartlomiejpluta.base.core.gc;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
@Slf4j
@Component
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
public class DefaultOffHeapGarbageCollector implements OffHeapGarbageCollector {
private final List<Cleanable> cleanables;
@Override
public void cleanUp() {
cleanables.stream()
.peek(cleanable -> log.info("Performing {} cleaning", cleanable.getClass().getSimpleName()))
.forEach(Cleanable::cleanUp);
}
}

5
engine/src/main/java/com/bartlomiejpluta/base/core/gc/Disposable.java Executable file
View File

@@ -0,0 +1,5 @@
package com.bartlomiejpluta.base.core.gc;
public interface Disposable {
void dispose();
}

5
engine/src/main/java/com/bartlomiejpluta/base/core/gc/OffHeapGarbageCollector.java Executable file
View File

@@ -0,0 +1,5 @@
package com.bartlomiejpluta.base.core.gc;
public interface OffHeapGarbageCollector {
void cleanUp();
}

5
engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/mesh/Mesh.java
View File

@@ -1,5 +1,6 @@
package com.bartlomiejpluta.base.core.gl.object.mesh;
import com.bartlomiejpluta.base.core.gc.Disposable;
import com.bartlomiejpluta.base.core.gl.render.Renderable;
import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager;
import com.bartlomiejpluta.base.core.ui.Window;
@@ -13,7 +14,7 @@ import static org.lwjgl.opengl.GL15.*;
import static org.lwjgl.opengl.GL20.*;
import static org.lwjgl.opengl.GL30.*;
public class Mesh implements Renderable {
public class Mesh implements Renderable, Disposable {
private final int vaoId;
private final List<Integer> vboIds = new ArrayList<>(2);
private final int elementsCount;
@@ -65,7 +66,7 @@ public class Mesh implements Renderable {
}
@Override
public void cleanUp() {
public void dispose() {
glDisableVertexAttribArray(0);
glBindBuffer(GL_ARRAY_BUFFER, 0);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);

7
engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/DefaultTextureManager.java
View File

@@ -29,4 +29,11 @@ public class DefaultTextureManager implements TextureManager {
return texture;
}
@Override
public void cleanUp() {
log.info("Disposing textures");
loadedTextures.forEach((name, texture) -> texture.dispose());
log.info("{} textures has been disposed", loadedTextures.size());
}
}

8
engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/Texture.java
View File

@@ -1,6 +1,7 @@
package com.bartlomiejpluta.base.core.gl.object.texture;
import com.bartlomiejpluta.base.core.error.AppException;
import com.bartlomiejpluta.base.core.gc.Disposable;
import lombok.Getter;
import org.lwjgl.system.MemoryStack;
@@ -12,7 +13,7 @@ import static org.lwjgl.opengl.GL13.glActiveTexture;
import static org.lwjgl.stb.STBImage.stbi_failure_reason;
import static org.lwjgl.stb.STBImage.stbi_load_from_memory;
public class Texture {
public class Texture implements Disposable {
private static final int DESIRED_CHANNELS = 4;
private final int textureId;
@@ -57,4 +58,9 @@ public class Texture {
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, textureId);
}
@Override
public void dispose() {
glDeleteTextures(textureId);
}
}

4
engine/src/main/java/com/bartlomiejpluta/base/core/gl/object/texture/TextureManager.java
View File

@@ -1,5 +1,7 @@
package com.bartlomiejpluta.base.core.gl.object.texture;
public interface TextureManager {
import com.bartlomiejpluta.base.core.gc.Cleanable;
public interface TextureManager extends Cleanable {
Texture loadTexture(String textureFileName);
}

2
engine/src/main/java/com/bartlomiejpluta/base/core/gl/render/DefaultRenderer.java
View File

@@ -57,6 +57,6 @@ public class DefaultRenderer implements Renderer {
@Override
public void cleanUp() {
shaderManager.cleanUp();
log.info("There is nothing to clean up here");
}
}

1
engine/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderable.java
View File

@@ -5,5 +5,4 @@ import com.bartlomiejpluta.base.core.ui.Window;
public interface Renderable {
void render(Window window, ShaderManager shaderManager);
void cleanUp();
}

6
engine/src/main/java/com/bartlomiejpluta/base/core/gl/render/Renderer.java
View File

@@ -1,11 +1,9 @@
package com.bartlomiejpluta.base.core.gl.render;
import com.bartlomiejpluta.base.core.gc.Cleanable;
import com.bartlomiejpluta.base.core.ui.Window;
public interface Renderer {
public interface Renderer extends Cleanable {
void init();
void render(Window window, Renderable renderable);
void cleanUp();
}

5
engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/DefaultShaderManager.java
View File

@@ -142,7 +142,8 @@ public class DefaultShaderManager implements ShaderManager {
@Override
public void cleanUp() {
log.info("Cleaning up shaders");
shaders.forEach((name, program) -> program.cleanUp());
log.info("Disposing shaders");
shaders.forEach((name, program) -> program.dispose());
log.info("{} shaders has been disposed", shaders.size());
}
}

5
engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/manager/ShaderManager.java
View File

@@ -1,9 +1,10 @@
package com.bartlomiejpluta.base.core.gl.shader.manager;
import com.bartlomiejpluta.base.core.gc.Cleanable;
import com.bartlomiejpluta.base.core.gl.shader.uniform.Uniform;
import org.joml.*;
public interface ShaderManager {
public interface ShaderManager extends Cleanable {
ShaderManager createShader(String programName, String vertexShaderFilename, String fragmentShaderFilename);
ShaderManager selectShader(String programName);
@@ -41,6 +42,4 @@ public interface ShaderManager {
ShaderManager setUniform(String uniformName, int index, Uniform uniform);
ShaderManager setUniforms(String uniformName, Uniform[] uniforms);
void cleanUp();
}

6
engine/src/main/java/com/bartlomiejpluta/base/core/gl/shader/program/ShaderProgram.java
View File

@@ -1,6 +1,7 @@
package com.bartlomiejpluta.base.core.gl.shader.program;
import com.bartlomiejpluta.base.core.error.AppException;
import com.bartlomiejpluta.base.core.gc.Disposable;
import com.bartlomiejpluta.base.core.gl.shader.uniform.Uniform;
import lombok.extern.slf4j.Slf4j;
import org.joml.*;
@@ -13,7 +14,7 @@ import static java.lang.String.format;
import static org.lwjgl.opengl.GL20.*;
@Slf4j
public class ShaderProgram {
public class ShaderProgram implements Disposable {
private final int programId;
private final int vertexShaderId;
private final int fragmentShaderId;
@@ -159,7 +160,8 @@ public class ShaderProgram {
glUseProgram(0);
}
public void cleanUp() {
@Override
public void dispose() {
glUseProgram(0);
if(programId != 0) {

5
engine/src/main/java/com/bartlomiejpluta/base/core/logic/GameLogic.java
View File

@@ -1,8 +1,9 @@
package com.bartlomiejpluta.base.core.logic;
import com.bartlomiejpluta.base.core.gc.Cleanable;
import com.bartlomiejpluta.base.core.ui.Window;
public interface GameLogic {
public interface GameLogic extends Cleanable {
void init(Window window);
void input(Window window);
@@ -10,6 +11,4 @@ public interface GameLogic {
void update(float dt);
void render(Window window);
void cleanUp();
}

7
engine/src/main/java/com/bartlomiejpluta/base/core/util/mesh/DefaultMeshManager.java
View File

@@ -28,6 +28,13 @@ public class DefaultMeshManager implements MeshManager {
return mesh;
}
@Override
public void cleanUp() {
log.info("Disposing meshes");
quads.forEach((dim, mesh) -> mesh.dispose());
log.info("{} meshes has been disposed", quads.size());
}
@Data
private static class QuadDimension {
private final Vector2f size;

3
engine/src/main/java/com/bartlomiejpluta/base/core/util/mesh/MeshManager.java
View File

@@ -1,7 +1,8 @@
package com.bartlomiejpluta.base.core.util.mesh;
import com.bartlomiejpluta.base.core.gc.Cleanable;
import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh;
public interface MeshManager {
public interface MeshManager extends Cleanable {
Mesh createQuad(float width, float height, float originX, float originY);
}

7
engine/src/main/java/com/bartlomiejpluta/base/core/world/map/GameMap.java
View File

@@ -5,14 +5,11 @@ import com.bartlomiejpluta.base.core.world.movement.Movement;
import com.bartlomiejpluta.base.core.world.tileset.model.Tile;
import com.bartlomiejpluta.base.core.world.tileset.model.TileSet;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.joml.Vector2f;
import org.joml.Vector2i;
import java.util.Arrays;
import java.util.Objects;
@Slf4j
public class GameMap {
private static final int LAYERS = 4;
private final TileSet tileSet;
@@ -92,8 +89,4 @@ public class GameMap {
return isTargetReachable && canMoveFromCurrentTile;
}
public void cleanUp() {
Arrays.stream(map).flatMap(Arrays::stream).filter(Objects::nonNull).forEach(Tile::cleanUp);
}
}

5
engine/src/main/java/com/bartlomiejpluta/base/core/world/object/RenderableObject.java
View File

@@ -25,11 +25,6 @@ public abstract class RenderableObject extends Object implements Renderable {
mesh.render(window, shaderManager);
}
@Override
public void cleanUp() {
mesh.cleanUp();
}
public void setAlpha(float alpha) {
material.setAlpha(alpha);
}

7
engine/src/main/java/com/bartlomiejpluta/base/core/world/scene/Scene.java
View File

@@ -7,8 +7,8 @@ import com.bartlomiejpluta.base.core.ui.Window;
import com.bartlomiejpluta.base.core.world.animation.AnimationableObject;
import com.bartlomiejpluta.base.core.world.animation.Animator;
import com.bartlomiejpluta.base.core.world.camera.Camera;
import com.bartlomiejpluta.base.core.world.object.RenderableObject;
import com.bartlomiejpluta.base.core.world.map.GameMap;
import com.bartlomiejpluta.base.core.world.object.RenderableObject;
import lombok.AllArgsConstructor;
import lombok.Setter;
@@ -71,9 +71,4 @@ public class Scene implements Renderable {
object.render(window, shaderManager);
}
@Override
public void cleanUp() {
map.cleanUp();
}
}

5
engine/src/main/java/com/bartlomiejpluta/base/core/world/tileset/manager/DefaultTileSetManager.java
View File

@@ -34,4 +34,9 @@ public class DefaultTileSetManager implements TileSetManager {
return tileset;
}
@Override
public void cleanUp() {
log.info("There is nothing to clean up here");
}
}

3
engine/src/main/java/com/bartlomiejpluta/base/core/world/tileset/manager/TileSetManager.java
View File

@@ -1,7 +1,8 @@
package com.bartlomiejpluta.base.core.world.tileset.manager;
import com.bartlomiejpluta.base.core.gc.Cleanable;
import com.bartlomiejpluta.base.core.world.tileset.model.TileSet;
public interface TileSetManager {
public interface TileSetManager extends Cleanable {
TileSet createTileSet(String tileSetFileName, int rows, int columns);
}

7
game/src/main/java/com/bartlomiejpluta/base/game/world/entity/manager/DefaultEntityManager.java
View File

@@ -6,10 +6,12 @@ import com.bartlomiejpluta.base.core.util.mesh.MeshManager;
import com.bartlomiejpluta.base.game.world.entity.model.Entity;
import com.bartlomiejpluta.base.game.world.entity.config.EntitySpriteConfiguration;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.joml.Vector2f;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Slf4j
@Component
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
public class DefaultEntityManager implements EntityManager {
@@ -28,4 +30,9 @@ public class DefaultEntityManager implements EntityManager {
var spriteHeight = texture.getHeight() / (float) dimension.x;
return meshManager.createQuad(spriteWidth, spriteHeight, spriteWidth / 2, spriteHeight*0.9f);
}
@Override
public void cleanUp() {
log.info("There is nothing to clean up");
}
}

3
game/src/main/java/com/bartlomiejpluta/base/game/world/entity/manager/EntityManager.java
View File

@@ -1,9 +1,10 @@
package com.bartlomiejpluta.base.game.world.entity.manager;
import com.bartlomiejpluta.base.core.gc.Cleanable;
import com.bartlomiejpluta.base.core.gl.object.material.Material;
import com.bartlomiejpluta.base.game.world.entity.model.Entity;
import org.joml.Vector2f;
public interface EntityManager {
public interface EntityManager extends Cleanable {
Entity createEntity(Material material, Vector2f coordinateStepSize);
}