Refactored texture package into loader package.

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

@@ -25,6 +25,10 @@ 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.loader.textures.ModelTexture;
+import eu.tankernn.gameEngine.loader.textures.TerrainTexture;
+import eu.tankernn.gameEngine.loader.textures.TerrainTexturePack;
+import eu.tankernn.gameEngine.loader.textures.Texture;
 import eu.tankernn.gameEngine.particles.ParticleMaster;
 import eu.tankernn.gameEngine.particles.ParticleSystem;
 import eu.tankernn.gameEngine.particles.ParticleTexture;
@@ -43,10 +47,6 @@ import eu.tankernn.gameEngine.renderEngine.water.WaterMaster;
 import eu.tankernn.gameEngine.renderEngine.water.WaterTile;
 import eu.tankernn.gameEngine.terrains.Terrain;
 import eu.tankernn.gameEngine.terrains.TerrainPack;
-import eu.tankernn.gameEngine.textures.ModelTexture;
-import eu.tankernn.gameEngine.textures.TerrainTexture;
-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.InternalFile;

src/main/java/eu/tankernn/gameEngine/environmentMap/EnvironmentMapRenderer.java

@@ -7,9 +7,9 @@ import org.lwjgl.opengl.GL14;
 import org.lwjgl.opengl.GL30;
 import org.lwjgl.util.vector.Vector3f;
 
+import eu.tankernn.gameEngine.loader.textures.Texture;
 import eu.tankernn.gameEngine.renderEngine.MasterRenderer;
 import eu.tankernn.gameEngine.renderEngine.Scene;
