More refactoring

Separated loading and rendering of everything.

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

@@ -20,14 +20,11 @@ import eu.tankernn.gameEngine.entities.PlayerCamera;
 import eu.tankernn.gameEngine.environmentMap.EnvironmentMapRenderer;
 import eu.tankernn.gameEngine.font.meshCreator.FontType;
 import eu.tankernn.gameEngine.font.meshCreator.GUIText;
-import eu.tankernn.gameEngine.font.rendering.TextMaster;
-import eu.tankernn.gameEngine.gui.GuiRenderer;
-import eu.tankernn.gameEngine.gui.GuiTexture;
-import eu.tankernn.gameEngine.models.RawModel;
-import eu.tankernn.gameEngine.models.TexturedModel;
-import eu.tankernn.gameEngine.normalMapping.objConverter.NormalMappedObjLoader;
-import eu.tankernn.gameEngine.objLoader.ModelData;
-import eu.tankernn.gameEngine.objLoader.OBJFileLoader;
+import eu.tankernn.gameEngine.loader.models.RawModel;
+import eu.tankernn.gameEngine.loader.models.TexturedModel;
+import eu.tankernn.gameEngine.loader.obj.ModelData;
+import eu.tankernn.gameEngine.loader.obj.OBJFileLoader;
+import eu.tankernn.gameEngine.loader.obj.normalMapped.NormalMappedObjLoader;
 import eu.tankernn.gameEngine.particles.ParticleMaster;
 import eu.tankernn.gameEngine.particles.ParticleSystem;
 import eu.tankernn.gameEngine.particles.ParticleTexture;
@@ -38,6 +35,9 @@ import eu.tankernn.gameEngine.renderEngine.DisplayManager;
 import eu.tankernn.gameEngine.renderEngine.Loader;
 import eu.tankernn.gameEngine.renderEngine.MasterRenderer;
 import eu.tankernn.gameEngine.renderEngine.Scene;
+import eu.tankernn.gameEngine.renderEngine.font.TextMaster;
+import eu.tankernn.gameEngine.renderEngine.gui.GuiRenderer;
+import eu.tankernn.gameEngine.renderEngine.gui.GuiTexture;
 import eu.tankernn.gameEngine.renderEngine.skybox.Skybox;
 import eu.tankernn.gameEngine.renderEngine.water.WaterMaster;
 import eu.tankernn.gameEngine.renderEngine.water.WaterTile;
@@ -49,7 +49,7 @@ import eu.tankernn.gameEngine.textures.TerrainTexturePack;
 import eu.tankernn.gameEngine.textures.Texture;
 import eu.tankernn.gameEngine.util.DistanceSorter;
 import eu.tankernn.gameEngine.util.MousePicker;
