Heavy package-refactoring

src/main/java/eu/tankernn/gameEngine/animation/animation/Animation.java → src/main/java/eu/tankernn/gameEngine/animation/Animation.java

@@ -1,6 +1,6 @@
-package eu.tankernn.gameEngine.animation.animation;
+package eu.tankernn.gameEngine.animation;
 
-import eu.tankernn.gameEngine.animation.animatedModel.AnimatedModel;
+import eu.tankernn.gameEngine.animation.model.AnimatedModel;
 
 /**
  * 

src/main/java/eu/tankernn/gameEngine/animation/animation/Animator.java → src/main/java/eu/tankernn/gameEngine/animation/Animator.java

@@ -1,12 +1,12 @@
-package eu.tankernn.gameEngine.animation.animation;
+package eu.tankernn.gameEngine.animation;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.lwjgl.util.vector.Matrix4f;
 
-import eu.tankernn.gameEngine.animation.animatedModel.AnimatedModel;
-import eu.tankernn.gameEngine.animation.animatedModel.Joint;
+import eu.tankernn.gameEngine.animation.model.AnimatedModel;
+import eu.tankernn.gameEngine.animation.model.Joint;
 import eu.tankernn.gameEngine.renderEngine.DisplayManager;
 
 

src/main/java/eu/tankernn/gameEngine/animation/animation/JointTransform.java → src/main/java/eu/tankernn/gameEngine/animation/JointTransform.java

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

src/main/java/eu/tankernn/gameEngine/animation/animation/KeyFrame.java → src/main/java/eu/tankernn/gameEngine/animation/KeyFrame.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.animation.animation;
+package eu.tankernn.gameEngine.animation;
 
 import java.util.Map;
 

src/main/java/eu/tankernn/gameEngine/animation/animation/Quaternion.java → src/main/java/eu/tankernn/gameEngine/animation/Quaternion.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.animation.animation;
+package eu.tankernn.gameEngine.animation;
 
 import org.lwjgl.util.vector.Matrix4f;
 

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

@@ -1,12 +1,12 @@
-package eu.tankernn.gameEngine.animation.animatedModel;
+package eu.tankernn.gameEngine.animation.model;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.lwjgl.util.vector.Matrix4f;
 
-import eu.tankernn.gameEngine.animation.animation.Animation;
-import eu.tankernn.gameEngine.animation.animation.Animator;
+import eu.tankernn.gameEngine.animation.Animation;
+import eu.tankernn.gameEngine.animation.Animator;
 import eu.tankernn.gameEngine.loader.models.TexturedModel;
 import eu.tankernn.gameEngine.loader.textures.ModelTexture;
 import eu.tankernn.gameEngine.renderEngine.Vao;

src/main/java/eu/tankernn/gameEngine/animation/animatedModel/Joint.java → src/main/java/eu/tankernn/gameEngine/animation/model/Joint.java

@@ -1,12 +1,12 @@
-package eu.tankernn.gameEngine.animation.animatedModel;
+package eu.tankernn.gameEngine.animation.model;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.lwjgl.util.vector.Matrix4f;
 
-import eu.tankernn.gameEngine.animation.animation.Animator;
-import eu.tankernn.gameEngine.loader.colladaLoader.JointData;
+import eu.tankernn.gameEngine.animation.Animator;
+import eu.tankernn.gameEngine.loader.models.collada.JointData;
 
 /**
  * 

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

@@ -2,7 +2,7 @@ package eu.tankernn.gameEngine.entities;
 
 import org.lwjgl.util.vector.Vector3f;
 
-import eu.tankernn.gameEngine.animation.animatedModel.AnimatedModel;
+import eu.tankernn.gameEngine.animation.model.AnimatedModel;
 import eu.tankernn.gameEngine.loader.models.AABB;
 import eu.tankernn.gameEngine.loader.models.TexturedModel;
 import eu.tankernn.gameEngine.util.IPositionable;

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.animation.animatedModel.AnimatedModel;
+import eu.tankernn.gameEngine.animation.model.AnimatedModel;
 import eu.tankernn.gameEngine.loader.models.AABB;
 import eu.tankernn.gameEngine.loader.models.TexturedModel;
 import eu.tankernn.gameEngine.renderEngine.DisplayManager;

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

@@ -12,17 +12,17 @@ import java.util.Map;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import eu.tankernn.gameEngine.animation.animatedModel.AnimatedModel;
-import eu.tankernn.gameEngine.animation.animatedModel.Joint;
-import eu.tankernn.gameEngine.animation.loaders.AnimationLoader;
-import eu.tankernn.gameEngine.loader.colladaLoader.AnimatedModelData;
-import eu.tankernn.gameEngine.loader.colladaLoader.ColladaLoader;
-import eu.tankernn.gameEngine.loader.colladaLoader.JointsData;
-import eu.tankernn.gameEngine.loader.colladaLoader.MeshData;
+import eu.tankernn.gameEngine.animation.model.AnimatedModel;
+import eu.tankernn.gameEngine.animation.model.Joint;
+import eu.tankernn.gameEngine.loader.animation.AnimationLoader;
 import eu.tankernn.gameEngine.loader.models.AABB;
 import eu.tankernn.gameEngine.loader.models.TexturedModel;
-import eu.tankernn.gameEngine.loader.obj.ModelData;
-import eu.tankernn.gameEngine.loader.obj.ObjLoader;
+import eu.tankernn.gameEngine.loader.models.collada.AnimatedModelData;
+import eu.tankernn.gameEngine.loader.models.collada.ColladaLoader;
+import eu.tankernn.gameEngine.loader.models.collada.JointsData;
+import eu.tankernn.gameEngine.loader.models.collada.MeshData;
+import eu.tankernn.gameEngine.loader.models.obj.ModelData;
+import eu.tankernn.gameEngine.loader.models.obj.ObjLoader;
 import eu.tankernn.gameEngine.loader.textures.ModelTexture;
 import eu.tankernn.gameEngine.loader.textures.Texture;
 import eu.tankernn.gameEngine.renderEngine.Vao;

src/main/java/eu/tankernn/gameEngine/animation/loaders/AnimationLoader.java → src/main/java/eu/tankernn/gameEngine/loader/animation/AnimationLoader.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.animation.loaders;
+package eu.tankernn.gameEngine.loader.animation;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -8,14 +8,14 @@ import java.util.Map;
 import org.lwjgl.util.vector.Matrix4f;
 import org.lwjgl.util.vector.Vector3f;
 
-import eu.tankernn.gameEngine.animation.animation.Animation;
-import eu.tankernn.gameEngine.animation.animation.JointTransform;
-import eu.tankernn.gameEngine.animation.animation.KeyFrame;
-import eu.tankernn.gameEngine.animation.animation.Quaternion;
-import eu.tankernn.gameEngine.loader.colladaLoader.AnimationData;
-import eu.tankernn.gameEngine.loader.colladaLoader.ColladaLoader;
-import eu.tankernn.gameEngine.loader.colladaLoader.JointTransformData;
-import eu.tankernn.gameEngine.loader.colladaLoader.KeyFrameData;
+import eu.tankernn.gameEngine.animation.Animation;
+import eu.tankernn.gameEngine.animation.JointTransform;
+import eu.tankernn.gameEngine.animation.KeyFrame;
+import eu.tankernn.gameEngine.animation.Quaternion;
+import eu.tankernn.gameEngine.loader.models.collada.AnimationData;
+import eu.tankernn.gameEngine.loader.models.collada.ColladaLoader;
+import eu.tankernn.gameEngine.loader.models.collada.JointTransformData;
+import eu.tankernn.gameEngine.loader.models.collada.KeyFrameData;
 import eu.tankernn.gameEngine.util.InternalFile;
 
 /**

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

@@ -2,7 +2,7 @@ package eu.tankernn.gameEngine.loader.models;
 
 import org.lwjgl.util.vector.Vector3f;
 
-import eu.tankernn.gameEngine.loader.obj.ModelData;
+import eu.tankernn.gameEngine.loader.models.obj.ModelData;
 
 public class AABB {
 	protected Vector3f position;

src/main/java/eu/tankernn/gameEngine/loader/colladaLoader/AnimatedModelData.java → src/main/java/eu/tankernn/gameEngine/loader/models/collada/AnimatedModelData.java

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

src/main/java/eu/tankernn/gameEngine/loader/colladaLoader/AnimationData.java → src/main/java/eu/tankernn/gameEngine/loader/models/collada/AnimationData.java

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

src/main/java/eu/tankernn/gameEngine/loader/colladaLoader/AnimationLoader.java → src/main/java/eu/tankernn/gameEngine/loader/models/collada/AnimationLoader.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.loader.colladaLoader;
+package eu.tankernn.gameEngine.loader.models.collada;
 
 import java.nio.FloatBuffer;
 import java.util.List;
@@ -7,7 +7,7 @@ import org.lwjgl.BufferUtils;
 import org.lwjgl.util.vector.Matrix4f;
 import org.lwjgl.util.vector.Vector3f;
 
-import eu.tankernn.gameEngine.loader.xmlLoader.XmlNode;
+import eu.tankernn.gameEngine.loader.xml.XmlNode;
 
 
 public class AnimationLoader {

src/main/java/eu/tankernn/gameEngine/loader/colladaLoader/ColladaLoader.java → src/main/java/eu/tankernn/gameEngine/loader/models/collada/ColladaLoader.java

@@ -1,7 +1,7 @@
-package eu.tankernn.gameEngine.loader.colladaLoader;
+package eu.tankernn.gameEngine.loader.models.collada;
 
-import eu.tankernn.gameEngine.loader.xmlLoader.XmlNode;
-import eu.tankernn.gameEngine.loader.xmlLoader.XmlParser;
+import eu.tankernn.gameEngine.loader.xml.XmlNode;
+import eu.tankernn.gameEngine.loader.xml.XmlParser;
 import eu.tankernn.gameEngine.util.InternalFile;
 
 public class ColladaLoader {

src/main/java/eu/tankernn/gameEngine/loader/colladaLoader/GeometryLoader.java → src/main/java/eu/tankernn/gameEngine/loader/models/collada/GeometryLoader.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.loader.colladaLoader;
+package eu.tankernn.gameEngine.loader.models.collada;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,7 +8,7 @@ import org.lwjgl.util.vector.Vector2f;
 import org.lwjgl.util.vector.Vector3f;
 import org.lwjgl.util.vector.Vector4f;
 
-import eu.tankernn.gameEngine.loader.xmlLoader.XmlNode;
+import eu.tankernn.gameEngine.loader.xml.XmlNode;
 
 
 /**

src/main/java/eu/tankernn/gameEngine/loader/colladaLoader/JointData.java → src/main/java/eu/tankernn/gameEngine/loader/models/collada/JointData.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.loader.colladaLoader;
+package eu.tankernn.gameEngine.loader.models.collada;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/eu/tankernn/gameEngine/loader/colladaLoader/JointTransformData.java → src/main/java/eu/tankernn/gameEngine/loader/models/collada/JointTransformData.java

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

src/main/java/eu/tankernn/gameEngine/loader/colladaLoader/JointsData.java → src/main/java/eu/tankernn/gameEngine/loader/models/collada/JointsData.java

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

src/main/java/eu/tankernn/gameEngine/loader/colladaLoader/JointsLoader.java → src/main/java/eu/tankernn/gameEngine/loader/models/collada/JointsLoader.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.loader.colladaLoader;
+package eu.tankernn.gameEngine.loader.models.collada;
 
 import java.nio.FloatBuffer;
 import java.util.List;
@@ -7,7 +7,7 @@ import org.lwjgl.BufferUtils;
 import org.lwjgl.util.vector.Matrix4f;
 import org.lwjgl.util.vector.Vector3f;
 
-import eu.tankernn.gameEngine.loader.xmlLoader.XmlNode;
+import eu.tankernn.gameEngine.loader.xml.XmlNode;
 
 
 public class JointsLoader {

src/main/java/eu/tankernn/gameEngine/loader/colladaLoader/KeyFrameData.java → src/main/java/eu/tankernn/gameEngine/loader/models/collada/KeyFrameData.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.loader.colladaLoader;
+package eu.tankernn.gameEngine.loader.models.collada;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/eu/tankernn/gameEngine/loader/colladaLoader/MeshData.java → src/main/java/eu/tankernn/gameEngine/loader/models/collada/MeshData.java

@@ -1,6 +1,6 @@
-package eu.tankernn.gameEngine.loader.colladaLoader;
+package eu.tankernn.gameEngine.loader.models.collada;
 
-import eu.tankernn.gameEngine.loader.obj.ModelData;
+import eu.tankernn.gameEngine.loader.models.obj.ModelData;
 
 public class MeshData extends ModelData {
 

src/main/java/eu/tankernn/gameEngine/loader/colladaLoader/SkinLoader.java → src/main/java/eu/tankernn/gameEngine/loader/models/collada/SkinLoader.java

@@ -1,9 +1,9 @@
-package eu.tankernn.gameEngine.loader.colladaLoader;
+package eu.tankernn.gameEngine.loader.models.collada;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import eu.tankernn.gameEngine.loader.xmlLoader.XmlNode;
+import eu.tankernn.gameEngine.loader.xml.XmlNode;
 
 public class SkinLoader {
 

src/main/java/eu/tankernn/gameEngine/loader/colladaLoader/SkinningData.java → src/main/java/eu/tankernn/gameEngine/loader/models/collada/SkinningData.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.loader.colladaLoader;
+package eu.tankernn.gameEngine.loader.models.collada;
 
 import java.util.List;
 

src/main/java/eu/tankernn/gameEngine/loader/colladaLoader/VertexSkinData.java → src/main/java/eu/tankernn/gameEngine/loader/models/collada/VertexSkinData.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.loader.colladaLoader;
+package eu.tankernn.gameEngine.loader.models.collada;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/eu/tankernn/gameEngine/loader/colladaLoader/WeightedVertex.java → src/main/java/eu/tankernn/gameEngine/loader/models/collada/WeightedVertex.java

@@ -1,8 +1,8 @@
-package eu.tankernn.gameEngine.loader.colladaLoader;
+package eu.tankernn.gameEngine.loader.models.collada;
 
 import org.lwjgl.util.vector.Vector3f;
 
-import eu.tankernn.gameEngine.loader.obj.Vertex;
+import eu.tankernn.gameEngine.loader.models.obj.Vertex;
 
 public class WeightedVertex extends Vertex {
 	private VertexSkinData weightsData;

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

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

src/main/java/eu/tankernn/gameEngine/loader/obj/ObjLoader.java → src/main/java/eu/tankernn/gameEngine/loader/models/obj/ObjLoader.java

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

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

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

src/main/java/eu/tankernn/gameEngine/loader/xmlLoader/XmlNode.java → src/main/java/eu/tankernn/gameEngine/loader/xml/XmlNode.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.loader.xmlLoader;
+package eu.tankernn.gameEngine.loader.xml;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/eu/tankernn/gameEngine/loader/xmlLoader/XmlParser.java → src/main/java/eu/tankernn/gameEngine/loader/xml/XmlParser.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.loader.xmlLoader;
+package eu.tankernn.gameEngine.loader.xml;
 
 import java.io.BufferedReader;
 import java.util.regex.Matcher;

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

@@ -12,7 +12,7 @@ import org.lwjgl.util.vector.Matrix4f;
 import org.lwjgl.util.vector.Vector3f;
 import org.lwjgl.util.vector.Vector4f;
 
-import eu.tankernn.gameEngine.animation.animatedModel.AnimatedModel;
+import eu.tankernn.gameEngine.animation.model.AnimatedModel;
 import eu.tankernn.gameEngine.entities.Entity3D;
 import eu.tankernn.gameEngine.entities.Light;
 import eu.tankernn.gameEngine.loader.models.TexturedModel;

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

@@ -9,7 +9,7 @@ import org.lwjgl.opengl.GL30;
 import org.lwjgl.util.vector.Matrix4f;
 import org.lwjgl.util.vector.Vector3f;
 
-import eu.tankernn.gameEngine.animation.animatedModel.AnimatedModel;
+import eu.tankernn.gameEngine.animation.model.AnimatedModel;
 import eu.tankernn.gameEngine.entities.Entity3D;
 import eu.tankernn.gameEngine.loader.models.TexturedModel;
 import eu.tankernn.gameEngine.renderEngine.MasterRenderer;