-import eu.tankernn.gameEngine.textures.Texture;
 
 public class EnvironmentMapRenderer {
 	public static void renderEnvironmentMap(Texture cubeMap, Scene scene, Vector3f center, MasterRenderer renderer) {

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

@@ -1,6 +1,6 @@
 package eu.tankernn.gameEngine.loader.models;
 
-import eu.tankernn.gameEngine.textures.ModelTexture;
+import eu.tankernn.gameEngine.loader.textures.ModelTexture;
 
 public class TexturedModel {
 	private RawModel rawModel;

src/main/java/eu/tankernn/gameEngine/textures/ModelTexture.java → src/main/java/eu/tankernn/gameEngine/loader/textures/ModelTexture.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.textures;
+package eu.tankernn.gameEngine.loader.textures;
 
 public class ModelTexture {
 	private int textureID;

src/main/java/eu/tankernn/gameEngine/textures/TerrainTexture.java → src/main/java/eu/tankernn/gameEngine/loader/textures/TerrainTexture.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.textures;
+package eu.tankernn.gameEngine.loader.textures;
 
 public class TerrainTexture {
 	private int textureID;

src/main/java/eu/tankernn/gameEngine/textures/TerrainTexturePack.java → src/main/java/eu/tankernn/gameEngine/loader/textures/TerrainTexturePack.java

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

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

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.textures;
+package eu.tankernn.gameEngine.loader.textures;
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL13;

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

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.textures;
+package eu.tankernn.gameEngine.loader.textures;
 
 import eu.tankernn.gameEngine.util.InternalFile;
 

src/main/java/eu/tankernn/gameEngine/textures/TextureData.java → src/main/java/eu/tankernn/gameEngine/loader/textures/TextureData.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.textures;
+package eu.tankernn.gameEngine.loader.textures;
 
 import java.nio.ByteBuffer;
 

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

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.textures;
+package eu.tankernn.gameEngine.loader.textures;
 
 import java.io.InputStream;
 import java.nio.ByteBuffer;

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

@@ -16,7 +16,6 @@ import org.lwjgl.util.vector.Vector3f;
 import eu.tankernn.gameEngine.entities.Camera;
 import eu.tankernn.gameEngine.loader.models.RawModel;
 import eu.tankernn.gameEngine.renderEngine.Loader;
-import eu.tankernn.gameEngine.util.Maths;
 
 public class ParticleRenderer {
 	

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

@@ -23,8 +23,8 @@ import de.matthiasmann.twl.utils.PNGDecoder;
 import de.matthiasmann.twl.utils.PNGDecoder.Format;
 import eu.tankernn.gameEngine.loader.models.RawModel;
 import eu.tankernn.gameEngine.loader.obj.ModelData;
+import eu.tankernn.gameEngine.loader.textures.TextureData;
 import eu.tankernn.gameEngine.settings.Settings;
-import eu.tankernn.gameEngine.textures.TextureData;
 /**
  * General purpose loader
  * @author Frans

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

@@ -19,6 +19,7 @@ import eu.tankernn.gameEngine.entities.Camera;
 import eu.tankernn.gameEngine.entities.Entity;
 import eu.tankernn.gameEngine.entities.Light;
 import eu.tankernn.gameEngine.loader.models.TexturedModel;
+import eu.tankernn.gameEngine.loader.textures.Texture;
 import eu.tankernn.gameEngine.renderEngine.entities.EntityRenderer;
 import eu.tankernn.gameEngine.renderEngine.normalMap.NormalMappingRenderer;
 import eu.tankernn.gameEngine.renderEngine.shadows.ShadowMapMasterRenderer;
@@ -26,7 +27,6 @@ import eu.tankernn.gameEngine.renderEngine.skybox.Skybox;
 import eu.tankernn.gameEngine.renderEngine.skybox.SkyboxRenderer;
 import eu.tankernn.gameEngine.renderEngine.terrain.TerrainRenderer;
 import eu.tankernn.gameEngine.terrains.Terrain;
-import eu.tankernn.gameEngine.textures.Texture;
 import eu.tankernn.gameEngine.util.ICamera;
 
 /**

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

@@ -5,9 +5,9 @@ import java.util.List;
 import eu.tankernn.gameEngine.entities.Camera;
 import eu.tankernn.gameEngine.entities.Entity;
 import eu.tankernn.gameEngine.entities.Light;
+import eu.tankernn.gameEngine.loader.textures.Texture;
 import eu.tankernn.gameEngine.renderEngine.skybox.Skybox;
 import eu.tankernn.gameEngine.terrains.TerrainPack;
-import eu.tankernn.gameEngine.textures.Texture;
 
 public class Scene {
 	private List<Entity> entities;

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

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

src/main/java/eu/tankernn/gameEngine/renderEngine/normalMap/NormalMappingRenderer.java

@@ -14,9 +14,9 @@ import eu.tankernn.gameEngine.entities.Entity;
 import eu.tankernn.gameEngine.entities.Light;
 import eu.tankernn.gameEngine.loader.models.RawModel;
 import eu.tankernn.gameEngine.loader.models.TexturedModel;
+import eu.tankernn.gameEngine.loader.textures.ModelTexture;
 import eu.tankernn.gameEngine.renderEngine.MasterRenderer;
 import eu.tankernn.gameEngine.settings.Settings;
-import eu.tankernn.gameEngine.textures.ModelTexture;
 import eu.tankernn.gameEngine.util.ICamera;
 import eu.tankernn.gameEngine.util.Maths;
 

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

@@ -1,7 +1,7 @@
 package eu.tankernn.gameEngine.renderEngine.skybox;
 
+import eu.tankernn.gameEngine.loader.textures.Texture;
 import eu.tankernn.gameEngine.renderEngine.Vao;
-import eu.tankernn.gameEngine.textures.Texture;
 
 public class Skybox {
 	

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

@@ -5,10 +5,10 @@ import org.lwjgl.opengl.GL20;
 import org.lwjgl.opengl.GL30;
 import org.lwjgl.util.vector.Matrix4f;
 
+import eu.tankernn.gameEngine.loader.textures.Texture;
 import eu.tankernn.gameEngine.renderEngine.DisplayManager;
 import eu.tankernn.gameEngine.renderEngine.Loader;
 import eu.tankernn.gameEngine.renderEngine.Vao;
-import eu.tankernn.gameEngine.textures.Texture;
 import eu.tankernn.gameEngine.util.ICamera;
 
 public class SkyboxRenderer {

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

@@ -15,10 +15,10 @@ import org.lwjgl.util.vector.Vector3f;
 import org.lwjgl.util.vector.Vector4f;
 
 import eu.tankernn.gameEngine.entities.Light;
+import eu.tankernn.gameEngine.loader.textures.TerrainTexturePack;
 import eu.tankernn.gameEngine.renderEngine.shadows.ShadowBox;
 import eu.tankernn.gameEngine.renderEngine.shadows.ShadowMapMasterRenderer;
 import eu.tankernn.gameEngine.terrains.Terrain;
-import eu.tankernn.gameEngine.textures.TerrainTexturePack;
 import eu.tankernn.gameEngine.util.ICamera;
 import eu.tankernn.gameEngine.util.Maths;
 

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

@@ -10,9 +10,9 @@ import org.lwjgl.util.vector.Vector2f;
 import org.lwjgl.util.vector.Vector3f;
 
 import eu.tankernn.gameEngine.loader.models.RawModel;
+import eu.tankernn.gameEngine.loader.textures.TerrainTexture;
+import eu.tankernn.gameEngine.loader.textures.TerrainTexturePack;
 import eu.tankernn.gameEngine.renderEngine.Loader;
-import eu.tankernn.gameEngine.textures.TerrainTexture;
-import eu.tankernn.gameEngine.textures.TerrainTexturePack;
 import eu.tankernn.gameEngine.util.Maths;
 
 public class Terrain {