-import eu.tankernn.gameEngine.util.MyFile;
+import eu.tankernn.gameEngine.util.InternalFile;
 
 public class MainLoop {
 
@@ -91,12 +91,12 @@ public class MainLoop {
 		entities.add(player);
 		Camera camera = new PlayerCamera(player, terrainPack);
 		
-		MyFile[] dayTextures = new MyFile[TEXTURE_FILES.length], nightTextures = new MyFile[NIGHT_TEXTURE_FILES.length];
+		InternalFile[] dayTextures = new InternalFile[TEXTURE_FILES.length], nightTextures = new InternalFile[NIGHT_TEXTURE_FILES.length];
 		
 		for (int i = 0; i < TEXTURE_FILES.length; i++)
-			dayTextures[i] = new MyFile("skybox/" + TEXTURE_FILES[i] + ".png");
+			dayTextures[i] = new InternalFile("skybox/" + TEXTURE_FILES[i] + ".png");
 		for (int i = 0; i < NIGHT_TEXTURE_FILES.length; i++)
-			nightTextures[i] = new MyFile("skybox/" + NIGHT_TEXTURE_FILES[i] + ".png");
+			nightTextures[i] = new InternalFile("skybox/" + NIGHT_TEXTURE_FILES[i] + ".png");
 		
 		Skybox skybox = new Skybox(Texture.newCubeMap(dayTextures, 500), Texture.newCubeMap(nightTextures, 500), 500);
 		

src/main/java/eu/tankernn/gameEngine/entities/Camera.java

@@ -9,6 +9,7 @@ import org.lwjgl.util.vector.Matrix4f;
 import org.lwjgl.util.vector.Vector3f;
 
 import eu.tankernn.gameEngine.util.ICamera;
+import eu.tankernn.gameEngine.util.IPositionable;
 import eu.tankernn.gameEngine.util.Maths;
 
 /**
@@ -16,7 +17,7 @@ import eu.tankernn.gameEngine.util.Maths;
  * 
  * @author Frans
  */
-public class Camera implements Positionable, ICamera {
+public class Camera implements IPositionable, ICamera {
 	
 	private Matrix4f projectionMatrix;
 	private Matrix4f viewMatrix = new Matrix4f();
@@ -40,7 +41,7 @@ public class Camera implements Positionable, ICamera {
 	 * 
 	 * @param entity The object to point towards
 	 */
-	public void pointToEntity(Positionable entity) {
+	public void pointToEntity(IPositionable entity) {
 		Vector3f targetPos = entity.getPosition();
 		Vector3f delta = new Vector3f();
 		Vector3f.sub(position, targetPos, delta);

src/main/java/eu/tankernn/gameEngine/entities/Car.java

@@ -3,7 +3,7 @@ package eu.tankernn.gameEngine.entities;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.util.vector.Vector3f;
 
-import eu.tankernn.gameEngine.models.TexturedModel;
+import eu.tankernn.gameEngine.loader.models.TexturedModel;
 import eu.tankernn.gameEngine.renderEngine.DisplayManager;
 import eu.tankernn.gameEngine.settings.Physics;
 import eu.tankernn.gameEngine.terrains.Terrain;

src/main/java/eu/tankernn/gameEngine/entities/Entity.java

@@ -2,10 +2,11 @@ package eu.tankernn.gameEngine.entities;
 
 import org.lwjgl.util.vector.Vector3f;
 
-import eu.tankernn.gameEngine.models.AABB;
-import eu.tankernn.gameEngine.models.TexturedModel;
+import eu.tankernn.gameEngine.loader.models.AABB;
+import eu.tankernn.gameEngine.loader.models.TexturedModel;
+import eu.tankernn.gameEngine.util.IPositionable;
 
-public class Entity implements Positionable {
+public class Entity implements IPositionable {
 	private static final Vector3f SIZE = new Vector3f(2, 4, 2);
 	
 	private TexturedModel model;

src/main/java/eu/tankernn/gameEngine/entities/Light.java

@@ -2,7 +2,9 @@ package eu.tankernn.gameEngine.entities;
 
 import org.lwjgl.util.vector.Vector3f;
 
-public class Light implements Positionable {
+import eu.tankernn.gameEngine.util.IPositionable;
+
+public class Light implements IPositionable {
 	private Vector3f position;
 	private Vector3f color;
 	private Vector3f attenuation = new Vector3f(1, 0, 0);

src/main/java/eu/tankernn/gameEngine/entities/Player.java

@@ -4,7 +4,7 @@ import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.util.vector.Vector3f;
 
-import eu.tankernn.gameEngine.models.TexturedModel;
+import eu.tankernn.gameEngine.loader.models.TexturedModel;
 import eu.tankernn.gameEngine.renderEngine.DisplayManager;
 import eu.tankernn.gameEngine.settings.Physics;
 import eu.tankernn.gameEngine.terrains.Terrain;

src/main/java/eu/tankernn/gameEngine/font/meshCreator/GUIText.java

@@ -3,7 +3,7 @@ package eu.tankernn.gameEngine.font.meshCreator;
 import org.lwjgl.util.vector.Vector2f;
 import org.lwjgl.util.vector.Vector3f;
 
-import eu.tankernn.gameEngine.font.rendering.TextMaster;
+import eu.tankernn.gameEngine.renderEngine.font.TextMaster;
 
 /**
  * Represents a piece of text in the game.

src/main/java/eu/tankernn/gameEngine/models/AABB.java → src/main/java/eu/tankernn/gameEngine/loader/models/AABB.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.models;
+package eu.tankernn.gameEngine.loader.models;
 
 import org.lwjgl.util.vector.Vector3f;
 

src/main/java/eu/tankernn/gameEngine/models/RawModel.java → src/main/java/eu/tankernn/gameEngine/loader/models/RawModel.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.models;
+package eu.tankernn.gameEngine.loader.models;
 
 public class RawModel {
 	

src/main/java/eu/tankernn/gameEngine/models/TexturedModel.java → src/main/java/eu/tankernn/gameEngine/loader/models/TexturedModel.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.models;
+package eu.tankernn.gameEngine.loader.models;
 
 import eu.tankernn.gameEngine.textures.ModelTexture;
 

src/main/java/eu/tankernn/gameEngine/objLoader/ModelData.java → src/main/java/eu/tankernn/gameEngine/loader/obj/ModelData.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.objLoader;
+package eu.tankernn.gameEngine.loader.obj;
 
 public class ModelData {
 

src/main/java/eu/tankernn/gameEngine/objLoader/OBJFileLoader.java → src/main/java/eu/tankernn/gameEngine/loader/obj/OBJFileLoader.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.objLoader;
+package eu.tankernn.gameEngine.loader.obj;
 
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;

src/main/java/eu/tankernn/gameEngine/objLoader/Vertex.java → src/main/java/eu/tankernn/gameEngine/loader/obj/Vertex.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.objLoader;
+package eu.tankernn.gameEngine.loader.obj;
 
 import org.lwjgl.util.vector.Vector3f;
 

src/main/java/eu/tankernn/gameEngine/normalMapping/objConverter/ModelDataNM.java → src/main/java/eu/tankernn/gameEngine/loader/obj/normalMapped/ModelDataNM.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.normalMapping.objConverter;
+package eu.tankernn.gameEngine.loader.obj.normalMapped;
 
 public class ModelDataNM {
 

src/main/java/eu/tankernn/gameEngine/normalMapping/objConverter/NormalMappedObjLoader.java → src/main/java/eu/tankernn/gameEngine/loader/obj/normalMapped/NormalMappedObjLoader.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.normalMapping.objConverter;
+package eu.tankernn.gameEngine.loader.obj.normalMapped;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -9,7 +9,7 @@ import java.util.List;
 import org.lwjgl.util.vector.Vector2f;
 import org.lwjgl.util.vector.Vector3f;
 
-import eu.tankernn.gameEngine.models.RawModel;
+import eu.tankernn.gameEngine.loader.models.RawModel;
 import eu.tankernn.gameEngine.renderEngine.Loader;
 
 public class NormalMappedObjLoader {

src/main/java/eu/tankernn/gameEngine/normalMapping/objConverter/VertexNM.java → src/main/java/eu/tankernn/gameEngine/loader/obj/normalMapped/VertexNM.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.normalMapping.objConverter;
+package eu.tankernn.gameEngine.loader.obj.normalMapped;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -4,12 +4,12 @@ import org.lwjgl.util.vector.Vector2f;
 import org.lwjgl.util.vector.Vector3f;
 
 import eu.tankernn.gameEngine.entities.Camera;
-import eu.tankernn.gameEngine.entities.Positionable;
 import eu.tankernn.gameEngine.renderEngine.DisplayManager;
 import eu.tankernn.gameEngine.settings.Physics;
+import eu.tankernn.gameEngine.util.IPositionable;
 
 
-public class Particle implements Positionable {
+public class Particle implements IPositionable {
 	private Vector3f position;
 	private Vector3f velocity;
 	private float gravityEffect;

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

@@ -14,7 +14,7 @@ import org.lwjgl.util.vector.Matrix4f;
 import org.lwjgl.util.vector.Vector3f;
 
 import eu.tankernn.gameEngine.entities.Camera;
-import eu.tankernn.gameEngine.models.RawModel;
+import eu.tankernn.gameEngine.loader.models.RawModel;
 import eu.tankernn.gameEngine.renderEngine.Loader;
 import eu.tankernn.gameEngine.util.Maths;
 

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

@@ -5,7 +5,7 @@ import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL20;
 import org.lwjgl.opengl.GL30;
 
-import eu.tankernn.gameEngine.models.RawModel;
+import eu.tankernn.gameEngine.loader.models.RawModel;
 import eu.tankernn.gameEngine.postProcessing.bloom.BrightFilter;
 import eu.tankernn.gameEngine.postProcessing.bloom.CombineFilter;
 import eu.tankernn.gameEngine.postProcessing.gaussianBlur.HorizontalBlur;

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

@@ -21,8 +21,8 @@ import org.lwjgl.opengl.GLContext;
 
 import de.matthiasmann.twl.utils.PNGDecoder;
 import de.matthiasmann.twl.utils.PNGDecoder.Format;
-import eu.tankernn.gameEngine.models.RawModel;
-import eu.tankernn.gameEngine.objLoader.ModelData;
+import eu.tankernn.gameEngine.loader.models.RawModel;
+import eu.tankernn.gameEngine.loader.obj.ModelData;
 import eu.tankernn.gameEngine.settings.Settings;
 import eu.tankernn.gameEngine.textures.TextureData;
 /**

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

@@ -18,9 +18,9 @@ import org.lwjgl.util.vector.Vector4f;
 import eu.tankernn.gameEngine.entities.Camera;
 import eu.tankernn.gameEngine.entities.Entity;
 import eu.tankernn.gameEngine.entities.Light;
-import eu.tankernn.gameEngine.models.TexturedModel;
-import eu.tankernn.gameEngine.normalMapping.renderer.NormalMappingRenderer;
+import eu.tankernn.gameEngine.loader.models.TexturedModel;
 import eu.tankernn.gameEngine.renderEngine.entities.EntityRenderer;
+import eu.tankernn.gameEngine.renderEngine.normalMap.NormalMappingRenderer;
 import eu.tankernn.gameEngine.renderEngine.shadows.ShadowMapMasterRenderer;
 import eu.tankernn.gameEngine.renderEngine.skybox.Skybox;
 import eu.tankernn.gameEngine.renderEngine.skybox.SkyboxRenderer;

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

@@ -16,7 +16,7 @@ import org.lwjgl.util.vector.Vector4f;
 
 import eu.tankernn.gameEngine.entities.Entity;
 import eu.tankernn.gameEngine.entities.Light;
-import eu.tankernn.gameEngine.models.TexturedModel;
+import eu.tankernn.gameEngine.loader.models.TexturedModel;
 import eu.tankernn.gameEngine.renderEngine.MasterRenderer;
 import eu.tankernn.gameEngine.textures.ModelTexture;
 import eu.tankernn.gameEngine.textures.Texture;

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

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.font.rendering;
+package eu.tankernn.gameEngine.renderEngine.font;
 
 import java.util.List;
 import java.util.Map;

src/main/java/eu/tankernn/gameEngine/font/rendering/FontShader.java → src/main/java/eu/tankernn/gameEngine/renderEngine/font/FontShader.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.font.rendering;
+package eu.tankernn.gameEngine.renderEngine.font;
 
 import eu.tankernn.gameEngine.renderEngine.shaders.ShaderProgram;
 import eu.tankernn.gameEngine.renderEngine.shaders.UniformVec2;

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

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.font.rendering;
+package eu.tankernn.gameEngine.renderEngine.font;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.gui;
+package eu.tankernn.gameEngine.renderEngine.gui;
 
 import java.util.List;
 
@@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL20;
 import org.lwjgl.opengl.GL30;
 import org.lwjgl.util.vector.Matrix4f;
 
-import eu.tankernn.gameEngine.models.RawModel;
+import eu.tankernn.gameEngine.loader.models.RawModel;
 import eu.tankernn.gameEngine.renderEngine.Loader;
 import eu.tankernn.gameEngine.util.Maths;
 

src/main/java/eu/tankernn/gameEngine/gui/GuiShader.java → src/main/java/eu/tankernn/gameEngine/renderEngine/gui/GuiShader.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.gui;
+package eu.tankernn.gameEngine.renderEngine.gui;
 
 import eu.tankernn.gameEngine.renderEngine.shaders.ShaderProgram;
 import eu.tankernn.gameEngine.renderEngine.shaders.UniformMatrix;

src/main/java/eu/tankernn/gameEngine/gui/GuiTexture.java → src/main/java/eu/tankernn/gameEngine/renderEngine/gui/GuiTexture.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.gui;
+package eu.tankernn.gameEngine.renderEngine.gui;
 
 import org.lwjgl.util.vector.Vector2f;
 

src/main/java/eu/tankernn/gameEngine/normalMapping/renderer/NormalMappingRenderer.java → src/main/java/eu/tankernn/gameEngine/renderEngine/normalMap/NormalMappingRenderer.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.normalMapping.renderer;
+package eu.tankernn.gameEngine.renderEngine.normalMap;
 
 import java.util.List;
 import java.util.Map;
@@ -12,8 +12,8 @@ import org.lwjgl.util.vector.Vector4f;
 
 import eu.tankernn.gameEngine.entities.Entity;
 import eu.tankernn.gameEngine.entities.Light;
-import eu.tankernn.gameEngine.models.RawModel;
-import eu.tankernn.gameEngine.models.TexturedModel;
+import eu.tankernn.gameEngine.loader.models.RawModel;
+import eu.tankernn.gameEngine.loader.models.TexturedModel;
 import eu.tankernn.gameEngine.renderEngine.MasterRenderer;
 import eu.tankernn.gameEngine.settings.Settings;
 import eu.tankernn.gameEngine.textures.ModelTexture;

src/main/java/eu/tankernn/gameEngine/normalMapping/renderer/NormalMappingShader.java → src/main/java/eu/tankernn/gameEngine/renderEngine/normalMap/NormalMappingShader.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.normalMapping.renderer;
+package eu.tankernn.gameEngine.renderEngine.normalMap;
 
 import java.util.List;
 

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

@@ -10,8 +10,8 @@ import org.lwjgl.opengl.GL30;
 import org.lwjgl.util.vector.Matrix4f;
 
 import eu.tankernn.gameEngine.entities.Entity;
-import eu.tankernn.gameEngine.models.RawModel;
-import eu.tankernn.gameEngine.models.TexturedModel;
+import eu.tankernn.gameEngine.loader.models.RawModel;
+import eu.tankernn.gameEngine.loader.models.TexturedModel;
 import eu.tankernn.gameEngine.renderEngine.MasterRenderer;
 import eu.tankernn.gameEngine.util.Maths;
 

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

@@ -11,7 +11,7 @@ import org.lwjgl.util.vector.Vector3f;
 import eu.tankernn.gameEngine.entities.Camera;
 import eu.tankernn.gameEngine.entities.Entity;
 import eu.tankernn.gameEngine.entities.Light;
-import eu.tankernn.gameEngine.models.TexturedModel;
+import eu.tankernn.gameEngine.loader.models.TexturedModel;
 
 /**
  * This class is in charge of using all of the classes in the shadows package to

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

@@ -11,7 +11,7 @@ import org.lwjgl.util.vector.Vector3f;
 
 import eu.tankernn.gameEngine.entities.Camera;
 import eu.tankernn.gameEngine.entities.Light;
-import eu.tankernn.gameEngine.models.RawModel;
+import eu.tankernn.gameEngine.loader.models.RawModel;
 import eu.tankernn.gameEngine.renderEngine.DisplayManager;
 import eu.tankernn.gameEngine.renderEngine.Loader;
 import eu.tankernn.gameEngine.util.Maths;

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

@@ -9,7 +9,7 @@ import javax.imageio.ImageIO;
 import org.lwjgl.util.vector.Vector2f;
 import org.lwjgl.util.vector.Vector3f;
 
-import eu.tankernn.gameEngine.models.RawModel;
+import eu.tankernn.gameEngine.loader.models.RawModel;
 import eu.tankernn.gameEngine.renderEngine.Loader;
 import eu.tankernn.gameEngine.textures.TerrainTexture;
 import eu.tankernn.gameEngine.textures.TerrainTexturePack;

src/main/java/eu/tankernn/gameEngine/textures/Texture.java

@@ -3,7 +3,7 @@ package eu.tankernn.gameEngine.textures;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL13;
 
-import eu.tankernn.gameEngine.util.MyFile;
+import eu.tankernn.gameEngine.util.InternalFile;
 
 
 public class Texture {
@@ -33,11 +33,11 @@ public class Texture {
 		GL11.glDeleteTextures(textureId);
 	}
 
-	public static TextureBuilder newTexture(MyFile textureFile) {
+	public static TextureBuilder newTexture(InternalFile textureFile) {
 		return new TextureBuilder(textureFile);
 	}
 
-	public static Texture newCubeMap(MyFile[] textureFiles, int size) {
+	public static Texture newCubeMap(InternalFile[] textureFiles, int size) {
 		int cubeMapId = TextureUtils.loadCubeMap(textureFiles);
 		return new Texture(cubeMapId, GL13.GL_TEXTURE_CUBE_MAP, size);
 	}

src/main/java/eu/tankernn/gameEngine/textures/TextureBuilder.java

@@ -1,6 +1,6 @@
 package eu.tankernn.gameEngine.textures;
 
-import eu.tankernn.gameEngine.util.MyFile;
+import eu.tankernn.gameEngine.util.InternalFile;
 
 public class TextureBuilder {
 	
@@ -9,9 +9,9 @@ public class TextureBuilder {
 	private boolean anisotropic = true;
 	private boolean nearest = false;
 	
-	private MyFile file;
+	private InternalFile file;
 	
-	protected TextureBuilder(MyFile textureFile){
+	protected TextureBuilder(InternalFile textureFile){
 		this.file = textureFile;
 	}
 	

src/main/java/eu/tankernn/gameEngine/textures/TextureUtils.java

@@ -13,7 +13,7 @@ import org.lwjgl.opengl.GLContext;
 
 import de.matthiasmann.twl.utils.PNGDecoder;
 import de.matthiasmann.twl.utils.PNGDecoder.Format;
-import eu.tankernn.gameEngine.util.MyFile;
+import eu.tankernn.gameEngine.util.InternalFile;
 
 public class TextureUtils {
 
@@ -33,7 +33,7 @@ public class TextureUtils {
 		return texID;
 	}
 
-	public static int loadCubeMap(MyFile[] textureFiles) {
+	public static int loadCubeMap(InternalFile[] textureFiles) {
 		int texID = GL11.glGenTextures();
 		GL13.glActiveTexture(GL13.GL_TEXTURE0);
 		GL11.glBindTexture(GL13.GL_TEXTURE_CUBE_MAP, texID);
@@ -51,7 +51,7 @@ public class TextureUtils {
 		return texID;
 	}
 
-	protected static TextureData decodeTextureFile(MyFile file) {
+	protected static TextureData decodeTextureFile(InternalFile file) {
 		int width = 0;
 		int height = 0;
 		ByteBuffer buffer = null;

src/main/java/eu/tankernn/gameEngine/util/DistanceSorter.java

@@ -4,10 +4,8 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import eu.tankernn.gameEngine.entities.Positionable;
-
 public class DistanceSorter {
-	public static <T extends Positionable> void sort(List<T> list, Positionable centerPoint) {
+	public static <T extends IPositionable> void sort(List<T> list, IPositionable centerPoint) {
 		Collections.sort(list, new Comparator<T>() {
 			@Override
 			public int compare(T t1, T t2) {

src/main/java/eu/tankernn/gameEngine/entities/Positionable.java → src/main/java/eu/tankernn/gameEngine/util/IPositionable.java

@@ -1,7 +1,7 @@
-package eu.tankernn.gameEngine.entities;
+package eu.tankernn.gameEngine.util;
 
 import org.lwjgl.util.vector.Vector3f;
 
-public interface Positionable {
+public interface IPositionable {
 	public Vector3f getPosition();
 }

src/main/java/eu/tankernn/gameEngine/util/MyFile.java → src/main/java/eu/tankernn/gameEngine/util/InternalFile.java

@@ -4,20 +4,20 @@ import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
-public class MyFile {
+public class InternalFile {
 	
 	private static final String FILE_SEPARATOR = "/";
 
 	private String path;
 	private String name;
 
-	public MyFile(String path) {
+	public InternalFile(String path) {
 		this.path = FILE_SEPARATOR + path;
 		String[] dirs = path.split(FILE_SEPARATOR);
 		this.name = dirs[dirs.length - 1];
 	}
 
-	public MyFile(String... paths) {
+	public InternalFile(String... paths) {
 		this.path = "";
 		for (String part : paths) {
 			this.path += (FILE_SEPARATOR + part);
@@ -26,12 +26,12 @@ public class MyFile {
 		this.name = dirs[dirs.length - 1];
 	}
 
-	public MyFile(MyFile file, String subFile) {
+	public InternalFile(InternalFile file, String subFile) {
 		this.path = file.path + FILE_SEPARATOR + subFile;
 		this.name = subFile;
 	}
 	
-	public MyFile(MyFile file, String... subFiles) {
+	public InternalFile(InternalFile file, String... subFiles) {
 		this.path = file.path;
 		for (String part : subFiles) {
 			this.path += (FILE_SEPARATOR + part);

src/main/java/eu/tankernn/gameEngine/util/MousePicker.java

@@ -11,8 +11,8 @@ import org.lwjgl.util.vector.Vector4f;
 
 import eu.tankernn.gameEngine.entities.Camera;
 import eu.tankernn.gameEngine.entities.Entity;
-import eu.tankernn.gameEngine.gui.GuiTexture;
-import eu.tankernn.gameEngine.models.AABB;
+import eu.tankernn.gameEngine.loader.models.AABB;
+import eu.tankernn.gameEngine.renderEngine.gui.GuiTexture;
 import eu.tankernn.gameEngine.terrains.Terrain;
 import eu.tankernn.gameEngine.terrains.TerrainPack;