cleanUp -> finalize

src/main/java/eu/tankernn/gameEngine/TankernnGame.java

@@ -29,9 +29,9 @@ public class TankernnGame {
 	}
 	
 	public void cleanUp() {
-		textMaster.cleanUp();
-		guiMaster.cleanUp();
-		loader.cleanUp();
+		textMaster.finalize();
+		guiMaster.finalize();
+		loader.finalize();
 	}
 	
 	public String getName() {

src/main/java/eu/tankernn/gameEngine/TankernnGame3D.java

@@ -107,13 +107,13 @@ public class TankernnGame3D extends TankernnGame {
 
 	public void cleanUp() {
 		super.cleanUp();
-		terrainPack.cleanUp();
-		particleMaster.cleanUp();
-		postProcessor.cleanUp();
-		waterMaster.cleanUp();
-		multisampleFbo.cleanUp();
-		outputFbo.cleanUp();
-		outputFbo2.cleanUp();
-		renderer.cleanUp();
+		terrainPack.finalize();
+		particleMaster.finalize();
+		postProcessor.finalize();
+		waterMaster.finalize();
+		multisampleFbo.finalize();
+		outputFbo.finalize();
+		outputFbo2.finalize();
+		renderer.finalize();
 	}
 }

src/main/java/eu/tankernn/gameEngine/animation/model/AnimatedModel.java

@@ -81,7 +81,7 @@ public class AnimatedModel extends TexturedModel {
 	 * (VAO) and texture.
 	 */
 	public void delete() {
-		getModel().delete();
+		getModel().finalize();
 		getTexture().delete();
 	}
 

src/main/java/eu/tankernn/gameEngine/loader/Loader.java

@@ -139,11 +139,12 @@ public class Loader {
 		return new float[] {-size, size, size, size, size, size, size, -size, size, -size, -size, size, -size, size, -size, size, size, -size, size, -size, -size, -size, -size, -size};
 	}
 	
-	public void cleanUp() {
+	@Override
+	public void finalize() {
 		for (Texture tex: textures)
 			tex.delete();
 		for (Vao model: vaos)
-			model.delete();
+			model.finalize();
 	}
 	
 	public Vao loadOBJ(InternalFile objFile) {

src/main/java/eu/tankernn/gameEngine/particles/ParticleMaster.java

@@ -17,18 +17,18 @@ public class ParticleMaster {
 	private Map<ParticleTexture, List<Particle>> particles = new HashMap<ParticleTexture, List<Particle>>();
 	private List<ParticleSystem> systems = new ArrayList<ParticleSystem>();
 	private ParticleRenderer renderer;
-
+	
 	public ParticleMaster(Loader loader, Matrix4f projectionMatrix) {
 		renderer = new ParticleRenderer(loader, projectionMatrix);
 	}
-
+	
 	public void update(Camera camera) {
-		for (ParticleSystem sys : systems) {
-			for (Particle particle : sys.generateParticles()) {
+		for (ParticleSystem sys: systems) {
+			for (Particle particle: sys.generateParticles()) {
 				addParticle(particle);
 			}
 		}
-
+		
 		Iterator<Entry<ParticleTexture, List<Particle>>> mapIterator = particles.entrySet().iterator();
 		while (mapIterator.hasNext()) {
 			Entry<ParticleTexture, List<Particle>> entry = mapIterator.next();
@@ -50,15 +50,16 @@ public class ParticleMaster {
 		
 		systems.removeIf(ParticleSystem::isDead);
 	}
-
+	
 	public void renderParticles(Camera camera) {
 		renderer.render(particles, camera);
 	}
-
-	public void cleanUp() {
-		renderer.cleanUp();
+	
+	@Override
+	public void finalize() {
+		renderer.finalize();
 	}
-
+	
 	public void addParticle(Particle particle) {
 		List<Particle> list = particles.get(particle.getTexture());
 		if (list == null) {
@@ -67,7 +68,7 @@ public class ParticleMaster {
 		}
 		list.add(particle);
 	}
-
+	
 	public void addSystem(ParticleSystem system) {
 		this.systems.add(system);
 	}

src/main/java/eu/tankernn/gameEngine/particles/ParticleRenderer.java

@@ -62,8 +62,9 @@ public class ParticleRenderer {
 		finishRendering();
 	}
 	
-	protected void cleanUp() {
-		shader.cleanUp();
+	@Override
+	protected void finalize() {
+		shader.finalize();
 	}
 	
 	private void updateTexCoordInfo(Particle particle, float[] data) {

src/main/java/eu/tankernn/gameEngine/postProcessing/ImageRenderer.java

@@ -36,10 +36,11 @@ public class ImageRenderer {
 	public Texture getOutputTexture() {
 		return fbo.getColourTexture();
 	}
-
-	public void cleanUp() {
+	
+	@Override
+	public void finalize() {
 		if (fbo != null) {
-			fbo.cleanUp();
+			fbo.finalize();
 		}
 	}
 

src/main/java/eu/tankernn/gameEngine/postProcessing/PostProcessingEffect.java

@@ -14,9 +14,10 @@ public abstract class PostProcessingEffect<S extends ShaderProgram> {
 	
 	public abstract void render(Texture colorTexture, Texture brightTexture);
 	
-	public void cleanUp() {
-		renderer.cleanUp();
-		shader.cleanUp();
+	@Override
+	public void finalize() {
+		renderer.finalize();
+		shader.finalize();
 	}
 	
 	public Texture getOutputColorTexture() {

src/main/java/eu/tankernn/gameEngine/postProcessing/PostProcessor.java

@@ -50,9 +50,10 @@ public class PostProcessor {
 		end();
 	}
 	
-	public void cleanUp() {
-		effects.forEach(p -> p.cleanUp());
-		combineFilter.cleanUp();
+	@Override
+	public void finalize() {
+		effects.forEach(p -> p.finalize());
+		combineFilter.finalize();
 	}
 	
 	private void start() {

src/main/java/eu/tankernn/gameEngine/postProcessing/bloom/CombineFilter.java

@@ -24,9 +24,10 @@ public class CombineFilter {
 		shader.stop();
 	}
 	
-	public void cleanUp(){
-		renderer.cleanUp();
-		shader.cleanUp();
+	@Override
+	public void finalize(){
+		renderer.finalize();
+		shader.finalize();
 	}
 
 }

src/main/java/eu/tankernn/gameEngine/renderEngine/Fbo.java

@@ -47,7 +47,8 @@ public class Fbo {
 	/**
 	 * Deletes the frame buffer and its attachments when the game closes.
 	 */
-	public void cleanUp() {
+	@Override
+	public void finalize() {
 		GL30.glDeleteFramebuffers(frameBuffer);
 		if (colourTexture != null)
 			colourTexture.delete();

src/main/java/eu/tankernn/gameEngine/renderEngine/MasterRenderer.java

@@ -175,10 +175,11 @@ public class MasterRenderer {
 	/**
 	 * Runs the cleanup method for the other renderers.
 	 */
-	public void cleanUp() {
-		entityRenderer.cleanUp();
-		terrainRenderer.cleanUp();
-		shadowMapRenderer.cleanUp();
+	@Override
+	public void finalize() {
+		entityRenderer.finalize();
+		terrainRenderer.finalize();
+		shadowMapRenderer.finalize();
 	}
 
 	/**

src/main/java/eu/tankernn/gameEngine/renderEngine/MultisampleMultitargetFbo.java

@@ -84,8 +84,8 @@ public class MultisampleMultitargetFbo extends Fbo {
 	};
 	
 	@Override
-	public void cleanUp() {
-		super.cleanUp();
+	public void finalize() {
+		super.finalize();
 		GL30.glDeleteRenderbuffers(colorBuffer);
 		GL30.glDeleteRenderbuffers(colorBuffer2);
 	}

src/main/java/eu/tankernn/gameEngine/renderEngine/Vao.java

@@ -98,7 +98,8 @@ public class Vao {
 		dataVbos.add(dataVbo);
 	}
 	
-	public void delete() {
+	@Override
+	public void finalize() {
 		GL30.glDeleteVertexArrays(id);
 		for (Vbo vbo: dataVbos) {
 			vbo.delete();

src/main/java/eu/tankernn/gameEngine/renderEngine/entities/EntityRenderer.java

@@ -83,8 +83,8 @@ public class EntityRenderer<S extends EntityShader> {
 		shader.stop();
 	}
 	
-	public void cleanUp() {
-		shader.cleanUp();
+	public void finalize() {
+		shader.finalize();
 	}
 	
 	private void prepareTexturedModel(TexturedModel model, Texture environmentMap) {

src/main/java/eu/tankernn/gameEngine/renderEngine/font/FontRenderer.java

@@ -27,8 +27,8 @@ public class FontRenderer {
 		endRendering();
 	}
 	
-	public void cleanUp() {
-		shader.cleanUp();
+	public void finalilze() {
+		shader.finalize();
 	}
 	
 	private void prepare() {

src/main/java/eu/tankernn/gameEngine/renderEngine/font/TextMaster.java

@@ -57,7 +57,7 @@ public class TextMaster {
 		}
 	}
 
-	public void cleanUp() {
-		renderer.cleanUp();
+	public void finalize() {
+		renderer.finalilze();
 	}
 }

src/main/java/eu/tankernn/gameEngine/renderEngine/gui/GuiMaster.java

@@ -29,7 +29,7 @@ public class GuiMaster {
 		return guis;
 	}
 
-	public void cleanUp() {
-		renderer.cleanUp();
+	public void finalize() {
+		renderer.finalize();
 	}
 }

src/main/java/eu/tankernn/gameEngine/renderEngine/gui/GuiRenderer.java

@@ -38,7 +38,7 @@ public class GuiRenderer {
 		shader.stop();
 	}
 	
-	public void cleanUp() {
-		shader.cleanUp();
+	public void finalize() {
+		shader.finalize();
 	}
 }

src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/ShaderProgram.java

@@ -92,7 +92,7 @@ public class ShaderProgram {
 		GL20.glUseProgram(0);
 	}
 
-	public void cleanUp() {
+	public void finalize() {
 		stop();
 		GL20.glDeleteProgram(programID);
 	}

src/main/java/eu/tankernn/gameEngine/renderEngine/shadows/ShadowFrameBuffer.java

@@ -39,7 +39,7 @@ public class ShadowFrameBuffer {
 	/**
 	 * Deletes the frame buffer and shadow map texture when the game closes.
 	 */
-	protected void cleanUp() {
+	protected void finalize() {
 		GL30.glDeleteFramebuffers(fbo);
 		shadowMap.delete();
 	}

src/main/java/eu/tankernn/gameEngine/renderEngine/shadows/ShadowMapMasterRenderer.java

@@ -94,9 +94,9 @@ public class ShadowMapMasterRenderer {
 	/**
 	 * Clean up the shader and FBO on closing.
 	 */
-	public void cleanUp() {
-		shader.cleanUp();
-		shadowFbo.cleanUp();
+	public void finalize() {
+		shader.finalize();
+		shadowFbo.finalize();
 	}
 
 	/**

src/main/java/eu/tankernn/gameEngine/renderEngine/skybox/Skybox.java

@@ -28,7 +28,7 @@ public class Skybox {
 	}
 
 	public void delete() {
-		cube.delete();
+		cube.finalize();
 		dayTexture.delete();
 	}
 

src/main/java/eu/tankernn/gameEngine/renderEngine/terrain/TerrainRenderer.java

@@ -50,8 +50,8 @@ public class TerrainRenderer {
 		shader.stop();
 	}
 
-	public void cleanUp() {
-		shader.cleanUp();
+	public void finalize() {
+		shader.finalize();
 	}
 
 	private void prepareTerrain(Terrain terrain) {

src/main/java/eu/tankernn/gameEngine/renderEngine/water/WaterFrameBuffers.java

@@ -17,10 +17,11 @@ public class WaterFrameBuffers {
 		reflectionBuffer = new Fbo(REFLECTION_WIDTH, REFLECTION_HEIGHT, Fbo.DEPTH_RENDER_BUFFER);
 		refractionBuffer = new Fbo(REFRACTION_WIDTH, REFRACTION_HEIGHT, Fbo.DEPTH_TEXTURE);
 	}
-
-	public void cleanUp() {
-		reflectionBuffer.cleanUp();
-		refractionBuffer.cleanUp();
+	
+	@Override
+	public void finalize() {
+		reflectionBuffer.finalize();
+		refractionBuffer.finalize();
 	}
 
 	public Fbo getReflectionFbo() {

src/main/java/eu/tankernn/gameEngine/renderEngine/water/WaterMaster.java

@@ -73,9 +73,9 @@ public class WaterMaster {
 		waterRenderer.render(waterTiles, camera, lights);
 	}
 	
-	public void cleanUp() {
-		buffers.cleanUp();
-		waterShader.cleanUp();
+	public void finalize() {
+		buffers.finalize();
+		waterShader.finalize();
 	}
 
 	public WaterFrameBuffers getBuffers() {

src/main/java/eu/tankernn/gameEngine/terrains/Terrain.java

@@ -117,6 +117,6 @@ public class Terrain {
 	}
 	
 	public void delete() {
-		model.delete();
+		model.finalize();
 	}
 }

src/main/java/eu/tankernn/gameEngine/terrains/TerrainPack.java

@@ -135,8 +135,9 @@ public class TerrainPack {
 			lastZ = newZ;
 		}
 	}
-
-	public void cleanUp() {
+	
+	@Override
+	public void finalize() {
 		executor.shutdown();
 	}